2 files changed, 14 insertions, 14 deletions
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java
index 5a471a3..91cfdef 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/facade/tca/AAI.java
@@ -34,8 +34,8 @@ public class AAI extends BaseDynamicPropertiesProvider implements TCAFacadeModel
 
     private static final long serialVersionUID = 1L;
 
-    private String genericVNFId;
+    private String genericVNFName;
 
-    private String genericServerId;
+    private String genericServerName;
 
 }
diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java
index 967cf88..b6b2b05 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/mixin/facade/tca/AAIMixin.java
@@ -30,26 +30,26 @@ import org.openecomp.dcae.apod.analytics.model.util.json.mixin.BaseDynamicProper
  */
 public abstract class AAIMixin extends BaseDynamicPropertiesProviderMixin {
 
-    private String genericVNFId;
-    private String genericServerId;
+    private String genericVNFName;
+    private String genericServerName;
 
-    @JsonGetter("generic-vnf.vnf-id")
-    public String getGenericVNFId() {
-        return genericVNFId;
+    @JsonGetter("generic-vnf.vnf-name")
+    public String getGenericVNFName() {
+        return genericVNFName;
     }
 
-    @JsonSetter("generic-vnf.vnf-id")
-    public void setGenericVNFId(String genericVNFId) {
-        this.genericVNFId = genericVNFId;
+    @JsonSetter("generic-vnf.vnf-name")
+    public void setGenericVNFName(String genericVNFName) {
+        this.genericVNFName = genericVNFName;
     }
 
     @JsonGetter("vserver.vserver-name")
-    public String getGenericServerId() {
-        return genericServerId;
+    public String getGenericServerName() {
+        return genericServerName;
     }
 
     @JsonSetter("vserver.vserver-name")
-    public void setGenericServerId(String genericServerId) {
-        this.genericServerId = genericServerId;
+    public void setGenericServerName(String genericServerName) {
+        this.genericServerName = genericServerName;
     }
 }