diff --git a/lib/providers/api_client_provider.dart b/lib/providers/api_client_provider.dart
index f1c9a8f..96cd49e 100644
--- a/lib/providers/api_client_provider.dart
+++ b/lib/providers/api_client_provider.dart
@@ -7,13 +7,13 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'api_client_provider.g.dart';
 
 @Riverpod(keepAlive: true)
-class ApiClientProvider extends _$ApiClientProvider {
+class ApiClient extends _$ApiClient {
   @override
-  ApiClient? build() {
+  ApiClientService? build() {
     final savedInstances = ref.watch(serverInstancesProvider);
     if (savedInstances.isNotEmpty) {
       final instance = savedInstances[0];
-      return ApiClient(
+      return ApiClientService(
         serverInstance: instance,
         dioInstance: Dio(
           BaseOptions(
@@ -28,7 +28,7 @@ class ApiClientProvider extends _$ApiClientProvider {
     return null;
   }
 
-  void setApiClient(ApiClient client) {
+  void setApiClient(ApiClientService client) {
     state = client;
   }
 
diff --git a/lib/providers/api_client_provider.g.dart b/lib/providers/api_client_provider.g.dart
index de8ce47..73aa1bb 100644
--- a/lib/providers/api_client_provider.g.dart
+++ b/lib/providers/api_client_provider.g.dart
@@ -6,21 +6,20 @@ part of 'api_client_provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$apiClientProviderHash() => r'b408d1acc96953690397094dd10f466660ec6290';
+String _$apiClientHash() => r'd26f8058edfc47acd2e01f2a9bcbf64102b51212';
 
-/// See also [ApiClientProvider].
-@ProviderFor(ApiClientProvider)
-final apiClientProviderProvider =
-    NotifierProvider<ApiClientProvider, ApiClient?>.internal(
-  ApiClientProvider.new,
-  name: r'apiClientProviderProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$apiClientProviderHash,
+/// See also [ApiClient].
+@ProviderFor(ApiClient)
+final apiClientProvider =
+    NotifierProvider<ApiClient, ApiClientService?>.internal(
+  ApiClient.new,
+  name: r'apiClientProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product') ? null : _$apiClientHash,
   dependencies: null,
   allTransitiveDependencies: null,
 );
 
-typedef _$ApiClientProvider = Notifier<ApiClient?>;
+typedef _$ApiClient = Notifier<ApiClientService?>;
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
diff --git a/lib/providers/router_provider.dart b/lib/providers/router_provider.dart
index 2ac7021..bd2e249 100644
--- a/lib/providers/router_provider.dart
+++ b/lib/providers/router_provider.dart
@@ -1,9 +1,9 @@
 import 'package:go_router/go_router.dart';
-import 'package:linkdy/providers/api_client_provider.dart';
-import 'package:linkdy/router/paths.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import 'package:linkdy/router/routes.dart';
+import 'package:linkdy/router/paths.dart';
+import 'package:linkdy/providers/api_client_provider.dart';
 
 part 'router_provider.g.dart';
 
@@ -11,7 +11,7 @@ part 'router_provider.g.dart';
 GoRouter router(RouterRef ref) {
   return GoRouter(
     redirect: (context, state) {
-      if (ref.watch(apiClientProviderProvider) == null) {
+      if (ref.watch(apiClientProvider) == null) {
         return RoutesPaths.onboarding;
       }
       return null;
diff --git a/lib/providers/router_provider.g.dart b/lib/providers/router_provider.g.dart
index bda4d00..55ffa49 100644
--- a/lib/providers/router_provider.g.dart
+++ b/lib/providers/router_provider.g.dart
@@ -6,7 +6,7 @@ part of 'router_provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$routerHash() => r'78eb4c32cddebb29e3029e0eeaeb0f4c40d77012';
+String _$routerHash() => r'c7bebdd3bf825fbce96530b63367f1c30b0f7c0b';
 
 /// See also [router].
 @ProviderFor(router)
diff --git a/lib/screens/links/provider/add_link.provider.dart b/lib/screens/links/provider/add_link.provider.dart
index 838abfc..ff64166 100644
--- a/lib/screens/links/provider/add_link.provider.dart
+++ b/lib/screens/links/provider/add_link.provider.dart
@@ -21,19 +21,19 @@ part 'add_link.provider.g.dart';
 
 @riverpod
 Future<ApiResponse<CheckBookmark>> checkBookmark(CheckBookmarkRef ref, String url) async {
-  final result = await ref.watch(apiClientProviderProvider)!.fetchCheckAddBookmark(url: url);
+  final result = await ref.watch(apiClientProvider)!.fetchCheckAddBookmark(url: url);
   return result;
 }
 
 @riverpod
 FutureOr<ApiResponse<Bookmark>> addBookmark(AddBookmarkRef ref, PostBookmark newBookmark) async {
-  final result = await ref.watch(apiClientProviderProvider)!.fetchPostBookmark(newBookmark);
+  final result = await ref.watch(apiClientProvider)!.fetchPostBookmark(newBookmark);
   return result;
 }
 
 @riverpod
 FutureOr<ApiResponse<Tags>> getTags(GetTagsRef ref) async {
-  final result = await ref.watch(apiClientProviderProvider)!.fetchTags();
+  final result = await ref.watch(apiClientProvider)!.fetchTags();
   return result;
 }
 
diff --git a/lib/screens/links/provider/add_link.provider.g.dart b/lib/screens/links/provider/add_link.provider.g.dart
index 5cec596..aa7bb37 100644
--- a/lib/screens/links/provider/add_link.provider.g.dart
+++ b/lib/screens/links/provider/add_link.provider.g.dart
@@ -6,7 +6,7 @@ part of 'add_link.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$checkBookmarkHash() => r'a4397a4497e3b7c8dec6027bb927371cc85e526c';
+String _$checkBookmarkHash() => r'8eeb8cb7ee801ca7ed1b604b56a4301a86568c54';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -160,7 +160,7 @@ class _CheckBookmarkProviderElement
   String get url => (origin as CheckBookmarkProvider).url;
 }
 
-String _$addBookmarkHash() => r'94d54330832874c142e417df21522f5faac27f9e';
+String _$addBookmarkHash() => r'f0994cdf9fe086431549dac44daadd367a8b801b';
 
 /// See also [addBookmark].
 @ProviderFor(addBookmark)
@@ -290,7 +290,7 @@ class _AddBookmarkProviderElement
   PostBookmark get newBookmark => (origin as AddBookmarkProvider).newBookmark;
 }
 
-String _$getTagsHash() => r'feecc7515f9492838c4a9bccc7031f49713e6ebb';
+String _$getTagsHash() => r'22cfedf0f73a32c41992b922cbdfbb0145cccc9a';
 
 /// See also [getTags].
 @ProviderFor(getTags)
diff --git a/lib/screens/links/provider/links.provider.dart b/lib/screens/links/provider/links.provider.dart
index 2a89627..9617055 100644
--- a/lib/screens/links/provider/links.provider.dart
+++ b/lib/screens/links/provider/links.provider.dart
@@ -10,7 +10,7 @@ part 'links.provider.g.dart';
 
 @riverpod
 FutureOr<ApiResponse<Bookmarks>> linksRequest(LinksRequestRef ref) async {
-  final result = await ref.watch(apiClientProviderProvider)!.fetchBookmarks();
+  final result = await ref.watch(apiClientProvider)!.fetchBookmarks();
   return result;
 }
 
diff --git a/lib/screens/links/provider/links.provider.g.dart b/lib/screens/links/provider/links.provider.g.dart
index 12617dd..2972ee5 100644
--- a/lib/screens/links/provider/links.provider.g.dart
+++ b/lib/screens/links/provider/links.provider.g.dart
@@ -6,7 +6,7 @@ part of 'links.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$linksRequestHash() => r'be41da02d669705dc7723ba9fbab0c5b59fd233b';
+String _$linksRequestHash() => r'2bc6cb36d7c7090f5328c48e1f71acd46df5303b';
 
 /// See also [linksRequest].
 @ProviderFor(linksRequest)
diff --git a/lib/screens/onboarding/provider/connect.provider.dart b/lib/screens/onboarding/provider/connect.provider.dart
index 665572a..91992f1 100644
--- a/lib/screens/onboarding/provider/connect.provider.dart
+++ b/lib/screens/onboarding/provider/connect.provider.dart
@@ -93,7 +93,7 @@ FutureOr<bool> connectToServer(ConnectToServerRef ref) async {
     token: ref.watch(connectProvider).tokenController.text,
   );
 
-  final apiClient = ApiClient(
+  final apiClient = ApiClientService(
     serverInstance: serverInstance,
     dioInstance: Dio(
       BaseOptions(
@@ -112,9 +112,8 @@ FutureOr<bool> connectToServer(ConnectToServerRef ref) async {
 
   processModal.close();
   if (result == true) {
-    ref.read(apiClientProviderProvider.notifier).setApiClient(apiClient);
+    ref.read(apiClientProvider.notifier).setApiClient(apiClient);
     ref.read(serverInstancesProvider.notifier).saveNewInstance(serverInstance);
-    // ref.watch(routerProvider).replace(RoutesPaths.links);
   } else {
     showSnacbkar(label: t.onboarding.cannotConnectToServer, color: Colors.red);
   }
diff --git a/lib/screens/onboarding/provider/connect.provider.g.dart b/lib/screens/onboarding/provider/connect.provider.g.dart
index ddf93e7..e01ba32 100644
--- a/lib/screens/onboarding/provider/connect.provider.g.dart
+++ b/lib/screens/onboarding/provider/connect.provider.g.dart
@@ -6,7 +6,7 @@ part of 'connect.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$connectToServerHash() => r'a12cade5244ec6d3b19897053380bd6c5fcf1265';
+String _$connectToServerHash() => r'a5ff5c1030b4af6ead6fd6c4d5fdbd95c71a65cc';
 
 /// See also [connectToServer].
 @ProviderFor(connectToServer)
diff --git a/lib/screens/search/provider/search.provider.dart b/lib/screens/search/provider/search.provider.dart
index c9b058f..5f2c00e 100644
--- a/lib/screens/search/provider/search.provider.dart
+++ b/lib/screens/search/provider/search.provider.dart
@@ -13,14 +13,14 @@ part 'search.provider.g.dart';
 @riverpod
 FutureOr<ApiResponse<Bookmarks>?> searchBookmarks(SearchBookmarksRef ref) async {
   if (ref.watch(searchProvider).searchTerm == "") return null;
-  final result = await ref.read(apiClientProviderProvider)!.fetchBookmarks(q: ref.watch(searchProvider).searchTerm);
+  final result = await ref.read(apiClientProvider)!.fetchBookmarks(q: ref.watch(searchProvider).searchTerm);
   return result;
 }
 
 @riverpod
 FutureOr<ApiResponse<Tags>?> searchTags(SearchTagsRef ref) async {
   if (ref.watch(searchProvider).searchTerm == "") return null;
-  final result = await ref.read(apiClientProviderProvider)!.fetchTags(q: ref.watch(searchProvider).searchTerm);
+  final result = await ref.read(apiClientProvider)!.fetchTags(q: ref.watch(searchProvider).searchTerm);
   return result;
 }
 
diff --git a/lib/screens/search/provider/search.provider.g.dart b/lib/screens/search/provider/search.provider.g.dart
index 935b356..e3716cc 100644
--- a/lib/screens/search/provider/search.provider.g.dart
+++ b/lib/screens/search/provider/search.provider.g.dart
@@ -6,7 +6,7 @@ part of 'search.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$searchBookmarksHash() => r'5e5ace5cf7231e9c6b919578700fa1f34cf3aca3';
+String _$searchBookmarksHash() => r'c8d0bfb69cc6c295649a8e2d90f57352689cdab7';
 
 /// See also [searchBookmarks].
 @ProviderFor(searchBookmarks)
@@ -23,7 +23,7 @@ final searchBookmarksProvider =
 
 typedef SearchBookmarksRef
     = AutoDisposeFutureProviderRef<ApiResponse<Bookmarks>?>;
-String _$searchTagsHash() => r'8470a8d018af64a04b1716b43d1d98dcb54f491d';
+String _$searchTagsHash() => r'6af31fef1a5020612f098550d54939852d88e187';
 
 /// See also [searchTags].
 @ProviderFor(searchTags)
diff --git a/lib/screens/settings/ui/general_settings/disconnect_modal.dart b/lib/screens/settings/ui/general_settings/disconnect_modal.dart
index f8f1374..bea03af 100644
--- a/lib/screens/settings/ui/general_settings/disconnect_modal.dart
+++ b/lib/screens/settings/ui/general_settings/disconnect_modal.dart
@@ -24,7 +24,7 @@ class DisconnectModal extends ConsumerWidget {
             TextButton(
               onPressed: () {
                 Navigator.pop(context);
-                ref.read(apiClientProviderProvider.notifier).disconnectApiClient();
+                ref.read(apiClientProvider.notifier).disconnectApiClient();
               },
               child: Text(t.generic.confirm),
             ),
diff --git a/lib/services/api_client.dart b/lib/services/api_client.dart
index 52e4539..21a2801 100644
--- a/lib/services/api_client.dart
+++ b/lib/services/api_client.dart
@@ -7,11 +7,11 @@ import 'package:linkdy/models/data/post_bookmark.dart';
 import 'package:linkdy/models/data/tags.dart';
 import 'package:linkdy/models/server_instance.dart';
 
-class ApiClient {
+class ApiClientService {
   final ServerInstance serverInstance;
   final Dio dioInstance;
 
-  const ApiClient({
+  const ApiClientService({
     required this.serverInstance,
     required this.dioInstance,
   });