diff --git a/internal/handlers/handlerservice.go b/internal/handlers/handler_service.go
similarity index 100%
rename from internal/handlers/handlerservice.go
rename to internal/handlers/handler_service.go
diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menu_handler.go
similarity index 100%
rename from internal/handlers/ussd/menuhandler.go
rename to internal/handlers/ussd/menu_handler.go
diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menu_handler_test.go
similarity index 100%
rename from internal/handlers/ussd/menuhandler_test.go
rename to internal/handlers/ussd/menu_handler_test.go
diff --git a/internal/storage/storageservice.go b/internal/storage/storage_service.go
similarity index 100%
rename from internal/storage/storageservice.go
rename to internal/storage/storage_service.go
diff --git a/remote/accountservice.go b/remote/account_service.go
similarity index 100%
rename from remote/accountservice.go
rename to remote/account_service.go