diff --git a/lib/features/authentication/data/datasource/auth_remote_data_source.dart b/lib/features/authentication/data/datasource/auth_remote_data_source.dart
index c210723..1e27153 100644
--- a/lib/features/authentication/data/datasource/auth_remote_data_source.dart
+++ b/lib/features/authentication/data/datasource/auth_remote_data_source.dart
@@ -36,7 +36,7 @@ class LoginUserRemoteDataSource implements LoginUserDataSource {
     } catch (e) {
       return Left(
         AppException(
-          message: 'Unknown error occured',
+          message: 'Unknown error occurred',
           statusCode: 1,
           identifier: '${e.toString()}\nLoginUserRemoteDataSource.loginUser',
         ),
diff --git a/lib/features/authentication/data/repositories/atuhentication_repository_impl.dart b/lib/features/authentication/data/repositories/authentication_repository_impl.dart
similarity index 100%
rename from lib/features/authentication/data/repositories/atuhentication_repository_impl.dart
rename to lib/features/authentication/data/repositories/authentication_repository_impl.dart
diff --git a/lib/features/authentication/domain/providers/login_provider.dart b/lib/features/authentication/domain/providers/login_provider.dart
index a0f3559..5440034 100644
--- a/lib/features/authentication/domain/providers/login_provider.dart
+++ b/lib/features/authentication/domain/providers/login_provider.dart
@@ -1,20 +1,20 @@
 import 'package:flutter_project/features/authentication/data/datasource/auth_remote_data_source.dart';
-import 'package:flutter_project/features/authentication/data/repositories/atuhentication_repository_impl.dart';
+import 'package:flutter_project/features/authentication/data/repositories/authentication_repository_impl.dart';
 import 'package:flutter_project/features/authentication/domain/repositories/auth_repository.dart';
 import 'package:flutter_project/shared/data/remote/remote.dart';
 import 'package:flutter_project/shared/domain/providers/dio_network_service_provider.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-final authdataSourceProvider =
+final authDataSourceProvider =
     Provider.family<LoginUserDataSource, NetworkService>(
   (_, networkService) => LoginUserRemoteDataSource(networkService),
 );
 
 final authRepositoryProvider = Provider<AuthenticationRepository>(
   (ref) {
-    final NetworkService networkService = ref.watch(netwokServiceProvider);
+    final NetworkService networkService = ref.watch(networkServiceProvider);
     final LoginUserDataSource dataSource =
-        ref.watch(authdataSourceProvider(networkService));
+        ref.watch(authDataSourceProvider(networkService));
     return AuthenticationRepositoryImpl(dataSource);
   },
 );
diff --git a/lib/features/dashboard/domain/providers/dashboard_providers.dart b/lib/features/dashboard/domain/providers/dashboard_providers.dart
index 4e54522..1488219 100644
--- a/lib/features/dashboard/domain/providers/dashboard_providers.dart
+++ b/lib/features/dashboard/domain/providers/dashboard_providers.dart
@@ -11,9 +11,9 @@ final dashboardDatasourceProvider =
 );
 
 final dashboardRepositoryProvider = Provider<DashboardRepository>((ref) {
-  final networkService = ref.watch(netwokServiceProvider);
+  final networkService = ref.watch(networkServiceProvider);
   final datasource = ref.watch(dashboardDatasourceProvider(networkService));
-  final respository = DashboardRepositoryImpl(datasource);
+  final repository = DashboardRepositoryImpl(datasource);
 
-  return respository;
+  return repository;
 });
diff --git a/lib/services/user_cache_service/data/datasource/user_local_datasource.dart b/lib/services/user_cache_service/data/datasource/user_local_datasource.dart
index 6e21e81..9d8e86c 100644
--- a/lib/services/user_cache_service/data/datasource/user_local_datasource.dart
+++ b/lib/services/user_cache_service/data/datasource/user_local_datasource.dart
@@ -16,16 +16,16 @@ abstract class UserDataSource {
 }
 
 class UserLocalDatasource extends UserDataSource {
-  UserLocalDatasource(this.stroageService);
+  UserLocalDatasource(this.storageService);
 
-  final StroageService stroageService;
+  final StorageService storageService;
 
   @override
   String get storageKey => USER_LOCAL_STORAGE_KEY;
 
   @override
   Future<Either<AppException, User>> fetchUser() async {
-    final data = await stroageService.get(storageKey);
+    final data = await storageService.get(storageKey);
     if (data == null) {
       return Left(
         AppException(
@@ -42,16 +42,16 @@ class UserLocalDatasource extends UserDataSource {
 
   @override
   Future<bool> saveUser({required User user}) async {
-    return await stroageService.set(storageKey, jsonEncode(user.toJson()));
+    return await storageService.set(storageKey, jsonEncode(user.toJson()));
   }
 
   @override
   Future<bool> deleteUser() async {
-    return await stroageService.remove(storageKey);
+    return await storageService.remove(storageKey);
   }
 
   @override
   Future<bool> hasUser() async {
-    return await stroageService.has(storageKey);
+    return await storageService.has(storageKey);
   }
 }
diff --git a/lib/services/user_cache_service/domain/providers/user_cache_provider.dart b/lib/services/user_cache_service/domain/providers/user_cache_provider.dart
index f8ebb17..8ca0f38 100644
--- a/lib/services/user_cache_service/domain/providers/user_cache_provider.dart
+++ b/lib/services/user_cache_service/domain/providers/user_cache_provider.dart
@@ -2,10 +2,10 @@ import 'package:flutter_project/services/user_cache_service/data/datasource/user
 import 'package:flutter_project/services/user_cache_service/data/repositories/user_repository_impl.dart';
 import 'package:flutter_project/services/user_cache_service/domain/repositories/user_cache_repository.dart';
 import 'package:flutter_project/shared/data/local/storage_service.dart';
-import 'package:flutter_project/shared/domain/providers/sharedpreferences_storage_service_provider.dart';
+import 'package:flutter_project/shared/domain/providers/shared_preferences_storage_service_provider.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-final userDatasourceProvider = Provider.family<UserDataSource, StroageService>(
+final userDatasourceProvider = Provider.family<UserDataSource, StorageService>(
   (_, networkService) => UserLocalDatasource(networkService),
 );
 
@@ -14,7 +14,7 @@ final userLocalRepositoryProvider = Provider<UserRepository>((ref) {
 
   final datasource = ref.watch(userDatasourceProvider(storageService));
 
-  final respository = UserRepositoryImpl(datasource);
+  final repository = UserRepositoryImpl(datasource);
 
-  return respository;
+  return repository;
 });
diff --git a/lib/shared/data/local/shared_prefs_storage_service.dart b/lib/shared/data/local/shared_prefs_storage_service.dart
index 856d23f..28db5f8 100644
--- a/lib/shared/data/local/shared_prefs_storage_service.dart
+++ b/lib/shared/data/local/shared_prefs_storage_service.dart
@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:flutter_project/shared/data/local/storage_service.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-class SharedPrefsService implements StroageService {
+class SharedPrefsService implements StorageService {
   SharedPreferences? sharedPreferences;
 
   final Completer<SharedPreferences> initCompleter =
diff --git a/lib/shared/data/local/storage_service.dart b/lib/shared/data/local/storage_service.dart
index 424c690..fe9136a 100644
--- a/lib/shared/data/local/storage_service.dart
+++ b/lib/shared/data/local/storage_service.dart
@@ -1,5 +1,5 @@
 /// Storage service interface
-abstract class StroageService {
+abstract class StorageService {
   void init();
 
   bool get hasInitialized;
diff --git a/lib/shared/domain/providers/dio_network_service_provider.dart b/lib/shared/domain/providers/dio_network_service_provider.dart
index 98e438c..6aba5e7 100644
--- a/lib/shared/domain/providers/dio_network_service_provider.dart
+++ b/lib/shared/domain/providers/dio_network_service_provider.dart
@@ -2,7 +2,7 @@ import 'package:dio/dio.dart';
 import 'package:flutter_project/shared/data/remote/dio_network_service.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-final netwokServiceProvider = Provider<DioNetworkService>(
+final networkServiceProvider = Provider<DioNetworkService>(
   (ref) {
     final Dio dio = Dio();
     return DioNetworkService(dio);
diff --git a/lib/shared/domain/providers/sharedpreferences_storage_service_provider.dart b/lib/shared/domain/providers/shared_preferences_storage_service_provider.dart
similarity index 100%
rename from lib/shared/domain/providers/sharedpreferences_storage_service_provider.dart
rename to lib/shared/domain/providers/shared_preferences_storage_service_provider.dart
diff --git a/lib/shared/mixins/exception_handler_mixin.dart b/lib/shared/mixins/exception_handler_mixin.dart
index 606cc0a..2f6ec77 100644
--- a/lib/shared/mixins/exception_handler_mixin.dart
+++ b/lib/shared/mixins/exception_handler_mixin.dart
@@ -37,13 +37,13 @@ mixin ExceptionHandlerMixin on NetworkService {
 
         case DioException:
           e as DioException;
-          message = e.response?.data?['message'] ?? 'Internal Error occured';
+          message = e.response?.data?['message'] ?? 'Internal Error occurred';
           statusCode = 1;
           identifier = 'DioException ${e.message} \nat  $endpoint';
           break;
 
         default:
-          message = 'Unknown error occured';
+          message = 'Unknown error occurred';
           statusCode = 2;
           identifier = 'Unknown error ${e.toString()}\n at $endpoint';
       }
diff --git a/lib/shared/theme/app_theme.dart b/lib/shared/theme/app_theme.dart
index ee28ef2..0427e54 100644
--- a/lib/shared/theme/app_theme.dart
+++ b/lib/shared/theme/app_theme.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_project/shared/data/local/storage_service.dart';
-import 'package:flutter_project/shared/domain/providers/sharedpreferences_storage_service_provider.dart';
+import 'package:flutter_project/shared/domain/providers/shared_preferences_storage_service_provider.dart';
 import 'package:flutter_project/shared/globals.dart';
 import 'package:flutter_project/shared/theme/app_colors.dart';
 import 'package:flutter_project/shared/theme/test_styles.dart';
@@ -15,21 +15,21 @@ final appThemeProvider = StateNotifierProvider<AppThemeModeNotifier, ThemeMode>(
 );
 
 class AppThemeModeNotifier extends StateNotifier<ThemeMode> {
-  final StroageService stroageService;
+  final StorageService storageService;
 
   ThemeMode currentTheme = ThemeMode.light;
 
-  AppThemeModeNotifier(this.stroageService) : super(ThemeMode.light) {
+  AppThemeModeNotifier(this.storageService) : super(ThemeMode.light) {
     getCurrentTheme();
   }
 
   void toggleTheme() {
     state = state == ThemeMode.dark ? ThemeMode.light : ThemeMode.dark;
-    stroageService.set(APP_THEME_STORAGE_KEY, state.name);
+    storageService.set(APP_THEME_STORAGE_KEY, state.name);
   }
 
   void getCurrentTheme() async {
-    final theme = await stroageService.get(APP_THEME_STORAGE_KEY);
+    final theme = await storageService.get(APP_THEME_STORAGE_KEY);
     final value = ThemeMode.values.byName('${theme ?? 'light'}');
     state = value;
   }
diff --git a/lib/shared/widgets/app_error.dart b/lib/shared/widgets/app_error.dart
index 4c08c6d..8a80577 100644
--- a/lib/shared/widgets/app_error.dart
+++ b/lib/shared/widgets/app_error.dart
@@ -25,7 +25,7 @@ class AppError extends ConsumerWidget {
             ),
             Center(
               child: Text(
-                'Error occured',
+                'Error occurred',
                 style: Theme.of(context).textTheme.bodyLarge?.copyWith(
                       color: Theme.of(context).colorScheme.error,
                     ),
diff --git a/test/features/authentication/data/repositories/atuhentication_repository_impl_test.dart b/test/features/authentication/data/repositories/atuhentication_repository_impl_test.dart
index 8613b92..bdce01f 100644
--- a/test/features/authentication/data/repositories/atuhentication_repository_impl_test.dart
+++ b/test/features/authentication/data/repositories/atuhentication_repository_impl_test.dart
@@ -1,7 +1,7 @@
-import 'package:flutter_project/shared/domain/models/either.dart';
 import 'package:flutter_project/features/authentication/data/datasource/auth_remote_data_source.dart';
-import 'package:flutter_project/features/authentication/data/repositories/atuhentication_repository_impl.dart';
+import 'package:flutter_project/features/authentication/data/repositories/authentication_repository_impl.dart';
 import 'package:flutter_project/features/authentication/domain/repositories/auth_repository.dart';
+import 'package:flutter_project/shared/domain/models/either.dart';
 import 'package:flutter_project/shared/domain/models/models.dart';
 import 'package:flutter_project/shared/exceptions/http_exception.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/authentication/domain/providers/providers_test.dart b/test/features/authentication/domain/providers/providers_test.dart
index e6c92eb..ad42dbf 100644
--- a/test/features/authentication/domain/providers/providers_test.dart
+++ b/test/features/authentication/domain/providers/providers_test.dart
@@ -12,9 +12,9 @@ void main() {
   late dynamic authRepository;
   setUpAll(
     () {
-      networkService = providerContainer.read(netwokServiceProvider);
+      networkService = providerContainer.read(networkServiceProvider);
       dataSource =
-          providerContainer.read(authdataSourceProvider(networkService));
+          providerContainer.read(authDataSourceProvider(networkService));
       authRepository = providerContainer.read(authRepositoryProvider);
     },
   );
diff --git a/test/features/dashboard/domain/providers/dashboard_provider_test.dart b/test/features/dashboard/domain/providers/dashboard_provider_test.dart
index 2237223..21fa5a6 100644
--- a/test/features/dashboard/domain/providers/dashboard_provider_test.dart
+++ b/test/features/dashboard/domain/providers/dashboard_provider_test.dart
@@ -12,7 +12,7 @@ void main() {
   late dynamic dashboardRespository;
   setUpAll(
     () {
-      networkService = providerContainer.read(netwokServiceProvider);
+      networkService = providerContainer.read(networkServiceProvider);
       dashboardDataSource =
           providerContainer.read(dashboardDatasourceProvider(networkService));
       dashboardRespository =
diff --git a/test/services/user_cache_service/data/datasource/user_local_datasource_test.dart b/test/services/user_cache_service/data/datasource/user_local_datasource_test.dart
index 24df52d..a61b8e0 100644
--- a/test/services/user_cache_service/data/datasource/user_local_datasource_test.dart
+++ b/test/services/user_cache_service/data/datasource/user_local_datasource_test.dart
@@ -7,7 +7,7 @@ import '../../../../fixtures/data/user_map.dart';
 import '../../../../fixtures/dummy_data.dart';
 
 void main() {
-  late StroageService stroageService;
+  late StorageService stroageService;
   late UserDataSource userDataSource;
   setUpAll(() {
     stroageService = MockStorageService();
@@ -158,4 +158,4 @@ void main() {
   );
 }
 
-class MockStorageService extends Mock implements StroageService {}
+class MockStorageService extends Mock implements StorageService {}
diff --git a/test/shared/data/local/sharedpreferences_storage_service_test.dart b/test/shared/data/local/sharedpreferences_storage_service_test.dart
index d5a71a1..e32a12d 100644
--- a/test/shared/data/local/sharedpreferences_storage_service_test.dart
+++ b/test/shared/data/local/sharedpreferences_storage_service_test.dart
@@ -6,7 +6,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import '../../../fixtures/data/user_map.dart';
 
 void main() {
-  late StroageService stroageService;
+  late StorageService stroageService;
 
   setUpAll(() {
     TestWidgetsFlutterBinding.ensureInitialized();
diff --git a/test/shared/domain/providers/providers_test.dart b/test/shared/domain/providers/providers_test.dart
index 7987559..e044079 100644
--- a/test/shared/domain/providers/providers_test.dart
+++ b/test/shared/domain/providers/providers_test.dart
@@ -10,7 +10,7 @@ void main() {
     addTearDown(providerContainer.dispose);
 
     expect(
-      providerContainer.read(netwokServiceProvider),
+      providerContainer.read(networkServiceProvider),
       isA<NetworkService>(),
     );
   });