diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSiteEventPayload.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSiteEventPayload.java
index ce9ab0c3bda35ac07f1e6fb416c97fa254a76072..0aa1bcf9bf811093ef23c019a24e198b4539316a 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSiteEventPayload.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSiteEventPayload.java
@@ -6,10 +6,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 
 /**
- * TBD
+ * The event data structure
  */
 
-@Schema(name = "GeographicSiteEventPayload", description = "TBD")
+@Schema(name = "GeographicSiteEventPayload", description = "The event data structure")
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-04-24T14:24:54.867613034Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT")
 public class GeographicSiteEventPayload {
   @JsonProperty("geographicSite")
diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java
index 06545f9bb5c281b517a82e147b9fca0a0b16fa1c..bf8b22b0b88241e3bf017c8df55972c911106683 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java
@@ -11,8 +11,8 @@ import org.etsi.osl.tmf.common.model.BaseRootEntity;
 /**
  * GeographicSubAddressUnit
  */
-@Entity(name = "GeographicSubAddressUnit")
-@Table(name = "GeographicSubAddressUnit")
+@Entity(name = "GeoSubAddUnit")
+@Table(name = "GeoSubAddUnit")
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-04-24T14:24:54.867613034Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT")
 public class GeographicSubAddressUnit extends BaseRootEntity {
    @JsonProperty("subUnitNumber")
diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java
index e1ad6e9cd2c202e1803202df55f2df27aaa6cd79..2c997407675c8600361dffd1083ee4a447f4da64 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java
@@ -17,8 +17,8 @@ import org.etsi.osl.tmf.common.model.BaseRootEntity;
  * GeographicSubAddressValue
  */
 
-@Entity(name = "GeographicSubAddressValue")
-@Table(name = "GeographicSubAddressValue")
+@Entity(name = "GeoSubAddVal")
+@Table(name = "GeoSubAddVal")
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-04-24T14:24:54.867613034Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT")
 public class GeographicSubAddressValue extends BaseRootEntity {
   @JsonProperty("buildingName")