diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f8e215be..71522fa00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 ## [Unreleased] - TBD
+### Changed
+Updated `downloadByName()` and `downloadById()` to use their respective `getDownloadByNameUrl()` and 
+`getDownloadByIdUrl()` methods for improved extensibility 
+
 ## [6.3.0] - 2024-11-08
 ### Added
 * Fixed `B2StorageClient.deleteAllFilesInBucket` so it uses `fileVersions` instead of `fileNames`.
diff --git a/core/src/main/java/com/backblaze/b2/client/B2StorageClientWebifierImpl.java b/core/src/main/java/com/backblaze/b2/client/B2StorageClientWebifierImpl.java
index d10d43110..98fab86b0 100644
--- a/core/src/main/java/com/backblaze/b2/client/B2StorageClientWebifierImpl.java
+++ b/core/src/main/java/com/backblaze/b2/client/B2StorageClientWebifierImpl.java
@@ -488,7 +488,7 @@ public void downloadById(B2AccountAuthorization accountAuth,
                              B2DownloadByIdRequest request,
                              B2ContentSink handler) throws B2Exception {
         downloadGuts(accountAuth,
-                makeDownloadByIdUrl(accountAuth, request),
+                getDownloadByIdUrl(accountAuth, request),
                 request.getRange(),
                 request.getServerSideEncryption(),
                 handler);
@@ -505,7 +505,7 @@ public void downloadByName(B2AccountAuthorization accountAuth,
                                B2DownloadByNameRequest request,
                                B2ContentSink handler) throws B2Exception {
         downloadGuts(accountAuth,
-                makeDownloadByNameUrl(accountAuth, request.getBucketName(), request.getFileName(), request),
+                getDownloadByNameUrl(accountAuth, request),
                 request.getRange(),
                 request.getServerSideEncryption(),
                 handler);
diff --git a/core/src/test/java/com/backblaze/b2/client/B2StorageClientWebifierImplTest.java b/core/src/test/java/com/backblaze/b2/client/B2StorageClientWebifierImplTest.java
index 4475de8bf..6610bc4a6 100644
--- a/core/src/test/java/com/backblaze/b2/client/B2StorageClientWebifierImplTest.java
+++ b/core/src/test/java/com/backblaze/b2/client/B2StorageClientWebifierImplTest.java
@@ -103,6 +103,7 @@
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -1190,7 +1191,9 @@ public void testDownloadById() throws B2Exception {
         final B2DownloadByIdRequest request = B2DownloadByIdRequest
                 .builder(fileId(1))
                 .build();
-        webifier.downloadById(ACCOUNT_AUTH, request, noopContentHandler);
+        final B2StorageClientWebifierImpl webifierSpy = spy(webifier);
+        webifierSpy.downloadById(ACCOUNT_AUTH, request, noopContentHandler);
+        verify(webifierSpy).getDownloadByIdUrl(ACCOUNT_AUTH, request);
 
         webApiClient.check("getContent.\n" +
                 "url:\n" +
@@ -1303,7 +1306,9 @@ public void testDownloadByName() throws B2Exception {
         final B2DownloadByNameRequest request = B2DownloadByNameRequest
                 .builder(bucketName(1), fileName(1))
                 .build();
-        webifier.downloadByName(ACCOUNT_AUTH, request, noopContentHandler);
+        final B2StorageClientWebifierImpl webifierSpy = spy(webifier);
+        webifierSpy.downloadByName(ACCOUNT_AUTH, request, noopContentHandler);
+        verify(webifierSpy).getDownloadByNameUrl(ACCOUNT_AUTH, request);
 
         webApiClient.check("getContent.\n" +
                 "url:\n" +