diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java
index 6d100c447847210be71dbcb8e04e58d53193d76b..db14ec4d625e3040f445b1865dd1d16fb54446d8 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.OneToMany;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
+import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
 import org.etsi.osl.tmf.prm669.model.RelatedParty;
 
 import java.util.HashSet;
@@ -12,7 +12,7 @@ import java.util.Objects;
 import java.util.Set;
 
 @Entity(name = "GeographicSite")
-public class GeographicSite extends BaseRootEntity {
+public class GeographicSite extends BaseRootNamedEntity {
 
     @JsonProperty("id")
     private String id;
@@ -20,8 +20,6 @@ public class GeographicSite extends BaseRootEntity {
     private String code;
     @JsonProperty("description")
     private String description;
-    @JsonProperty("name")
-    private String name;
     @JsonProperty("status")
     private String status;
 
@@ -112,14 +110,6 @@ public class GeographicSite extends BaseRootEntity {
         this.description = description;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getStatus() {
         return status;
     }
diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java
index 11a99b3d605c529ec922ed71656e55526b5888cd..759e2b8d3160b133f83c8483fce53a096b8a503b 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java
@@ -2,12 +2,12 @@ package org.etsi.osl.tmf.gsm674.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.Entity;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
+import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
 
 import java.util.Objects;
 
 @Entity(name="PlaceRefOrValue")
-public class PlaceRefOrValue extends BaseRootEntity {
+public class PlaceRefOrValue extends BaseRootNamedEntity {
     @JsonProperty("id")
     private String id;
 
@@ -28,14 +28,6 @@ public class PlaceRefOrValue extends BaseRootEntity {
         this.id = id;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public String getReferredType() {
         return referredType;
     }
@@ -55,7 +47,7 @@ public class PlaceRefOrValue extends BaseRootEntity {
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, name, referredType);
+        return Objects.hash(super.hashCode(), id, name, referredType);
     }
 
     @Override