diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9438d37..1bf368ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 0.11.7 (Unreleased)
 
 - ([#375](https://github.com/ramsayleung/rspotify/pull/375)) We now use `chrono::Duration` in more places for consistency and usability: `start_uris_playback`, `start_context_playback`, `rspotify_model::Offset`, `resume_playback`, `seek_track`. Some of these fields have been renamed from `position_ms` to `position`.
+- ((#356)[https://github.com/ramsayleung/rspotify/pull/356]) We now support custom authentication base URLs. `Config::prefix` has been renamed to `Config::api_base_url`, and we've introduced `Config::auth_base_url`.
 
 ## 0.11.6 (2022.12.14)
 
diff --git a/doc/uml/trait_hierarchy.plantuml b/doc/uml/trait_hierarchy.plantuml
index 4eb131ef..9c6e0017 100644
--- a/doc/uml/trait_hierarchy.plantuml
+++ b/doc/uml/trait_hierarchy.plantuml
@@ -9,7 +9,7 @@ abstract class BaseClient {
     ---
     ClientResult<()> auto_reauth()
     ClientResult<()> refresh_token()
-    String endpoint_url()
+    String api_url()
     String auth_url()
     ClientResult<Headers> auth_headers()
     ClientResult<()> write_token_cache()
diff --git a/src/clients/base.rs b/src/clients/base.rs
index 6bb45997..92578e02 100644
--- a/src/clients/base.rs
+++ b/src/clients/base.rs
@@ -35,8 +35,8 @@ where
     /// be mutable (the token is accessed to from every endpoint).
     fn get_token(&self) -> Arc<Mutex<Option<Token>>>;
 
-    /// Returns the absolute URL for an endpoint in the API
-    fn endpoint_url(&self, url: &str) -> String {
+    /// Returns the absolute URL for an endpoint in the API.
+    fn api_url(&self, url: &str) -> String {
         let mut base = self.get_config().api_base_url.clone();
         if !base.ends_with('/') {
             base.push('/');
@@ -44,7 +44,7 @@ where
         base + url
     }
 
-    /// Returns the absolute URL for an authentication step in the API
+    /// Returns the absolute URL for an authentication step in the API.
     fn auth_url(&self, url: &str) -> String {
         let mut base = self.get_config().auth_base_url.clone();
         if !base.ends_with('/') {
@@ -114,8 +114,8 @@ where
     /// API.
     #[doc(hidden)]
     #[inline]
-    async fn endpoint_get(&self, url: &str, payload: &Query<'_>) -> ClientResult<String> {
-        let url = self.endpoint_url(url);
+    async fn api_get(&self, url: &str, payload: &Query<'_>) -> ClientResult<String> {
+        let url = self.api_url(url);
         let headers = self.auth_headers().await;
         Ok(self.get_http().get(&url, Some(&headers), payload).await?)
     }
@@ -124,8 +124,8 @@ where
     /// API.
     #[doc(hidden)]
     #[inline]
-    async fn endpoint_post(&self, url: &str, payload: &Value) -> ClientResult<String> {
-        let url = self.endpoint_url(url);
+    async fn api_post(&self, url: &str, payload: &Value) -> ClientResult<String> {
+        let url = self.api_url(url);
         let headers = self.auth_headers().await;
         Ok(self.get_http().post(&url, Some(&headers), payload).await?)
     }
@@ -134,8 +134,8 @@ where
     /// API.
     #[doc(hidden)]
     #[inline]
-    async fn endpoint_put(&self, url: &str, payload: &Value) -> ClientResult<String> {
-        let url = self.endpoint_url(url);
+    async fn api_put(&self, url: &str, payload: &Value) -> ClientResult<String> {
+        let url = self.api_url(url);
         let headers = self.auth_headers().await;
         Ok(self.get_http().put(&url, Some(&headers), payload).await?)
     }
@@ -144,8 +144,8 @@ where
     /// API.
     #[doc(hidden)]
     #[inline]
-    async fn endpoint_delete(&self, url: &str, payload: &Value) -> ClientResult<String> {
-        let url = self.endpoint_url(url);
+    async fn api_delete(&self, url: &str, payload: &Value) -> ClientResult<String> {
+        let url = self.api_url(url);
         let headers = self.auth_headers().await;
         Ok(self
             .get_http()
@@ -207,7 +207,7 @@ where
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/get-track)
     async fn track(&self, track_id: TrackId<'_>) -> ClientResult<FullTrack> {
         let url = format!("tracks/{}", track_id.id());
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result(&result)
     }
 
@@ -227,7 +227,7 @@ where
         let params = build_map([("market", market.map(Into::into))]);
 
         let url = format!("tracks/?ids={ids}");
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result::<FullTracks>(&result).map(|x| x.tracks)
     }
 
@@ -239,7 +239,7 @@ where
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/get-an-artist)
     async fn artist(&self, artist_id: ArtistId<'_>) -> ClientResult<FullArtist> {
         let url = format!("artists/{}", artist_id.id());
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result(&result)
     }
 
@@ -255,7 +255,7 @@ where
     ) -> ClientResult<Vec<FullArtist>> {
         let ids = join_ids(artist_ids);
         let url = format!("artists/?ids={ids}");
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
 
         convert_result::<FullArtists>(&result).map(|x| x.artists)
     }
@@ -313,7 +313,7 @@ where
         ]);
 
         let url = format!("artists/{}/albums", artist_id.id());
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -333,7 +333,7 @@ where
         let params = build_map([("market", Some(market.into()))]);
 
         let url = format!("artists/{}/top-tracks", artist_id.id());
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result::<FullTracks>(&result).map(|x| x.tracks)
     }
 
@@ -350,7 +350,7 @@ where
         artist_id: ArtistId<'_>,
     ) -> ClientResult<Vec<FullArtist>> {
         let url = format!("artists/{}/related-artists", artist_id.id());
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result::<FullArtists>(&result).map(|x| x.artists)
     }
 
@@ -363,7 +363,7 @@ where
     async fn album(&self, album_id: AlbumId<'_>) -> ClientResult<FullAlbum> {
         let url = format!("albums/{}", album_id.id());
 
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result(&result)
     }
 
@@ -379,7 +379,7 @@ where
     ) -> ClientResult<Vec<FullAlbum>> {
         let ids = join_ids(album_ids);
         let url = format!("albums/?ids={ids}");
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result::<FullAlbums>(&result).map(|x| x.albums)
     }
 
@@ -418,7 +418,7 @@ where
             ("offset", offset.as_deref()),
         ]);
 
-        let result = self.endpoint_get("search", &params).await?;
+        let result = self.api_get("search", &params).await?;
         convert_result(&result)
     }
 
@@ -458,7 +458,7 @@ where
         let params = build_map([("limit", limit.as_deref()), ("offset", offset.as_deref())]);
 
         let url = format!("albums/{}/tracks", album_id.id());
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -470,7 +470,7 @@ where
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/get-users-profile)
     async fn user(&self, user_id: UserId<'_>) -> ClientResult<PublicUser> {
         let url = format!("users/{}", user_id.id());
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result(&result)
     }
 
@@ -490,7 +490,7 @@ where
         let params = build_map([("fields", fields), ("market", market.map(Into::into))]);
 
         let url = format!("playlists/{}", playlist_id.id());
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -514,7 +514,7 @@ where
             Some(playlist_id) => format!("users/{}/playlists/{}", user_id.id(), playlist_id.id()),
             None => format!("users/{}/starred", user_id.id()),
         };
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -540,7 +540,7 @@ where
             playlist_id.id(),
             user_ids.iter().map(Id::id).collect::<Vec<_>>().join(","),
         );
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result(&result)
     }
 
@@ -557,7 +557,7 @@ where
         let params = build_map([("market", market.map(Into::into))]);
 
         let url = format!("shows/{}", id.id());
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -577,7 +577,7 @@ where
         let ids = join_ids(ids);
         let params = build_map([("ids", Some(&ids)), ("market", market.map(Into::into))]);
 
-        let result = self.endpoint_get("shows", &params).await?;
+        let result = self.api_get("shows", &params).await?;
         convert_result::<SeversalSimplifiedShows>(&result).map(|x| x.shows)
     }
 
@@ -627,7 +627,7 @@ where
         ]);
 
         let url = format!("shows/{}/episodes", id.id());
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -648,7 +648,7 @@ where
         let url = format!("episodes/{}", id.id());
         let params = build_map([("market", market.map(Into::into))]);
 
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -667,7 +667,7 @@ where
         let ids = join_ids(ids);
         let params = build_map([("ids", Some(&ids)), ("market", market.map(Into::into))]);
 
-        let result = self.endpoint_get("episodes", &params).await?;
+        let result = self.api_get("episodes", &params).await?;
         convert_result::<EpisodesPayload>(&result).map(|x| x.episodes)
     }
 
@@ -679,7 +679,7 @@ where
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/get-audio-features)
     async fn track_features(&self, track_id: TrackId<'_>) -> ClientResult<AudioFeatures> {
         let url = format!("audio-features/{}", track_id.id());
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result(&result)
     }
 
@@ -695,7 +695,7 @@ where
     ) -> ClientResult<Option<Vec<AudioFeatures>>> {
         let url = format!("audio-features/?ids={}", join_ids(track_ids));
 
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         if result.is_empty() {
             Ok(None)
         } else {
@@ -712,7 +712,7 @@ where
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/get-audio-analysis)
     async fn track_analysis(&self, track_id: TrackId<'_>) -> ClientResult<AudioAnalysis> {
         let url = format!("audio-analysis/{}", track_id.id());
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result(&result)
     }
 
@@ -758,7 +758,7 @@ where
             ("limit", limit.as_deref()),
             ("offset", offset.as_deref()),
         ]);
-        let result = self.endpoint_get("browse/categories", &params).await?;
+        let result = self.api_get("browse/categories", &params).await?;
         convert_result::<PageCategory>(&result).map(|x| x.categories)
     }
 
@@ -806,7 +806,7 @@ where
         ]);
 
         let url = format!("browse/categories/{category_id}/playlists");
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result::<CategoryPlaylists>(&result).map(|x| x.playlists)
     }
 
@@ -847,7 +847,7 @@ where
         ]);
 
         let result = self
-            .endpoint_get("browse/featured-playlists", &params)
+            .api_get("browse/featured-playlists", &params)
             .await?;
         convert_result(&result)
     }
@@ -890,7 +890,7 @@ where
             ("offset", offset.as_deref()),
         ]);
 
-        let result = self.endpoint_get("browse/new-releases", &params).await?;
+        let result = self.api_get("browse/new-releases", &params).await?;
         convert_result::<PageSimplifiedAlbums>(&result).map(|x| x.albums)
     }
 
@@ -945,7 +945,7 @@ where
         // And finally adding all of them to the payload
         params.extend(borrowed_attributes);
 
-        let result = self.endpoint_get("recommendations", &params).await?;
+        let result = self.api_get("recommendations", &params).await?;
         convert_result(&result)
     }
 
@@ -1002,7 +1002,7 @@ where
         ]);
 
         let url = format!("playlists/{}/tracks", playlist_id.id());
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -1042,7 +1042,7 @@ where
         let params = build_map([("limit", limit.as_deref()), ("offset", offset.as_deref())]);
 
         let url = format!("users/{}/playlists", user_id.id());
-        let result = self.endpoint_get(&url, &params).await?;
+        let result = self.api_get(&url, &params).await?;
         convert_result(&result)
     }
 }
diff --git a/src/clients/mod.rs b/src/clients/mod.rs
index 01ce483c..65117abc 100644
--- a/src/clients/mod.rs
+++ b/src/clients/mod.rs
@@ -55,10 +55,10 @@ mod test {
     }
 
     #[test]
-    fn test_endpoint_url() {
+    fn test_api_url() {
         let mut spotify = ClientCredsSpotify::default();
         assert_eq!(
-            spotify.endpoint_url("me/player/play"),
+            spotify.api_url("me/player/play"),
             "https://api.spotify.com/v1/me/player/play"
         );
 
@@ -67,7 +67,7 @@ mod test {
             ..Default::default()
         };
         assert_eq!(
-            spotify.endpoint_url("me/player/play"),
+            spotify.api_url("me/player/play"),
             "http://localhost:8080/api/v1/me/player/play"
         );
 
@@ -77,7 +77,7 @@ mod test {
             ..Default::default()
         };
         assert_eq!(
-            spotify.endpoint_url("me/player/play"),
+            spotify.api_url("me/player/play"),
             "http://localhost:8080/api/v1/me/player/play"
         );
     }
diff --git a/src/clients/oauth.rs b/src/clients/oauth.rs
index 8304476b..a2162d0e 100644
--- a/src/clients/oauth.rs
+++ b/src/clients/oauth.rs
@@ -206,7 +206,7 @@ pub trait OAuthClient: BaseClient {
         let offset = offset.map(|s| s.to_string());
         let params = build_map([("limit", limit.as_deref()), ("offset", offset.as_deref())]);
 
-        let result = self.endpoint_get("me/playlists", &params).await?;
+        let result = self.api_get("me/playlists", &params).await?;
         convert_result(&result)
     }
 
@@ -243,7 +243,7 @@ pub trait OAuthClient: BaseClient {
             .build();
 
         let url = format!("users/{}/playlists", user_id.id());
-        let result = self.endpoint_post(&url, &params).await?;
+        let result = self.api_post(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -273,7 +273,7 @@ pub trait OAuthClient: BaseClient {
             .build();
 
         let url = format!("playlists/{}", playlist_id.id());
-        self.endpoint_put(&url, &params).await
+        self.api_put(&url, &params).await
     }
 
     /// Unfollows (deletes) a playlist for a user.
@@ -284,7 +284,7 @@ pub trait OAuthClient: BaseClient {
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/unfollow-playlist)
     async fn playlist_unfollow(&self, playlist_id: PlaylistId<'_>) -> ClientResult<()> {
         let url = format!("playlists/{}/followers", playlist_id.id());
-        self.endpoint_delete(&url, &json!({})).await?;
+        self.api_delete(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -310,7 +310,7 @@ pub trait OAuthClient: BaseClient {
             .build();
 
         let url = format!("playlists/{}/tracks", playlist_id.id());
-        let result = self.endpoint_post(&url, &params).await?;
+        let result = self.api_post(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -331,7 +331,7 @@ pub trait OAuthClient: BaseClient {
         let params = JsonBuilder::new().required("uris", uris).build();
 
         let url = format!("playlists/{}/tracks", playlist_id.id());
-        self.endpoint_put(&url, &params).await?;
+        self.api_put(&url, &params).await?;
 
         Ok(())
     }
@@ -364,7 +364,7 @@ pub trait OAuthClient: BaseClient {
             .build();
 
         let url = format!("playlists/{}/tracks", playlist_id.id());
-        let result = self.endpoint_put(&url, &params).await?;
+        let result = self.api_put(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -397,7 +397,7 @@ pub trait OAuthClient: BaseClient {
             .build();
 
         let url = format!("playlists/{}/tracks", playlist_id.id());
-        let result = self.endpoint_delete(&url, &params).await?;
+        let result = self.api_delete(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -452,7 +452,7 @@ pub trait OAuthClient: BaseClient {
             .build();
 
         let url = format!("playlists/{}/tracks", playlist_id.id());
-        let result = self.endpoint_delete(&url, &params).await?;
+        let result = self.api_delete(&url, &params).await?;
         convert_result(&result)
     }
 
@@ -471,7 +471,7 @@ pub trait OAuthClient: BaseClient {
 
         let params = JsonBuilder::new().optional("public", public).build();
 
-        self.endpoint_put(&url, &params).await?;
+        self.api_put(&url, &params).await?;
 
         Ok(())
     }
@@ -481,7 +481,7 @@ pub trait OAuthClient: BaseClient {
     ///
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/get-current-users-profile)
     async fn me(&self) -> ClientResult<PrivateUser> {
-        let result = self.endpoint_get("me/", &Query::new()).await?;
+        let result = self.api_get("me/", &Query::new()).await?;
         convert_result(&result)
     }
 
@@ -498,7 +498,7 @@ pub trait OAuthClient: BaseClient {
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/get-the-users-currently-playing-track)
     async fn current_user_playing_item(&self) -> ClientResult<Option<CurrentlyPlayingContext>> {
         let result = self
-            .endpoint_get("me/player/currently-playing", &Query::new())
+            .api_get("me/player/currently-playing", &Query::new())
             .await?;
         if result.is_empty() {
             Ok(None)
@@ -546,7 +546,7 @@ pub trait OAuthClient: BaseClient {
             ("offset", offset.as_deref()),
         ]);
 
-        let result = self.endpoint_get("me/albums", &params).await?;
+        let result = self.api_get("me/albums", &params).await?;
         convert_result(&result)
     }
 
@@ -589,7 +589,7 @@ pub trait OAuthClient: BaseClient {
             ("offset", offset.as_deref()),
         ]);
 
-        let result = self.endpoint_get("me/tracks", &params).await?;
+        let result = self.api_get("me/tracks", &params).await?;
         convert_result(&result)
     }
 
@@ -612,7 +612,7 @@ pub trait OAuthClient: BaseClient {
             ("limit", limit.as_deref()),
         ]);
 
-        let result = self.endpoint_get("me/following", &params).await?;
+        let result = self.api_get("me/following", &params).await?;
         convert_result::<CursorPageFullArtists>(&result).map(|x| x.artists)
     }
 
@@ -627,7 +627,7 @@ pub trait OAuthClient: BaseClient {
         track_ids: impl IntoIterator<Item = TrackId<'a>> + Send + 'a,
     ) -> ClientResult<()> {
         let url = format!("me/tracks/?ids={}", join_ids(track_ids));
-        self.endpoint_delete(&url, &json!({})).await?;
+        self.api_delete(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -644,7 +644,7 @@ pub trait OAuthClient: BaseClient {
         track_ids: impl IntoIterator<Item = TrackId<'a>> + Send + 'a,
     ) -> ClientResult<Vec<bool>> {
         let url = format!("me/tracks/contains/?ids={}", join_ids(track_ids));
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result(&result)
     }
 
@@ -659,7 +659,7 @@ pub trait OAuthClient: BaseClient {
         track_ids: impl IntoIterator<Item = TrackId<'a>> + Send + 'a,
     ) -> ClientResult<()> {
         let url = format!("me/tracks/?ids={}", join_ids(track_ids));
-        self.endpoint_put(&url, &json!({})).await?;
+        self.api_put(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -702,7 +702,7 @@ pub trait OAuthClient: BaseClient {
             ("offset", offset.as_deref()),
         ]);
 
-        let result = self.endpoint_get("me/top/artists", &params).await?;
+        let result = self.api_get("me/top/artists", &params).await?;
         convert_result(&result)
     }
 
@@ -744,7 +744,7 @@ pub trait OAuthClient: BaseClient {
             ("offset", offset.as_deref()),
         ]);
 
-        let result = self.endpoint_get("me/top/tracks", &params).await?;
+        let result = self.api_get("me/top/tracks", &params).await?;
         convert_result(&result)
     }
 
@@ -774,7 +774,7 @@ pub trait OAuthClient: BaseClient {
         }
 
         let result = self
-            .endpoint_get("me/player/recently-played", &params)
+            .api_get("me/player/recently-played", &params)
             .await?;
         convert_result(&result)
     }
@@ -790,7 +790,7 @@ pub trait OAuthClient: BaseClient {
         album_ids: impl IntoIterator<Item = AlbumId<'a>> + Send + 'a,
     ) -> ClientResult<()> {
         let url = format!("me/albums/?ids={}", join_ids(album_ids));
-        self.endpoint_put(&url, &json!({})).await?;
+        self.api_put(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -806,7 +806,7 @@ pub trait OAuthClient: BaseClient {
         album_ids: impl IntoIterator<Item = AlbumId<'a>> + Send + 'a,
     ) -> ClientResult<()> {
         let url = format!("me/albums/?ids={}", join_ids(album_ids));
-        self.endpoint_delete(&url, &json!({})).await?;
+        self.api_delete(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -823,7 +823,7 @@ pub trait OAuthClient: BaseClient {
         album_ids: impl IntoIterator<Item = AlbumId<'a>> + Send + 'a,
     ) -> ClientResult<Vec<bool>> {
         let url = format!("me/albums/contains/?ids={}", join_ids(album_ids));
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result(&result)
     }
 
@@ -838,7 +838,7 @@ pub trait OAuthClient: BaseClient {
         artist_ids: impl IntoIterator<Item = ArtistId<'a>> + Send + 'a,
     ) -> ClientResult<()> {
         let url = format!("me/following?type=artist&ids={}", join_ids(artist_ids));
-        self.endpoint_put(&url, &json!({})).await?;
+        self.api_put(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -854,7 +854,7 @@ pub trait OAuthClient: BaseClient {
         artist_ids: impl IntoIterator<Item = ArtistId<'a>> + Send + 'a,
     ) -> ClientResult<()> {
         let url = format!("me/following?type=artist&ids={}", join_ids(artist_ids));
-        self.endpoint_delete(&url, &json!({})).await?;
+        self.api_delete(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -874,7 +874,7 @@ pub trait OAuthClient: BaseClient {
             "me/following/contains?type=artist&ids={}",
             join_ids(artist_ids)
         );
-        let result = self.endpoint_get(&url, &Query::new()).await?;
+        let result = self.api_get(&url, &Query::new()).await?;
         convert_result(&result)
     }
 
@@ -889,7 +889,7 @@ pub trait OAuthClient: BaseClient {
         user_ids: impl IntoIterator<Item = UserId<'a>> + Send + 'a,
     ) -> ClientResult<()> {
         let url = format!("me/following?type=user&ids={}", join_ids(user_ids));
-        self.endpoint_put(&url, &json!({})).await?;
+        self.api_put(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -905,7 +905,7 @@ pub trait OAuthClient: BaseClient {
         user_ids: impl IntoIterator<Item = UserId<'a>> + Send + 'a,
     ) -> ClientResult<()> {
         let url = format!("me/following?type=user&ids={}", join_ids(user_ids));
-        self.endpoint_delete(&url, &json!({})).await?;
+        self.api_delete(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -915,7 +915,7 @@ pub trait OAuthClient: BaseClient {
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/get-a-users-available-devices)
     async fn device(&self) -> ClientResult<Vec<Device>> {
         let result = self
-            .endpoint_get("me/player/devices", &Query::new())
+            .api_get("me/player/devices", &Query::new())
             .await?;
         convert_result::<DevicePayload>(&result).map(|x| x.devices)
     }
@@ -945,7 +945,7 @@ pub trait OAuthClient: BaseClient {
             ("additional_types", additional_types.as_deref()),
         ]);
 
-        let result = self.endpoint_get("me/player", &params).await?;
+        let result = self.api_get("me/player", &params).await?;
         if result.is_empty() {
             Ok(None)
         } else {
@@ -979,7 +979,7 @@ pub trait OAuthClient: BaseClient {
         ]);
 
         let result = self
-            .endpoint_get("me/player/currently-playing", &params)
+            .api_get("me/player/currently-playing", &params)
             .await?;
         if result.is_empty() {
             Ok(None)
@@ -993,7 +993,7 @@ pub trait OAuthClient: BaseClient {
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/get-queue)
     async fn current_user_queue(&self) -> ClientResult<CurrentUserQueue> {
         let params = build_map([]);
-        let result = self.endpoint_get("me/player/queue", &params).await?;
+        let result = self.api_get("me/player/queue", &params).await?;
         convert_result(&result)
     }
 
@@ -1013,7 +1013,7 @@ pub trait OAuthClient: BaseClient {
             .optional("play", play)
             .build();
 
-        self.endpoint_put("me/player", &params).await?;
+        self.api_put("me/player", &params).await?;
         Ok(())
     }
 
@@ -1054,7 +1054,7 @@ pub trait OAuthClient: BaseClient {
             .build();
 
         let url = append_device_id("me/player/play", device_id);
-        self.endpoint_put(&url, &params).await?;
+        self.api_put(&url, &params).await?;
 
         Ok(())
     }
@@ -1093,7 +1093,7 @@ pub trait OAuthClient: BaseClient {
             .build();
 
         let url = append_device_id("me/player/play", device_id);
-        self.endpoint_put(&url, &params).await?;
+        self.api_put(&url, &params).await?;
 
         Ok(())
     }
@@ -1106,7 +1106,7 @@ pub trait OAuthClient: BaseClient {
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/pause-a-users-playback)
     async fn pause_playback(&self, device_id: Option<&str>) -> ClientResult<()> {
         let url = append_device_id("me/player/pause", device_id);
-        self.endpoint_put(&url, &json!({})).await?;
+        self.api_put(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -1128,7 +1128,7 @@ pub trait OAuthClient: BaseClient {
             .build();
 
         let url = append_device_id("me/player/play", device_id);
-        self.endpoint_put(&url, &params).await?;
+        self.api_put(&url, &params).await?;
 
         Ok(())
     }
@@ -1141,7 +1141,7 @@ pub trait OAuthClient: BaseClient {
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/skip-users-playback-to-next-track)
     async fn next_track(&self, device_id: Option<&str>) -> ClientResult<()> {
         let url = append_device_id("me/player/next", device_id);
-        self.endpoint_post(&url, &json!({})).await?;
+        self.api_post(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -1154,7 +1154,7 @@ pub trait OAuthClient: BaseClient {
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/skip-users-playback-to-previous-track)
     async fn previous_track(&self, device_id: Option<&str>) -> ClientResult<()> {
         let url = append_device_id("me/player/previous", device_id);
-        self.endpoint_post(&url, &json!({})).await?;
+        self.api_post(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -1175,7 +1175,7 @@ pub trait OAuthClient: BaseClient {
             &format!("me/player/seek?position_ms={}", position.num_milliseconds()),
             device_id,
         );
-        self.endpoint_put(&url, &json!({})).await?;
+        self.api_put(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -1192,7 +1192,7 @@ pub trait OAuthClient: BaseClient {
             &format!("me/player/repeat?state={}", <&str>::from(state)),
             device_id,
         );
-        self.endpoint_put(&url, &json!({})).await?;
+        self.api_put(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -1213,7 +1213,7 @@ pub trait OAuthClient: BaseClient {
             &format!("me/player/volume?volume_percent={volume_percent}"),
             device_id,
         );
-        self.endpoint_put(&url, &json!({})).await?;
+        self.api_put(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -1227,7 +1227,7 @@ pub trait OAuthClient: BaseClient {
     /// [Reference](https://developer.spotify.com/documentation/web-api/reference/#/operations/toggle-shuffle-for-users-playback)
     async fn shuffle(&self, state: bool, device_id: Option<&str>) -> ClientResult<()> {
         let url = append_device_id(&format!("me/player/shuffle?state={state}"), device_id);
-        self.endpoint_put(&url, &json!({})).await?;
+        self.api_put(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -1247,7 +1247,7 @@ pub trait OAuthClient: BaseClient {
         device_id: Option<&str>,
     ) -> ClientResult<()> {
         let url = append_device_id(&format!("me/player/queue?uri={}", item.uri()), device_id);
-        self.endpoint_post(&url, &json!({})).await?;
+        self.api_post(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -1264,7 +1264,7 @@ pub trait OAuthClient: BaseClient {
         show_ids: impl IntoIterator<Item = ShowId<'a>> + Send + 'a,
     ) -> ClientResult<()> {
         let url = format!("me/shows/?ids={}", join_ids(show_ids));
-        self.endpoint_put(&url, &json!({})).await?;
+        self.api_put(&url, &json!({})).await?;
 
         Ok(())
     }
@@ -1299,7 +1299,7 @@ pub trait OAuthClient: BaseClient {
         let offset = offset.map(|x| x.to_string());
         let params = build_map([("limit", limit.as_deref()), ("offset", offset.as_deref())]);
 
-        let result = self.endpoint_get("me/shows", &params).await?;
+        let result = self.api_get("me/shows", &params).await?;
         convert_result(&result)
     }
 
@@ -1315,7 +1315,7 @@ pub trait OAuthClient: BaseClient {
     ) -> ClientResult<Vec<bool>> {
         let ids = join_ids(ids);
         let params = build_map([("ids", Some(&ids))]);
-        let result = self.endpoint_get("me/shows/contains", &params).await?;
+        let result = self.api_get("me/shows/contains", &params).await?;
         convert_result(&result)
     }
 
@@ -1336,7 +1336,7 @@ pub trait OAuthClient: BaseClient {
         let params = JsonBuilder::new()
             .optional("country", country.map(<&str>::from))
             .build();
-        self.endpoint_delete(&url, &params).await?;
+        self.api_delete(&url, &params).await?;
 
         Ok(())
     }
diff --git a/src/lib.rs b/src/lib.rs
index 6f9fda74..54db7851 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -235,10 +235,10 @@ pub const DEFAULT_PAGINATION_CHUNKS: u32 = 50;
 /// Struct to configure the Spotify client.
 #[derive(Debug, Clone)]
 pub struct Config {
-    /// The Spotify API prefix, [`DEFAULT_API_PREFIX`] by default.
+    /// The Spotify API prefix, [`DEFAULT_API_BASE_URL`] by default.
     pub api_base_url: String,
 
-    /// The Spotify Authentication prefix, [`DEFAULT_AUTH_PREFIX`] by default.
+    /// The Spotify Authentication prefix, [`DEFAULT_AUTH_BASE_URL`] by default.
     pub auth_base_url: String,
 
     /// The cache file path, in case it's used. By default it's