diff --git a/Makefile b/Makefile
index 08ee117..5e84603 100644
--- a/Makefile
+++ b/Makefile
@@ -44,10 +44,7 @@ generate/auth/mocks:
 	@echo 'Remove mocks...'
 	rm -rf ms/auth/domain/mocks
 	@echo 'Generate updated mocks...'
-	mockery --name=Appl --filename=user_application.go --output=ms/auth/domain/mocks --dir=ms/auth/domain
-	mockery --name=TokenInterface --filename=token.go --output=ms/auth/domain/mocks --dir=ms/auth/domain
-	mockery --name=TokenRepository --filename=token_repository.go --output=ms/auth/domain/mocks --dir=ms/auth/domain
-	mockery --name=UserRepository --filename=user_repository.go --output=ms/auth/domain/mocks --dir=ms/auth/domain
+	mockery --all --output=ms/auth/domain/mocks --dir=ms/auth/domain
 
 
 # ====================================================================================
diff --git a/ms/auth/domain/mocks/user_application.go b/ms/auth/domain/mocks/Appl.go
similarity index 100%
rename from ms/auth/domain/mocks/user_application.go
rename to ms/auth/domain/mocks/Appl.go
diff --git a/ms/auth/domain/mocks/token.go b/ms/auth/domain/mocks/TokenInterface.go
similarity index 100%
rename from ms/auth/domain/mocks/token.go
rename to ms/auth/domain/mocks/TokenInterface.go
diff --git a/ms/auth/domain/mocks/token_repository.go b/ms/auth/domain/mocks/TokenRepository.go
similarity index 100%
rename from ms/auth/domain/mocks/token_repository.go
rename to ms/auth/domain/mocks/TokenRepository.go
diff --git a/ms/auth/domain/mocks/user_repository.go b/ms/auth/domain/mocks/UserRepository.go
similarity index 100%
rename from ms/auth/domain/mocks/user_repository.go
rename to ms/auth/domain/mocks/UserRepository.go