diff --git a/ccm-cms/src/main/java/org/librecms/assets/Person.java b/ccm-cms/src/main/java/org/librecms/assets/Person.java
index bdba4773f..3b2d97d78 100644
--- a/ccm-cms/src/main/java/org/librecms/assets/Person.java
+++ b/ccm-cms/src/main/java/org/librecms/assets/Person.java
@@ -101,14 +101,12 @@ public class Person extends ContactableEntity {
     private LocalDate birthdate;
 
     public Person() {
-
         super();
 
         personNames = new ArrayList<>();
     }
 
     public List<PersonName> getPersonNames() {
-
         return Collections.unmodifiableList(personNames);
     }
 
@@ -118,7 +116,6 @@ public class Person extends ContactableEntity {
      * @return
      */
     public PersonName getPersonName() {
-
         if (personNames.isEmpty()) {
             return null;
         } else {
@@ -127,17 +124,14 @@ public class Person extends ContactableEntity {
     }
 
     protected void addPersonName(final PersonName personName) {
-
         personNames.add(personName);
     }
 
     protected void removePersonName(final PersonName personName) {
-
         personNames.remove(personName);
     }
 
     protected void setPersonNames(final List<PersonName> personNames) {
-
         this.personNames = new ArrayList<>(personNames);
     }
 
@@ -163,7 +157,6 @@ public class Person extends ContactableEntity {
 
     @Override
     public boolean equals(final Object obj) {
-
         if (this == obj) {
             return true;
         }
@@ -201,13 +194,11 @@ public class Person extends ContactableEntity {
 
     @Override
     public boolean canEqual(final Object obj) {
-
         return obj instanceof Person;
     }
 
     @Override
     public String toString(final String data) {
-
         return super.toString(
             String.format(
                 //            "surname = \"%s\", +"
diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_36__convert_person_name_to_entity.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_36__convert_person_name_to_entity.sql
index a049e3b77..0aef7274e 100644
--- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_36__convert_person_name_to_entity.sql
+++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_36__convert_person_name_to_entity.sql
@@ -18,6 +18,7 @@ create table CCM_CMS.Person_PersonName_AUD (
 );
 insert into ccm_cms.person_personname_aud (rev, person_id, person_name_id, revtype, revend) (select rev, person_id, person_name_id, revtype, revend from ccm_cms.person_names_aud);
 
+alter table ccm_cms.person_names drop column person_id;
 alter table ccm_cms.person_names_aud drop column person_id;
 
 alter table CCM_CMS.Person_PersonName_AUD