diff --git a/.blueprint/generate-sample/templates/samples/gradle-jwt-react.jdl b/.blueprint/generate-sample/templates/samples/gradle-jwt-react.jdl
index 9809628b..9de3512b 100644
--- a/.blueprint/generate-sample/templates/samples/gradle-jwt-react.jdl
+++ b/.blueprint/generate-sample/templates/samples/gradle-jwt-react.jdl
@@ -51,7 +51,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation}
diff --git a/.blueprint/generate-sample/templates/samples/gradle-oauth-angular.jdl b/.blueprint/generate-sample/templates/samples/gradle-oauth-angular.jdl
index 3740d512..1d88d5d1 100644
--- a/.blueprint/generate-sample/templates/samples/gradle-oauth-angular.jdl
+++ b/.blueprint/generate-sample/templates/samples/gradle-oauth-angular.jdl
@@ -49,7 +49,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation}
diff --git a/.blueprint/generate-sample/templates/samples/jdl-default-app.jdl b/.blueprint/generate-sample/templates/samples/jdl-default-app.jdl
index 3278f4bf..dab57926 100644
--- a/.blueprint/generate-sample/templates/samples/jdl-default-app.jdl
+++ b/.blueprint/generate-sample/templates/samples/jdl-default-app.jdl
@@ -132,8 +132,8 @@ entity Region {
 
 relationship OneToOne {
   Department{location} to Location,
-  Employee{user(login)} to User
-  // Employee{user(login)} to User with jpaDerivedIdentifier
+  Employee{user(login)} to User with builtInEntity
+  // Employee{user(login)} to User with builtInEntity with jpaDerivedIdentifier
   // Please see: https://github.com/jhipster/generator-jhipster-micronaut/issues/219
 }
 
@@ -141,7 +141,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{theLabel(labelName)} to TheLabel{operation}
diff --git a/.blueprint/generate-sample/templates/samples/mvn-jwt-angular.jdl b/.blueprint/generate-sample/templates/samples/mvn-jwt-angular.jdl
index edc2e882..d6fe01a8 100644
--- a/.blueprint/generate-sample/templates/samples/mvn-jwt-angular.jdl
+++ b/.blueprint/generate-sample/templates/samples/mvn-jwt-angular.jdl
@@ -49,7 +49,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation}
diff --git a/.blueprint/generate-sample/templates/samples/mvn-jwt-redis-angular.jdl b/.blueprint/generate-sample/templates/samples/mvn-jwt-redis-angular.jdl
index 69f4e968..3b609008 100644
--- a/.blueprint/generate-sample/templates/samples/mvn-jwt-redis-angular.jdl
+++ b/.blueprint/generate-sample/templates/samples/mvn-jwt-redis-angular.jdl
@@ -49,7 +49,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation}
diff --git a/.blueprint/generate-sample/templates/samples/mvn-no-client.jdl b/.blueprint/generate-sample/templates/samples/mvn-no-client.jdl
index 998cd0ca..139c7fec 100644
--- a/.blueprint/generate-sample/templates/samples/mvn-no-client.jdl
+++ b/.blueprint/generate-sample/templates/samples/mvn-no-client.jdl
@@ -48,7 +48,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name) required}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation required}
diff --git a/.blueprint/generate-sample/templates/samples/sample-app.jdl b/.blueprint/generate-sample/templates/samples/sample-app.jdl
index 1f3a4114..0d0cb0bf 100644
--- a/.blueprint/generate-sample/templates/samples/sample-app.jdl
+++ b/.blueprint/generate-sample/templates/samples/sample-app.jdl
@@ -48,7 +48,7 @@ relationship OneToMany {
   BankAccount{operation} to Operation{bankAccount(name)}
 }
 relationship ManyToOne {
-  BankAccount{user(login)} to User
+  BankAccount{user(login)} to User with builtInEntity
 }
 relationship ManyToMany {
   Operation{label(label)} to Label{operation}