diff --git a/lib/src/endpoints/application_passwords.dart b/lib/src/endpoints/application_passwords.dart
index 8eace61..54f207d 100644
--- a/lib/src/endpoints/application_passwords.dart
+++ b/lib/src/endpoints/application_passwords.dart
@@ -1,10 +1,10 @@
 part of '../main.dart';
 
-class _ApplicationPasswords {
+class ApplicationPasswordsEndpoint {
   static const String _name = 'application-passwords';
   final WordPressAPI _api;
 
-  _ApplicationPasswords(this._api);
+  ApplicationPasswordsEndpoint(this._api);
 
   /// [id] is the user id
   Future<WPResponse> fetch(int id, {int? appId}) async {
diff --git a/lib/src/endpoints/categories.dart b/lib/src/endpoints/categories.dart
index 54e74e7..ef591c2 100644
--- a/lib/src/endpoints/categories.dart
+++ b/lib/src/endpoints/categories.dart
@@ -1,10 +1,10 @@
 part of '../main.dart';
 
-class _Categories {
+class CategoriesEndpoint {
   static const String _name = 'categories';
   final WordPressAPI _api;
 
-  _Categories(this._api);
+  CategoriesEndpoint(this._api);
 
   /// [GET] categories from WP categories endpoint
   ///
diff --git a/lib/src/endpoints/comments.dart b/lib/src/endpoints/comments.dart
index c31f33a..7359b82 100644
--- a/lib/src/endpoints/comments.dart
+++ b/lib/src/endpoints/comments.dart
@@ -1,10 +1,10 @@
 part of '../main.dart';
 
-class _Comments {
+class CommentsEndpoint {
   static const String _name = 'comments';
   final WordPressAPI _api;
 
-  _Comments(this._api);
+  CommentsEndpoint(this._api);
 
   /// [GET] comments from WP comments endpoint
   ///
diff --git a/lib/src/endpoints/job_listings.dart b/lib/src/endpoints/job_listings.dart
index 155f5b1..93801d0 100644
--- a/lib/src/endpoints/job_listings.dart
+++ b/lib/src/endpoints/job_listings.dart
@@ -1,10 +1,10 @@
 part of '../main.dart';
 
-class _JobListings {
+class JobListingsEndpoint {
   static const String _name = 'job-listings';
   final WordPressAPI _api;
 
-  _JobListings(this._api);
+  JobListingsEndpoint(this._api);
 
   /// [GET] job listings from `WP Job Manager` endpoint
   ///
diff --git a/lib/src/endpoints/media.dart b/lib/src/endpoints/media.dart
index 957824a..0b0fc3a 100644
--- a/lib/src/endpoints/media.dart
+++ b/lib/src/endpoints/media.dart
@@ -1,10 +1,10 @@
 part of '../main.dart';
 
-class _Media {
+class MediaEndpoint {
   static const String _name = 'media';
   final WordPressAPI _api;
 
-  _Media(this._api);
+  MediaEndpoint(this._api);
 
   /// [GET] media from WP media endpoint
   ///
diff --git a/lib/src/endpoints/pages.dart b/lib/src/endpoints/pages.dart
index 045ed0c..497e67c 100644
--- a/lib/src/endpoints/pages.dart
+++ b/lib/src/endpoints/pages.dart
@@ -1,10 +1,10 @@
 part of '../main.dart';
 
-class _Pages {
+class PagesEndpoint {
   static const String _name = 'pages';
   final WordPressAPI _api;
 
-  _Pages(this._api);
+  PagesEndpoint(this._api);
 
   /// [GET] pages from WP pages endpoint
   ///
diff --git a/lib/src/endpoints/posts.dart b/lib/src/endpoints/posts.dart
index b1be052..c2b26ae 100644
--- a/lib/src/endpoints/posts.dart
+++ b/lib/src/endpoints/posts.dart
@@ -1,10 +1,10 @@
 part of '../main.dart';
 
-class _Posts {
+class PostsEndpoint {
   static const String _name = 'posts';
   final WordPressAPI _api;
 
-  _Posts(this._api);
+  PostsEndpoint(this._api);
 
   /// `[GET]` posts from WP posts endpoint
   ///
diff --git a/lib/src/endpoints/search.dart b/lib/src/endpoints/search.dart
index 1bbb1cf..788240a 100644
--- a/lib/src/endpoints/search.dart
+++ b/lib/src/endpoints/search.dart
@@ -1,10 +1,10 @@
 part of '../main.dart';
 
-class _Search {
+class SearchEndpoint {
   static const String _name = 'search';
   final WordPressAPI _api;
 
-  _Search(this._api);
+  SearchEndpoint(this._api);
 
   /// [GET] search results from WP search endpoint
   ///
diff --git a/lib/src/endpoints/tags.dart b/lib/src/endpoints/tags.dart
index 76e8432..183405d 100644
--- a/lib/src/endpoints/tags.dart
+++ b/lib/src/endpoints/tags.dart
@@ -1,10 +1,10 @@
 part of '../main.dart';
 
-class _Tags {
+class TagsEndpoint {
   static const String _name = 'tags';
   final WordPressAPI _api;
 
-  _Tags(this._api);
+  TagsEndpoint(this._api);
 
   /// [GET] tags from WP tags endpoint
   ///
diff --git a/lib/src/endpoints/taxonomies.dart b/lib/src/endpoints/taxonomies.dart
index 3b698b7..49b87a6 100644
--- a/lib/src/endpoints/taxonomies.dart
+++ b/lib/src/endpoints/taxonomies.dart
@@ -1,10 +1,10 @@
 part of '../main.dart';
 
-class _Taxonomies {
+class TaxonomiesEndpoint {
   static const String _name = 'taxonomies';
   final WordPressAPI _api;
 
-  _Taxonomies(this._api);
+  TaxonomiesEndpoint(this._api);
 
   /// [GET] taxonomies from WP taxonomies endpoint
   ///
diff --git a/lib/src/endpoints/users.dart b/lib/src/endpoints/users.dart
index 435022c..447c4d5 100644
--- a/lib/src/endpoints/users.dart
+++ b/lib/src/endpoints/users.dart
@@ -1,10 +1,10 @@
 part of '../main.dart';
 
-class _Users {
+class UsersEndpoint {
   static const String _name = 'users';
   final WordPressAPI _api;
 
-  _Users(this._api);
+  UsersEndpoint(this._api);
 
   /// [GET] users from WP users endpoint
   ///
diff --git a/lib/src/main.dart b/lib/src/main.dart
index dd54934..3b23ffc 100644
--- a/lib/src/main.dart
+++ b/lib/src/main.dart
@@ -111,35 +111,23 @@ class WordPressAPI {
   }
 
 // WP Standard Endpoints
-
-  //ignore: library_private_types_in_public_api, non_constant_identifier_names
-  _ApplicationPasswords get application_passwords =>
-      _ApplicationPasswords(this);
-  //ignore: library_private_types_in_public_api
-  _Posts get posts => _Posts(this);
-  //ignore: library_private_types_in_public_api
-  _Pages get pages => _Pages(this);
-  //ignore: library_private_types_in_public_api
-  _Media get media => _Media(this);
-  //ignore: library_private_types_in_public_api
-  _Categories get categories => _Categories(this);
-  //ignore: library_private_types_in_public_api
-  _Comments get comments => _Comments(this);
-  //ignore: library_private_types_in_public_api
-  _Users get users => _Users(this);
-  //ignore: library_private_types_in_public_api
-  _Search get search => _Search(this);
-  //ignore: library_private_types_in_public_api
-  _Taxonomies get taxonomies => _Taxonomies(this);
-  //ignore: library_private_types_in_public_api
-  _Tags get tags => _Tags(this);
+  ApplicationPasswordsEndpoint get applicationPasswords =>
+      ApplicationPasswordsEndpoint(this);
+  PostsEndpoint get posts => PostsEndpoint(this);
+  PagesEndpoint get pages => PagesEndpoint(this);
+  MediaEndpoint get media => MediaEndpoint(this);
+  CategoriesEndpoint get categories => CategoriesEndpoint(this);
+  CommentsEndpoint get comments => CommentsEndpoint(this);
+  UsersEndpoint get users => UsersEndpoint(this);
+  SearchEndpoint get search => SearchEndpoint(this);
+  TaxonomiesEndpoint get taxonomies => TaxonomiesEndpoint(this);
+  TagsEndpoint get tags => TagsEndpoint(this);
 
 // WP Plugins Endpoints
   /// Job Listings endpoints provided by `[WP Job Manager]` plugin
   ///
   /// `/wp/v2/job-listings`
-  //ignore: library_private_types_in_public_api
-  _JobListings get jobs => _JobListings(this);
+  JobListingsEndpoint get jobs => JobListingsEndpoint(this);
 }
 
 /// Wordpress `REST API Discovery` from Link Header