diff --git a/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/src/domain/AccountConstants.java.mustache b/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/src/domain/AccountConstants.java.mustache
index 35e64222c8a..65a15b01204 100644
--- a/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/src/domain/AccountConstants.java.mustache
+++ b/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/src/domain/AccountConstants.java.mustache
@@ -1,4 +1,4 @@
-package {{packageName}}.account.infrastructure.domain;
+package {{packageName}}.account.domain;
 
 public class AccountConstants {
 
diff --git a/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/src/infrastructure/primary/rest/UserDTO.java.mustache b/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/src/infrastructure/primary/rest/UserDTO.java.mustache
index 0bb0ce4267a..c424b108667 100644
--- a/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/src/infrastructure/primary/rest/UserDTO.java.mustache
+++ b/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/src/infrastructure/primary/rest/UserDTO.java.mustache
@@ -1,6 +1,6 @@
 package {{packageName}}.account.infrastructure.primary.rest;
 
-import static tech.jhipster.beer.account.infrastructure.domain.AccountConstants.DEFAULT_LANGUAGE;
+import static {{packageName}}.account.domain.AccountConstants.DEFAULT_LANGUAGE;
 
 import java.time.Instant;
 import java.util.Map;
@@ -8,7 +8,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
-import tech.jhipster.beer.security.oauth2.application.SecurityUtils;
+import {{packageName}}.security.oauth2.application.SecurityUtils;
 
 public class UserDTO {
 
diff --git a/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/test/infrastructure/primary/rest/AccountResourceIT.java.mustache b/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/test/infrastructure/primary/rest/AccountResourceIT.java.mustache
index f7c750ffc21..3f1a6adc198 100644
--- a/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/test/infrastructure/primary/rest/AccountResourceIT.java.mustache
+++ b/src/main/resources/generator/server/springboot/mvc/security/oauth2/account/test/infrastructure/primary/rest/AccountResourceIT.java.mustache
@@ -3,7 +3,7 @@ package {{packageName}}.account.infrastructure.primary.rest;
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-import static tech.jhipster.beer.account.infrastructure.primary.rest.OAuth2TestUtil.*;
+import static {{packageName}}.account.infrastructure.primary.rest.OAuth2TestUtil.*;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;