diff --git a/wp_api/src/jetpack/endpoint/connection_endpoint.rs b/wp_api/src/jetpack/endpoint/connection_endpoint.rs
index fa92f1c09..dd7ae0ddf 100644
--- a/wp_api/src/jetpack/endpoint/connection_endpoint.rs
+++ b/wp_api/src/jetpack/endpoint/connection_endpoint.rs
@@ -19,7 +19,7 @@ enum ConnectionRequest {
 }
 
 impl DerivedRequest for ConnectionRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         JetpackNamespace {}
     }
 }
diff --git a/wp_api/src/request/endpoint.rs b/wp_api/src/request/endpoint.rs
index 656a34e7b..b4821286d 100644
--- a/wp_api/src/request/endpoint.rs
+++ b/wp_api/src/request/endpoint.rs
@@ -90,7 +90,7 @@ pub trait DerivedRequest {
         Vec::new()
     }
 
-    fn namespace() -> impl AsNamespace;
+    fn namespace(&self) -> impl AsNamespace;
 }
 
 pub trait AsNamespace: Send + Sync {
diff --git a/wp_api/src/request/endpoint/api_root_endpoint.rs b/wp_api/src/request/endpoint/api_root_endpoint.rs
index 5d8bd6e03..1001ea08a 100644
--- a/wp_api/src/request/endpoint/api_root_endpoint.rs
+++ b/wp_api/src/request/endpoint/api_root_endpoint.rs
@@ -10,7 +10,7 @@ enum ApiRootRequest {
 }
 
 impl DerivedRequest for ApiRootRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::None
     }
 }
diff --git a/wp_api/src/request/endpoint/application_passwords_endpoint.rs b/wp_api/src/request/endpoint/application_passwords_endpoint.rs
index 9d63b1ae2..9858c77e1 100644
--- a/wp_api/src/request/endpoint/application_passwords_endpoint.rs
+++ b/wp_api/src/request/endpoint/application_passwords_endpoint.rs
@@ -35,7 +35,7 @@ enum ApplicationPasswordsRequest {
 }
 
 impl DerivedRequest for ApplicationPasswordsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/comments_endpoint.rs b/wp_api/src/request/endpoint/comments_endpoint.rs
index 5ec200484..9c8911ab1 100644
--- a/wp_api/src/request/endpoint/comments_endpoint.rs
+++ b/wp_api/src/request/endpoint/comments_endpoint.rs
@@ -27,7 +27,7 @@ impl DerivedRequest for CommentsRequest {
         }
     }
 
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/media_endpoint.rs b/wp_api/src/request/endpoint/media_endpoint.rs
index 5d5a890fb..664b379e3 100644
--- a/wp_api/src/request/endpoint/media_endpoint.rs
+++ b/wp_api/src/request/endpoint/media_endpoint.rs
@@ -28,7 +28,7 @@ impl DerivedRequest for MediaRequest {
         }
     }
 
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/menu_locations_endpoint.rs b/wp_api/src/request/endpoint/menu_locations_endpoint.rs
index d7568ede9..18c96aafe 100644
--- a/wp_api/src/request/endpoint/menu_locations_endpoint.rs
+++ b/wp_api/src/request/endpoint/menu_locations_endpoint.rs
@@ -11,7 +11,7 @@ enum MenuLocationsRequest {
 }
 
 impl DerivedRequest for MenuLocationsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/nav_menu_item_autosaves_endpoint.rs b/wp_api/src/request/endpoint/nav_menu_item_autosaves_endpoint.rs
index a52d19c93..3ecf80a2c 100644
--- a/wp_api/src/request/endpoint/nav_menu_item_autosaves_endpoint.rs
+++ b/wp_api/src/request/endpoint/nav_menu_item_autosaves_endpoint.rs
@@ -14,7 +14,7 @@ enum NavMenuItemAutosavesRequest {
 }
 
 impl DerivedRequest for NavMenuItemAutosavesRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/nav_menu_items_endpoint.rs b/wp_api/src/request/endpoint/nav_menu_items_endpoint.rs
index eac97cf3c..e44691150 100644
--- a/wp_api/src/request/endpoint/nav_menu_items_endpoint.rs
+++ b/wp_api/src/request/endpoint/nav_menu_items_endpoint.rs
@@ -26,7 +26,7 @@ impl DerivedRequest for NavMenuItemsRequest {
         }
     }
 
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/nav_menus_endpoint.rs b/wp_api/src/request/endpoint/nav_menus_endpoint.rs
index d53a06ab4..80746b8ac 100644
--- a/wp_api/src/request/endpoint/nav_menus_endpoint.rs
+++ b/wp_api/src/request/endpoint/nav_menus_endpoint.rs
@@ -24,7 +24,7 @@ impl DerivedRequest for NavMenusRequest {
         }
     }
 
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/navigation_autosaves_endpoint.rs b/wp_api/src/request/endpoint/navigation_autosaves_endpoint.rs
index e4ed3879f..26369ecc8 100644
--- a/wp_api/src/request/endpoint/navigation_autosaves_endpoint.rs
+++ b/wp_api/src/request/endpoint/navigation_autosaves_endpoint.rs
@@ -13,7 +13,7 @@ enum NavigationAutosavesRequest {
 }
 
 impl DerivedRequest for NavigationAutosavesRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/navigation_revisions_endpoint.rs b/wp_api/src/request/endpoint/navigation_revisions_endpoint.rs
index c87d6e79a..b261cab9d 100644
--- a/wp_api/src/request/endpoint/navigation_revisions_endpoint.rs
+++ b/wp_api/src/request/endpoint/navigation_revisions_endpoint.rs
@@ -16,7 +16,7 @@ enum NavigationRevisionsRequest {
 }
 
 impl DerivedRequest for NavigationRevisionsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 
diff --git a/wp_api/src/request/endpoint/navigations_endpoint.rs b/wp_api/src/request/endpoint/navigations_endpoint.rs
index 9ec29f1da..169b314d0 100644
--- a/wp_api/src/request/endpoint/navigations_endpoint.rs
+++ b/wp_api/src/request/endpoint/navigations_endpoint.rs
@@ -29,7 +29,7 @@ impl DerivedRequest for NavigationsRequest {
         }
     }
 
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/plugins_endpoint.rs b/wp_api/src/request/endpoint/plugins_endpoint.rs
index 85f741932..2327b1f5f 100644
--- a/wp_api/src/request/endpoint/plugins_endpoint.rs
+++ b/wp_api/src/request/endpoint/plugins_endpoint.rs
@@ -18,7 +18,7 @@ enum PluginsRequest {
 }
 
 impl DerivedRequest for PluginsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/post_autosaves_endpoint.rs b/wp_api/src/request/endpoint/post_autosaves_endpoint.rs
index 995519e83..6374c588b 100644
--- a/wp_api/src/request/endpoint/post_autosaves_endpoint.rs
+++ b/wp_api/src/request/endpoint/post_autosaves_endpoint.rs
@@ -16,7 +16,7 @@ enum AutosavesRequest {
 }
 
 impl DerivedRequest for AutosavesRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/post_revisions_endpoint.rs b/wp_api/src/request/endpoint/post_revisions_endpoint.rs
index 4e5254ef8..5487cb15c 100644
--- a/wp_api/src/request/endpoint/post_revisions_endpoint.rs
+++ b/wp_api/src/request/endpoint/post_revisions_endpoint.rs
@@ -17,7 +17,7 @@ enum PostRevisionsRequest {
 }
 
 impl DerivedRequest for PostRevisionsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 
diff --git a/wp_api/src/request/endpoint/post_statuses_endpoint.rs b/wp_api/src/request/endpoint/post_statuses_endpoint.rs
index a268de8dc..faca44497 100644
--- a/wp_api/src/request/endpoint/post_statuses_endpoint.rs
+++ b/wp_api/src/request/endpoint/post_statuses_endpoint.rs
@@ -11,7 +11,7 @@ enum PostStatusesRequest {
 }
 
 impl DerivedRequest for PostStatusesRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/post_types_endpoint.rs b/wp_api/src/request/endpoint/post_types_endpoint.rs
index 289ef3077..deff44e27 100644
--- a/wp_api/src/request/endpoint/post_types_endpoint.rs
+++ b/wp_api/src/request/endpoint/post_types_endpoint.rs
@@ -11,7 +11,7 @@ enum PostTypesRequest {
 }
 
 impl DerivedRequest for PostTypesRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/posts_endpoint.rs b/wp_api/src/request/endpoint/posts_endpoint.rs
index bdedcb7f8..b5e7e8279 100644
--- a/wp_api/src/request/endpoint/posts_endpoint.rs
+++ b/wp_api/src/request/endpoint/posts_endpoint.rs
@@ -47,7 +47,7 @@ impl DerivedRequest for PostsRequest {
         }
     }
 
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/search_endpoint.rs b/wp_api/src/request/endpoint/search_endpoint.rs
index 8b6e7049b..1e129a977 100644
--- a/wp_api/src/request/endpoint/search_endpoint.rs
+++ b/wp_api/src/request/endpoint/search_endpoint.rs
@@ -8,7 +8,7 @@ enum SearchRequest {
 }
 
 impl DerivedRequest for SearchRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/site_settings_endpoint.rs b/wp_api/src/request/endpoint/site_settings_endpoint.rs
index 1d61b6193..c9f17e1ef 100644
--- a/wp_api/src/request/endpoint/site_settings_endpoint.rs
+++ b/wp_api/src/request/endpoint/site_settings_endpoint.rs
@@ -10,7 +10,7 @@ enum SiteSettingsRequest {
 }
 
 impl DerivedRequest for SiteSettingsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/taxonomies_endpoint.rs b/wp_api/src/request/endpoint/taxonomies_endpoint.rs
index 4b0fc9bc5..18e0dd2bf 100644
--- a/wp_api/src/request/endpoint/taxonomies_endpoint.rs
+++ b/wp_api/src/request/endpoint/taxonomies_endpoint.rs
@@ -11,7 +11,7 @@ enum TaxonomiesRequest {
 }
 
 impl DerivedRequest for TaxonomiesRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/templates_endpoint.rs b/wp_api/src/request/endpoint/templates_endpoint.rs
index 9cd78e997..553a4fbaf 100644
--- a/wp_api/src/request/endpoint/templates_endpoint.rs
+++ b/wp_api/src/request/endpoint/templates_endpoint.rs
@@ -27,7 +27,7 @@ impl DerivedRequest for TemplatesRequest {
         }
     }
 
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/terms_endpoint.rs b/wp_api/src/request/endpoint/terms_endpoint.rs
index 2f83aeb65..5fa4e7a7b 100644
--- a/wp_api/src/request/endpoint/terms_endpoint.rs
+++ b/wp_api/src/request/endpoint/terms_endpoint.rs
@@ -46,7 +46,7 @@ impl DerivedRequest for TermsRequest {
         }
     }
 
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/themes_endpoint.rs b/wp_api/src/request/endpoint/themes_endpoint.rs
index c0270d32e..64a7f061e 100644
--- a/wp_api/src/request/endpoint/themes_endpoint.rs
+++ b/wp_api/src/request/endpoint/themes_endpoint.rs
@@ -11,7 +11,7 @@ enum ThemesRequest {
 }
 
 impl DerivedRequest for ThemesRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/users_endpoint.rs b/wp_api/src/request/endpoint/users_endpoint.rs
index b89aeba10..2b3076567 100644
--- a/wp_api/src/request/endpoint/users_endpoint.rs
+++ b/wp_api/src/request/endpoint/users_endpoint.rs
@@ -26,7 +26,7 @@ enum UsersRequest {
 }
 
 impl DerivedRequest for UsersRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/widget_types_endpoint.rs b/wp_api/src/request/endpoint/widget_types_endpoint.rs
index f9296d90c..9ee3b8f68 100644
--- a/wp_api/src/request/endpoint/widget_types_endpoint.rs
+++ b/wp_api/src/request/endpoint/widget_types_endpoint.rs
@@ -11,7 +11,7 @@ enum WidgetTypesRequest {
 }
 
 impl DerivedRequest for WidgetTypesRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/widgets_endpoint.rs b/wp_api/src/request/endpoint/widgets_endpoint.rs
index 60bb15a5e..cf22979b2 100644
--- a/wp_api/src/request/endpoint/widgets_endpoint.rs
+++ b/wp_api/src/request/endpoint/widgets_endpoint.rs
@@ -24,7 +24,7 @@ impl DerivedRequest for WidgetsRequest {
         }
     }
 
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpV2
     }
 }
diff --git a/wp_api/src/request/endpoint/wp_block_editor_endpoint.rs b/wp_api/src/request/endpoint/wp_block_editor_endpoint.rs
index 749237c38..edc85ea52 100644
--- a/wp_api/src/request/endpoint/wp_block_editor_endpoint.rs
+++ b/wp_api/src/request/endpoint/wp_block_editor_endpoint.rs
@@ -9,7 +9,7 @@ enum WpBlockEditorRequest {
 }
 
 impl DerivedRequest for WpBlockEditorRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpBlockEditorV1
     }
 }
diff --git a/wp_api/src/request/endpoint/wp_site_health_tests_endpoint.rs b/wp_api/src/request/endpoint/wp_site_health_tests_endpoint.rs
index e9a803a98..50611d268 100644
--- a/wp_api/src/request/endpoint/wp_site_health_tests_endpoint.rs
+++ b/wp_api/src/request/endpoint/wp_site_health_tests_endpoint.rs
@@ -27,7 +27,7 @@ enum WpSiteHealthTestsRequest {
 }
 
 impl DerivedRequest for WpSiteHealthTestsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpNamespace::WpSiteHealthV1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/domains_endpoint.rs b/wp_api/src/wp_com/endpoint/domains_endpoint.rs
index 5eca5f829..f063cde3c 100644
--- a/wp_api/src/wp_com/endpoint/domains_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/domains_endpoint.rs
@@ -14,7 +14,7 @@ enum DomainsRequest {
 }
 
 impl DerivedRequest for DomainsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/followers_endpoint.rs b/wp_api/src/wp_com/endpoint/followers_endpoint.rs
index 99908fbe6..557dd597d 100644
--- a/wp_api/src/wp_com/endpoint/followers_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/followers_endpoint.rs
@@ -16,7 +16,7 @@ enum FollowersRequest {
 }
 
 impl DerivedRequest for FollowersRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/jetpack_connection_endpoint.rs b/wp_api/src/wp_com/endpoint/jetpack_connection_endpoint.rs
index 2f67e3ad9..4ba0fea76 100644
--- a/wp_api/src/wp_com/endpoint/jetpack_connection_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/jetpack_connection_endpoint.rs
@@ -14,7 +14,7 @@ enum JetpackConnectionRequest {
 }
 
 impl DerivedRequest for JetpackConnectionRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::V2
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/languages_endpoint.rs b/wp_api/src/wp_com/endpoint/languages_endpoint.rs
index bf93e04e5..fb2cd86a8 100644
--- a/wp_api/src/wp_com/endpoint/languages_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/languages_endpoint.rs
@@ -12,7 +12,7 @@ enum LanguagesRequest {
 }
 
 impl DerivedRequest for LanguagesRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::V2
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/me_endpoint.rs b/wp_api/src/wp_com/endpoint/me_endpoint.rs
index ea1177bf5..2bb7ce4d3 100644
--- a/wp_api/src/wp_com/endpoint/me_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/me_endpoint.rs
@@ -12,7 +12,7 @@ enum MeRequest {
 }
 
 impl DerivedRequest for MeRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/oauth2.rs b/wp_api/src/wp_com/endpoint/oauth2.rs
index ec1ffc140..f826fb3cb 100644
--- a/wp_api/src/wp_com/endpoint/oauth2.rs
+++ b/wp_api/src/wp_com/endpoint/oauth2.rs
@@ -27,7 +27,7 @@ enum Oauth2Request {
 }
 
 impl DerivedRequest for Oauth2Request {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::Oauth2
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/segments_endpoint.rs b/wp_api/src/wp_com/endpoint/segments_endpoint.rs
index 419ba9df3..ee6a1d33b 100644
--- a/wp_api/src/wp_com/endpoint/segments_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/segments_endpoint.rs
@@ -11,7 +11,7 @@ enum SegmentsRequest {
 }
 
 impl DerivedRequest for SegmentsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::V2
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/sites_endpoint.rs b/wp_api/src/wp_com/endpoint/sites_endpoint.rs
index 0ca2bc2e8..40be9b705 100644
--- a/wp_api/src/wp_com/endpoint/sites_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/sites_endpoint.rs
@@ -19,7 +19,7 @@ enum SitesRequest {
 }
 
 impl DerivedRequest for SitesRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_2
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_city_views_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_city_views_endpoint.rs
index 68226906e..10fd22532 100644
--- a/wp_api/src/wp_com/endpoint/stats_city_views_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_city_views_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsCityViewsRequest {
 }
 
 impl DerivedRequest for StatsCityViewsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_clicks_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_clicks_endpoint.rs
index bc19bcb90..5654e6bf2 100644
--- a/wp_api/src/wp_com/endpoint/stats_clicks_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_clicks_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsClicksRequest {
 }
 
 impl DerivedRequest for StatsClicksRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_country_views_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_country_views_endpoint.rs
index 6e1b3a056..ccde3a8b0 100644
--- a/wp_api/src/wp_com/endpoint/stats_country_views_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_country_views_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsCountryViewsRequest {
 }
 
 impl DerivedRequest for StatsCountryViewsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_devices_browser_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_devices_browser_endpoint.rs
index cca989fee..24317628b 100644
--- a/wp_api/src/wp_com/endpoint/stats_devices_browser_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_devices_browser_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsDevicesBrowserRequest {
 }
 
 impl DerivedRequest for StatsDevicesBrowserRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_devices_platform_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_devices_platform_endpoint.rs
index 064d75ad3..a21652f81 100644
--- a/wp_api/src/wp_com/endpoint/stats_devices_platform_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_devices_platform_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsDevicesPlatformRequest {
 }
 
 impl DerivedRequest for StatsDevicesPlatformRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_devices_screensize_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_devices_screensize_endpoint.rs
index 53bafb54b..0c308c736 100644
--- a/wp_api/src/wp_com/endpoint/stats_devices_screensize_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_devices_screensize_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsDevicesScreensizeRequest {
 }
 
 impl DerivedRequest for StatsDevicesScreensizeRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_emails_summary_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_emails_summary_endpoint.rs
index 1b853f75a..854741031 100644
--- a/wp_api/src/wp_com/endpoint/stats_emails_summary_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_emails_summary_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsEmailsSummaryRequest {
 }
 
 impl DerivedRequest for StatsEmailsSummaryRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_file_downloads_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_file_downloads_endpoint.rs
index 7b5372b69..631ea18a5 100644
--- a/wp_api/src/wp_com/endpoint/stats_file_downloads_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_file_downloads_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsFileDownloadsRequest {
 }
 
 impl DerivedRequest for StatsFileDownloadsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_insights_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_insights_endpoint.rs
index 0c4a2238f..6d23d0471 100644
--- a/wp_api/src/wp_com/endpoint/stats_insights_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_insights_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsInsightsRequest {
 }
 
 impl DerivedRequest for StatsInsightsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_referrers_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_referrers_endpoint.rs
index 589029919..4ea02de7b 100644
--- a/wp_api/src/wp_com/endpoint/stats_referrers_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_referrers_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsReferrersRequest {
 }
 
 impl DerivedRequest for StatsReferrersRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_region_views_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_region_views_endpoint.rs
index e9f0c0a68..a964a54a0 100644
--- a/wp_api/src/wp_com/endpoint/stats_region_views_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_region_views_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsRegionViewsRequest {
 }
 
 impl DerivedRequest for StatsRegionViewsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_search_terms_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_search_terms_endpoint.rs
index 11f921c99..1047cd7c0 100644
--- a/wp_api/src/wp_com/endpoint/stats_search_terms_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_search_terms_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsSearchTermsRequest {
 }
 
 impl DerivedRequest for StatsSearchTermsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_subscribers_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_subscribers_endpoint.rs
index 1e3c4543a..e89384ab9 100644
--- a/wp_api/src/wp_com/endpoint/stats_subscribers_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_subscribers_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsSubscribersRequest {
 }
 
 impl DerivedRequest for StatsSubscribersRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_summary_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_summary_endpoint.rs
index 379d465bb..70fa24a22 100644
--- a/wp_api/src/wp_com/endpoint/stats_summary_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_summary_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsSummaryRequest {
 }
 
 impl DerivedRequest for StatsSummaryRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_tags_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_tags_endpoint.rs
index ac0493830..1ad138e57 100644
--- a/wp_api/src/wp_com/endpoint/stats_tags_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_tags_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsTagsRequest {
 }
 
 impl DerivedRequest for StatsTagsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_top_authors_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_top_authors_endpoint.rs
index 7adbadc12..3ab01de30 100644
--- a/wp_api/src/wp_com/endpoint/stats_top_authors_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_top_authors_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsTopAuthorsRequest {
 }
 
 impl DerivedRequest for StatsTopAuthorsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_top_posts_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_top_posts_endpoint.rs
index 5872ca83e..9900eaab3 100644
--- a/wp_api/src/wp_com/endpoint/stats_top_posts_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_top_posts_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsTopPostsRequest {
 }
 
 impl DerivedRequest for StatsTopPostsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_utm_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_utm_endpoint.rs
index 0f1f2c830..2035435d1 100644
--- a/wp_api/src/wp_com/endpoint/stats_utm_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_utm_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsUtmRequest {
 }
 
 impl DerivedRequest for StatsUtmRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_video_plays_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_video_plays_endpoint.rs
index 7633cc7f5..62832c335 100644
--- a/wp_api/src/wp_com/endpoint/stats_video_plays_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_video_plays_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsVideoPlaysRequest {
 }
 
 impl DerivedRequest for StatsVideoPlaysRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/stats_visits_endpoint.rs b/wp_api/src/wp_com/endpoint/stats_visits_endpoint.rs
index c576cb62f..b72843643 100644
--- a/wp_api/src/wp_com/endpoint/stats_visits_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/stats_visits_endpoint.rs
@@ -14,7 +14,7 @@ enum StatsVisitsRequest {
 }
 
 impl DerivedRequest for StatsVisitsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::RestV1_1
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/subscribers_endpoint.rs b/wp_api/src/wp_com/endpoint/subscribers_endpoint.rs
index 4d529f817..9c6db58f6 100644
--- a/wp_api/src/wp_com/endpoint/subscribers_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/subscribers_endpoint.rs
@@ -33,7 +33,7 @@ enum SubscribersRequest {
 }
 
 impl DerivedRequest for SubscribersRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::V2
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/support_bots_endpoint.rs b/wp_api/src/wp_com/endpoint/support_bots_endpoint.rs
index ca2d299c8..8507a5c76 100644
--- a/wp_api/src/wp_com/endpoint/support_bots_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/support_bots_endpoint.rs
@@ -30,7 +30,7 @@ enum SupportBotsRequest {
 }
 
 impl DerivedRequest for SupportBotsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::V2
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/support_eligibility_endpoint.rs b/wp_api/src/wp_com/endpoint/support_eligibility_endpoint.rs
index 07f09590d..3180d221a 100644
--- a/wp_api/src/wp_com/endpoint/support_eligibility_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/support_eligibility_endpoint.rs
@@ -12,7 +12,7 @@ enum SupportEligibilityRequest {
 }
 
 impl DerivedRequest for SupportEligibilityRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::V2
     }
 }
diff --git a/wp_api/src/wp_com/endpoint/support_tickets_endpoint.rs b/wp_api/src/wp_com/endpoint/support_tickets_endpoint.rs
index e089d92e6..398375fc2 100644
--- a/wp_api/src/wp_com/endpoint/support_tickets_endpoint.rs
+++ b/wp_api/src/wp_com/endpoint/support_tickets_endpoint.rs
@@ -23,7 +23,7 @@ enum SupportTicketsRequest {
 }
 
 impl DerivedRequest for SupportTicketsRequest {
-    fn namespace() -> impl AsNamespace {
+    fn namespace(&self) -> impl AsNamespace {
         WpComNamespace::V2
     }
 }
diff --git a/wp_derive_request_builder/src/generate.rs b/wp_derive_request_builder/src/generate.rs
index 005ae8200..8518f6958 100644
--- a/wp_derive_request_builder/src/generate.rs
+++ b/wp_derive_request_builder/src/generate.rs
@@ -339,8 +339,11 @@ fn generate_endpoint_type(config: &Config, parsed_enum: &ParsedEnum) -> TokenStr
         let url_parts = variant.attr.url_parts.as_slice();
         let params_type = &variant.attr.params;
         let request_type = variant.attr.request_type;
-        let url_from_api_url_resolver =
-            fn_body_get_url_from_api_url_resolver(&parsed_enum.enum_ident, url_parts);
+        let url_from_api_url_resolver = fn_body_get_url_from_api_url_resolver(
+            &parsed_enum.enum_ident,
+            &variant.variant_ident,
+            url_parts,
+        );
         let query_pairs =
             fn_body_query_pairs(&config.crate_ident, params_type.as_ref(), request_type);
         let additional_query_pairs =
diff --git a/wp_derive_request_builder/src/generate/helpers_to_generate_tokens.rs b/wp_derive_request_builder/src/generate/helpers_to_generate_tokens.rs
index c754897c2..62f4a613f 100644
--- a/wp_derive_request_builder/src/generate/helpers_to_generate_tokens.rs
+++ b/wp_derive_request_builder/src/generate/helpers_to_generate_tokens.rs
@@ -269,6 +269,7 @@ fn fn_arg_fields(context_and_filter_handler: &ContextAndFilterHandler) -> TokenS
 
 pub fn fn_body_get_url_from_api_url_resolver(
     enum_ident: &Ident,
+    variant_ident: &Ident,
     url_parts: &[UrlPart],
 ) -> TokenStream {
     let url_parts = url_parts
@@ -282,7 +283,7 @@ pub fn fn_body_get_url_from_api_url_resolver(
         })
         .collect::<Vec<TokenStream>>();
     quote! {
-        let mut url = std::sync::Arc::unwrap_or_clone(self.api_url_resolver.resolve( #enum_ident::namespace().namespace_value().to_string() , vec![#(#url_parts,)*])).inner;
+        let mut url = std::sync::Arc::unwrap_or_clone(self.api_url_resolver.resolve( #enum_ident::namespace(&#enum_ident::#variant_ident).namespace_value().to_string() , vec![#(#url_parts,)*])).inner;
     }
 }
 
@@ -1002,34 +1003,39 @@ mod tests {
     #[rstest]
     #[case(
         url_static_users(),
-        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace () . namespace_value () . to_string () , vec ! [\"users\" . to_string () ,])) . inner ;"
+        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace (& Foo :: Bar) . namespace_value () . to_string () , vec ! [\"users\" . to_string () ,])) . inner ;"
     )]
     #[case(
         url_users_with_user_id(),
-        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace () . namespace_value () . to_string () , vec ! [\"users\" . to_string () , user_id . to_string () ,])) . inner ;"
+        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace (& Foo :: Bar) . namespace_value () . to_string () , vec ! [\"users\" . to_string () , user_id . to_string () ,])) . inner ;"
     )]
     #[case(
         url_users_with_user_id(),
-        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace () . namespace_value () . to_string () , vec ! [\"users\" . to_string () , user_id . to_string () ,])) . inner ;"
+        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace (& Foo :: Bar) . namespace_value () . to_string () , vec ! [\"users\" . to_string () , user_id . to_string () ,])) . inner ;"
     )]
     #[case(
         vec![UrlPart::Dynamic("user_id".to_string()), UrlPart::Dynamic("user_type".to_string())],
-        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace () . namespace_value () . to_string () , vec ! [user_id . to_string () , user_type . to_string () ,])) . inner ;"
+        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace (& Foo :: Bar) . namespace_value () . to_string () , vec ! [user_id . to_string () , user_type . to_string () ,])) . inner ;"
     )]
     #[case(
         vec![UrlPart::Static("users".to_string()), UrlPart::Dynamic("user_id".to_string()), UrlPart::Dynamic("user_type".to_string()), ],
-        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace () . namespace_value () . to_string () , vec ! [\"users\" . to_string () , user_id . to_string () , user_type . to_string () ,])) . inner ;"
+        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace (& Foo :: Bar) . namespace_value () . to_string () , vec ! [\"users\" . to_string () , user_id . to_string () , user_type . to_string () ,])) . inner ;"
     )]
     #[case(
         vec![UrlPart::Static("users".to_string()), UrlPart::Static("me".to_string()), UrlPart::Dynamic("user_id".to_string()), UrlPart::Dynamic("user_type".to_string()), ],
-        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace () . namespace_value () . to_string () , vec ! [\"users\" . to_string () , \"me\" . to_string () , user_id . to_string () , user_type . to_string () ,])) . inner ;"
+        "let mut url = std :: sync :: Arc :: unwrap_or_clone (self . api_url_resolver . resolve (Foo :: namespace (& Foo :: Bar) . namespace_value () . to_string () , vec ! [\"users\" . to_string () , \"me\" . to_string () , user_id . to_string () , user_type . to_string () ,])) . inner ;"
     )]
     fn test_fn_body_get_url_from_api_root_url(
         #[case] url_parts: Vec<UrlPart>,
         #[case] expected_str: &str,
     ) {
         assert_eq!(
-            fn_body_get_url_from_api_url_resolver(&format_ident!("Foo"), &url_parts).to_string(),
+            fn_body_get_url_from_api_url_resolver(
+                &format_ident!("Foo"),
+                &format_ident!("Bar"),
+                &url_parts
+            )
+            .to_string(),
             expected_str
         );
     }