1 files changed, 15 insertions, 16 deletions
diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/nr/MeasDataFile.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/nr/MeasDataFile.java
index 1ef1a8b..0f87465 100644
--- a/src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/nr/MeasDataFile.java
+++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/model/measurement/nr/MeasDataFile.java
@@ -20,10 +20,11 @@
 
 package org.onap.dcaegen2.services.pmmapper.model.measurement.nr;
 
-import java.util.ArrayList;
-import java.util.List;
+import lombok.Data;
+import org.onap.dcaegen2.services.pmmapper.model.measurement.common.MeasurementData;
+import org.onap.dcaegen2.services.pmmapper.model.measurement.common.MeasurementFile;
+import org.onap.dcaegen2.services.pmmapper.model.measurement.common.MeasurementInfo;
 
-import java.util.Optional;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -32,10 +33,9 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
-import lombok.Data;
-import org.onap.dcaegen2.services.pmmapper.model.measurement.common.MeasurementData;
-import org.onap.dcaegen2.services.pmmapper.model.measurement.common.MeasurementFile;
-import org.onap.dcaegen2.services.pmmapper.model.measurement.common.MeasurementInfo;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
@@ -43,7 +43,7 @@ import org.onap.dcaegen2.services.pmmapper.model.measurement.common.MeasurementI
         "measData",
         "fileFooter"
 })
-@XmlRootElement(name = "MeasDataFile")
+@XmlRootElement(name = "measDataFile")
 @Data
 public class MeasDataFile implements MeasurementFile {
 
@@ -68,7 +68,7 @@ public class MeasDataFile implements MeasurementFile {
         measData.clear();
         measurementData.forEach(measurementDatum -> {
             MeasData measDatum = new MeasData();
-            measDatum.setMeasuredEntity((MeasData.MeasuredEntity) measurementDatum.getManagedEntity());
+            measDatum.setMeasEntity((MeasData.MeasEntity) measurementDatum.getManagedEntity());
             measDatum.setMeasInfo(measurementDatum.getMeasurementInfo());
             this.measData.add(measDatum);
         });
@@ -81,7 +81,7 @@ public class MeasDataFile implements MeasurementFile {
     @Data
     public static class FileFooter {
 
-        @XmlElement(name = "MeasData", required = true)
+        @XmlElement(name = "measData", required = true)
         protected MeasDataFile.FileFooter.MeasData measData;
 
         @XmlAccessorType(XmlAccessType.FIELD)
@@ -104,7 +104,7 @@ public class MeasDataFile implements MeasurementFile {
     public static class FileHeader {
         @XmlElement(required = true)
         protected MeasDataFile.FileHeader.FileSender fileSender;
-        @XmlElement(name = "MeasData", required = true)
+        @XmlElement(name = "measData", required = true)
         protected MeasDataFile.FileHeader.MeasData measData;
         @XmlAttribute(name = "fileFormatVersion", required = true)
         protected String fileFormatVersion;
@@ -137,14 +137,13 @@ public class MeasDataFile implements MeasurementFile {
 
 
     @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-            "measuredEntity",
+    @XmlType(name = "", propOrder = {"measEntity",
             "measInfo"
     })
     @Data
     public static class MeasData implements MeasurementData {
         @XmlElement(required = true)
-        protected MeasDataFile.MeasData.MeasuredEntity measuredEntity;
+        protected MeasEntity measEntity;
         @XmlElement()
         protected List<MeasurementInfo> measInfo;
 
@@ -160,13 +159,13 @@ public class MeasDataFile implements MeasurementFile {
 
         @Override
         public Object getManagedEntity() {
-            return this.measuredEntity;
+            return this.measEntity;
         }
 
         @XmlAccessorType(XmlAccessType.FIELD)
         @XmlType(name = "")
         @Data
-        public static class MeasuredEntity {
+        public static class MeasEntity {
             @XmlAttribute(name = "localDn")
             protected String localDn;
             @XmlAttribute(name = "userLabel")