diff --git a/internal/testutil/mocks/httpmocks/enginemock.go b/internal/testutil/mocks/httpmocks/engine_mock.go
similarity index 100%
rename from internal/testutil/mocks/httpmocks/enginemock.go
rename to internal/testutil/mocks/httpmocks/engine_mock.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/TestEngine.go b/internal/testutil/test_engine.go
similarity index 100%
rename from internal/testutil/TestEngine.go
rename to internal/testutil/test_engine.go
diff --git a/internal/testutil/testservice/TestAccountService.go b/internal/testutil/testservice/test_account_service.go
similarity index 100%
rename from internal/testutil/testservice/TestAccountService.go
rename to internal/testutil/testservice/test_account_service.go