diff --git a/persistence-modules/spring-data-jpa-annotations/pom.xml b/persistence-modules/spring-data-jpa-annotations/pom.xml
index 8a068d2d8a41..c6893b22000e 100644
--- a/persistence-modules/spring-data-jpa-annotations/pom.xml
+++ b/persistence-modules/spring-data-jpa-annotations/pom.xml
@@ -55,11 +55,17 @@
             <artifactId>byte-buddy</artifactId>
             <version>${byte-buddy.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.orm.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
         <start-class>com.baeldung.boot.Application</start-class>
         <testcontainers.version>1.19.6</testcontainers.version>
+        <hibernate.orm.version>7.0.0.Final</hibernate.orm.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/embeddable/model/Company.java b/persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/embeddable/model/Company.java
index 203cff1e3562..da9549d97de3 100644
--- a/persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/embeddable/model/Company.java
+++ b/persistence-modules/spring-data-jpa-annotations/src/main/java/com/baeldung/embeddable/model/Company.java
@@ -8,6 +8,8 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
+import org.hibernate.annotations.EmbeddedColumnNaming;
+
 @Entity
 public class Company {
 
@@ -27,6 +29,7 @@ public class Company {
         @AttributeOverride( name = "lastName", column = @Column(name = "contact_last_name")),
         @AttributeOverride( name = "phone", column = @Column(name = "contact_phone"))
     })
+    //@EmbeddedColumnNaming("contact_")
     private ContactPerson contactPerson;
 
     public Integer getId() {