diff --git a/internal/handlers/application/menuhandler.go b/internal/handlers/application/menu_handler.go
similarity index 100%
rename from internal/handlers/application/menuhandler.go
rename to internal/handlers/application/menu_handler.go
diff --git a/internal/handlers/application/menuhandler_test.go b/internal/handlers/application/menu_handler_test.go
similarity index 100%
rename from internal/handlers/application/menuhandler_test.go
rename to internal/handlers/application/menu_handler_test.go
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/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/internal/testutil/mocks/httpmocks/requesthandlermock.go b/internal/testutil/mocks/httpmocks/request_handler_mock.go
similarity index 100%
rename from internal/testutil/mocks/httpmocks/requesthandlermock.go
rename to internal/testutil/mocks/httpmocks/request_handler_mock.go
diff --git a/internal/testutil/mocks/httpmocks/requestparsermock.go b/internal/testutil/mocks/httpmocks/request_parser_mock.go
similarity index 100%
rename from internal/testutil/mocks/httpmocks/requestparsermock.go
rename to internal/testutil/mocks/httpmocks/request_parser_mock.go
diff --git a/internal/testutil/mocks/httpmocks/writermock.go b/internal/testutil/mocks/httpmocks/writer_mock.go
similarity index 100%
rename from internal/testutil/mocks/httpmocks/writermock.go
rename to internal/testutil/mocks/httpmocks/writer_mock.go
diff --git a/internal/testutil/mocks/servicemock.go b/internal/testutil/mocks/service_mock.go
similarity index 100%
rename from internal/testutil/mocks/servicemock.go
rename to internal/testutil/mocks/service_mock.go
diff --git a/internal/testutil/testservice/accountservice.go b/internal/testutil/testservice/account_service.go
similarity index 100%
rename from internal/testutil/testservice/accountservice.go
rename to internal/testutil/testservice/account_service.go
diff --git a/models/accountresponse.go b/models/account_response.go
similarity index 100%
rename from models/accountresponse.go
rename to models/account_response.go
diff --git a/models/balanceresponse.go b/models/balance_response.go
similarity index 100%
rename from models/balanceresponse.go
rename to models/balance_response.go
diff --git a/models/trackstatusresponse.go b/models/track_status_response.go
similarity index 100%
rename from models/trackstatusresponse.go
rename to models/track_status_response.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