33 files changed, 88 insertions, 88 deletions
diff --git a/src/main/java/org/onap/a1pesimulator/controller/RanCellController.java b/src/main/java/org/onap/a1pesimulator/controller/RanCellController.java
index 10dfe2b..0074058 100644
--- a/src/main/java/org/onap/a1pesimulator/controller/RanCellController.java
+++ b/src/main/java/org/onap/a1pesimulator/controller/RanCellController.java
@@ -22,7 +22,7 @@ import org.onap.a1pesimulator.data.fileready.RanPeriodicEvent;
 import org.onap.a1pesimulator.data.ves.VesEvent;
 import org.onap.a1pesimulator.service.cell.RanCellService;
 import org.onap.a1pesimulator.service.cell.RanCellStateService;
-import org.onap.a1pesimulator.service.ves.RanVesBrokerService;
+import org.onap.a1pesimulator.service.report.RanReportsBrokerService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
@@ -44,13 +44,13 @@ public class RanCellController {
     private static final Logger log = LoggerFactory.getLogger(RanCellController.class);
     private final RanCellService ranCellService;
     private final RanCellStateService ranCellStateService;
-    private final RanVesBrokerService ranVesBrokerService;
+    private final RanReportsBrokerService ranReportsBrokerService;
 
     public RanCellController(RanCellService ranCellService, RanCellStateService ranCellStateService,
-            RanVesBrokerService ranVesBrokerService) {
+            RanReportsBrokerService ranReportsBrokerService) {
         this.ranCellService = ranCellService;
         this.ranCellStateService = ranCellStateService;
-        this.ranVesBrokerService = ranVesBrokerService;
+        this.ranReportsBrokerService = ranReportsBrokerService;
     }
 
     @GetMapping
@@ -65,11 +65,11 @@ public class RanCellController {
 
     @ApiOperation("Start sending failure VES events for specific cell")
     @PostMapping(value = "/{identifier}/startFailure")
-    public ResponseEntity<String> startSendingFailureVesEvents(@ApiParam(value = "Cell Id") final @PathVariable String identifier,
+    public ResponseEntity<String> startSendingFailureReports(@ApiParam(value = "Cell Id") final @PathVariable String identifier,
             @ApiParam(value = "Reporting Method", defaultValue = "FILE_READY", required = true) final @RequestParam() ReportingMethodEnum reportingMethod) {
         checkIfCellExistOrThrowException(identifier);
         ranCellService.failure(identifier);
-        ranVesBrokerService.startSendingFailureVesEvents(identifier, reportingMethod);
+        ranReportsBrokerService.startSendingFailureReports(identifier, reportingMethod);
         ranCellStateService.failingState(identifier);
 
         return ResponseEntity.accepted().body("Failure VES Event sending started");
@@ -77,11 +77,11 @@ public class RanCellController {
 
     @ApiOperation("Stop sending failure VES events for specific cell")
     @PostMapping(value = "/{identifier}/stopFailure")
-    public ResponseEntity<Void> stopSendingFailureVesEvents(@ApiParam(value = "Cell Id") final @PathVariable String identifier) {
+    public ResponseEntity<Void> stopSendingFailureReports(@ApiParam(value = "Cell Id") final @PathVariable String identifier) {
         checkIfCellExistOrThrowException(identifier);
         ranCellService.recoverFromFailure(identifier);
 
-        Optional<RanPeriodicEvent> vesEvent = ranVesBrokerService.stopSendingVesEvents(identifier);
+        Optional<RanPeriodicEvent> vesEvent = ranReportsBrokerService.stopSendingReports(identifier);
 
         if (!vesEvent.isPresent()) {
             return ResponseEntity.notFound().build();
@@ -93,17 +93,17 @@ public class RanCellController {
 
     @ApiOperation("Start sending normal VES events for specific cell and  in specific granularity period")
     @PostMapping(value = "/{identifier}/start")
-    public ResponseEntity<String> startSendingVesEvents(@ApiParam(value = "Standard Measurement Event JSON") final @RequestBody Optional<VesEvent> vesEventOpt,
+    public ResponseEntity<String> startSendingReports(@ApiParam(value = "Standard Measurement Event JSON") final @RequestBody Optional<VesEvent> vesEventOpt,
             @ApiParam(value = "Cell Id") final @PathVariable String identifier,
             @ApiParam(value = "Granularity period in seconds", example = "60") final @RequestParam(required = false) Integer interval,
             @ApiParam(value = "Reporting Method", defaultValue = "FILE_READY", required = true) final @RequestParam() ReportingMethodEnum reportingMethod) {
 
         checkIfCellExistOrThrowException(identifier);
         log.info("Start sending ves events every {} seconds for {} ", getInterval(interval), identifier);
-        VesEvent vesEvent = vesEventOpt.orElse(ranVesBrokerService.getGlobalPmVesStructure());
+        VesEvent vesEvent = vesEventOpt.orElse(ranReportsBrokerService.getGlobalPmVesStructure());
 
         ResponseEntity<String> responseEntity =
-                ranVesBrokerService.startSendingVesEvents(identifier, vesEvent, getInterval(interval), reportingMethod);
+                ranReportsBrokerService.startSendingReports(identifier, vesEvent, getInterval(interval), reportingMethod);
         if (!responseEntity.getStatusCode().is2xxSuccessful()) {
             return responseEntity;
         }
@@ -114,10 +114,10 @@ public class RanCellController {
 
     @ApiOperation("Stop sending normal VES events for specific cell")
     @PostMapping(value = "/{identifier}/stop")
-    public ResponseEntity<Void> stopSendingVesEvents(@ApiParam(value = "Cell Id") final @PathVariable String identifier) {
+    public ResponseEntity<Void> stopSendingReports(@ApiParam(value = "Cell Id") final @PathVariable String identifier) {
         checkIfCellExistOrThrowException(identifier);
         log.info("Stop sending custom ves events for {}", identifier);
-        Optional<RanPeriodicEvent> vesEvent = ranVesBrokerService.stopSendingVesEvents(identifier);
+        Optional<RanPeriodicEvent> vesEvent = ranReportsBrokerService.stopSendingReports(identifier);
         if (!vesEvent.isPresent()) {
             return ResponseEntity.notFound().build();
         }
@@ -129,15 +129,15 @@ public class RanCellController {
     @GetMapping(value = "/{identifier}/pmConfig")
     public ResponseEntity<RanPeriodicEvent> getPMConfig(final @PathVariable String identifier) {
         checkIfCellExistOrThrowException(identifier);
-        if (!ranVesBrokerService.getEnabledEventElementIdentifiers().contains(identifier)) {
+        if (!ranReportsBrokerService.getEnabledEventElementIdentifiers().contains(identifier)) {
             return ResponseEntity.notFound().build();
         }
-        return ResponseEntity.ok(ranVesBrokerService.getPeriodicEvent(identifier));
+        return ResponseEntity.ok(ranReportsBrokerService.getPeriodicEvent(identifier));
     }
 
     private Integer getInterval(Integer requested) {
         if (requested == null) {
-            return ranVesBrokerService.getGlobalVesInterval();
+            return ranReportsBrokerService.getGlobalVesInterval();
         }
         return requested;
     }
diff --git a/src/main/java/org/onap/a1pesimulator/controller/RanEventConfigureController.java b/src/main/java/org/onap/a1pesimulator/controller/RanEventConfigureController.java
index 5b5037c..79bddf0 100644
--- a/src/main/java/org/onap/a1pesimulator/controller/RanEventConfigureController.java
+++ b/src/main/java/org/onap/a1pesimulator/controller/RanEventConfigureController.java
@@ -14,7 +14,7 @@
 package org.onap.a1pesimulator.controller;
 
 import org.onap.a1pesimulator.data.ves.GlobalVesConfiguration;
-import org.onap.a1pesimulator.service.ves.RanVesBrokerService;
+import org.onap.a1pesimulator.service.report.RanReportsBrokerService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,24 +26,24 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping({"${restapi.version}/ran/globalPMConfig"})
 public class RanEventConfigureController {
 
-    private final RanVesBrokerService ranVesBrokerService;
+    private final RanReportsBrokerService ranReportsBrokerService;
 
-    public RanEventConfigureController(RanVesBrokerService ranVesBrokerService) {
-        this.ranVesBrokerService = ranVesBrokerService;
+    public RanEventConfigureController(RanReportsBrokerService ranReportsBrokerService) {
+        this.ranReportsBrokerService = ranReportsBrokerService;
     }
 
     @GetMapping
     public ResponseEntity<GlobalVesConfiguration> getGlobalPMConfig() {
-        GlobalVesConfiguration config = new GlobalVesConfiguration(ranVesBrokerService.getGlobalVesInterval(),
-                ranVesBrokerService.getGlobalPmVesStructure(), ranVesBrokerService.getGlobalReportingMethod());
+        GlobalVesConfiguration config = new GlobalVesConfiguration(ranReportsBrokerService.getGlobalVesInterval(),
+                ranReportsBrokerService.getGlobalPmVesStructure(), ranReportsBrokerService.getGlobalReportingMethod());
         return ResponseEntity.ok(config);
     }
 
     @PostMapping
     public ResponseEntity<Void> setGlobalPMConfig(final @RequestBody GlobalVesConfiguration config) {
-        ranVesBrokerService.setGlobalPmVesStructure(config.getEvent());
-        ranVesBrokerService.setGlobalVesInterval(config.getInterval());
-        ranVesBrokerService.setGlobalReportingMethod(config.getReportingMethod());
+        ranReportsBrokerService.setGlobalPmVesStructure(config.getEvent());
+        ranReportsBrokerService.setGlobalVesInterval(config.getInterval());
+        ranReportsBrokerService.setGlobalReportingMethod(config.getReportingMethod());
         return ResponseEntity.ok().build();
     }
 }
diff --git a/src/main/java/org/onap/a1pesimulator/data/fileready/RanPeriodicSendReport.java b/src/main/java/org/onap/a1pesimulator/data/fileready/RanPeriodicSendReport.java
index ca812e7..c51dc1c 100644
--- a/src/main/java/org/onap/a1pesimulator/data/fileready/RanPeriodicSendReport.java
+++ b/src/main/java/org/onap/a1pesimulator/data/fileready/RanPeriodicSendReport.java
@@ -15,7 +15,7 @@ package org.onap.a1pesimulator.data.fileready;
 
 import java.util.concurrent.ScheduledFuture;
 
-import org.onap.a1pesimulator.service.fileready.RanSendReportsRunnable;
+import org.onap.a1pesimulator.service.pm.RanSendReportsRunnable;
 
 import lombok.Builder;
 import lombok.Data;
diff --git a/src/main/java/org/onap/a1pesimulator/service/a1/SetLowRangeValuesOnPolicyAction.java b/src/main/java/org/onap/a1pesimulator/service/a1/SetLowRangeValuesOnPolicyAction.java
index 29c55de..ab5002d 100644
--- a/src/main/java/org/onap/a1pesimulator/service/a1/SetLowRangeValuesOnPolicyAction.java
+++ b/src/main/java/org/onap/a1pesimulator/service/a1/SetLowRangeValuesOnPolicyAction.java
@@ -18,7 +18,7 @@ import java.util.List;
 import org.onap.a1pesimulator.data.fileready.RanPeriodicEvent;
 import org.onap.a1pesimulator.data.ves.VesEvent;
 import org.onap.a1pesimulator.data.ves.MeasurementFields.AdditionalMeasurement;
-import org.onap.a1pesimulator.service.ves.RanVesBrokerService;
+import org.onap.a1pesimulator.service.report.RanReportsBrokerService;
 import org.onap.a1pesimulator.util.JsonUtils;
 import org.onap.a1pesimulator.util.RanVesUtils;
 import org.springframework.stereotype.Service;
@@ -26,9 +26,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class SetLowRangeValuesOnPolicyAction implements OnPolicyAction {
 
-    private final RanVesBrokerService vesBrokerService;
+    private final RanReportsBrokerService vesBrokerService;
 
-    public SetLowRangeValuesOnPolicyAction(RanVesBrokerService vesBrokerService) {
+    public SetLowRangeValuesOnPolicyAction(RanReportsBrokerService vesBrokerService) {
         this.vesBrokerService = vesBrokerService;
     }
 
diff --git a/src/main/java/org/onap/a1pesimulator/service/cell/RanCellServiceImpl.java b/src/main/java/org/onap/a1pesimulator/service/cell/RanCellServiceImpl.java
index 0c0ab00..10a598c 100644
--- a/src/main/java/org/onap/a1pesimulator/service/cell/RanCellServiceImpl.java
+++ b/src/main/java/org/onap/a1pesimulator/service/cell/RanCellServiceImpl.java
@@ -23,7 +23,7 @@ import org.onap.a1pesimulator.data.cell.CellWithStatus;
 import org.onap.a1pesimulator.data.cell.RanCell;
 import org.onap.a1pesimulator.data.ue.UserEquipment;
 import org.onap.a1pesimulator.service.ue.RanUeHolder;
-import org.onap.a1pesimulator.service.ves.RanVesHolder;
+import org.onap.a1pesimulator.service.report.RanVesHolder;
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/src/main/java/org/onap/a1pesimulator/service/common/AbstractRanRunnable.java b/src/main/java/org/onap/a1pesimulator/service/common/AbstractRanRunnable.java
index bd5e2a9..700d336 100644
--- a/src/main/java/org/onap/a1pesimulator/service/common/AbstractRanRunnable.java
+++ b/src/main/java/org/onap/a1pesimulator/service/common/AbstractRanRunnable.java
@@ -16,7 +16,7 @@ package org.onap.a1pesimulator.service.common;
 import java.util.Collection;
 
 import org.onap.a1pesimulator.data.ves.VesEvent;
-import org.onap.a1pesimulator.service.ves.OnEventAction;
+import org.onap.a1pesimulator.service.report.OnEventAction;
 
 public abstract class AbstractRanRunnable implements Runnable {
 
diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/FileReadyEventService.java b/src/main/java/org/onap/a1pesimulator/service/pm/FileReadyEventService.java
index 98f0733..df2ce97 100644
--- a/src/main/java/org/onap/a1pesimulator/service/fileready/FileReadyEventService.java
+++ b/src/main/java/org/onap/a1pesimulator/service/pm/FileReadyEventService.java
@@ -11,9 +11,9 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
-import static org.onap.a1pesimulator.service.fileready.FtpServerService.deletePMBulkFile;
+import static org.onap.a1pesimulator.service.pm.FtpServerService.deletePMBulkFile;
 import static org.onap.a1pesimulator.util.Constants.FILE_READY_CHANGE_IDENTIFIER;
 import static org.onap.a1pesimulator.util.Constants.FILE_READY_CHANGE_TYPE;
 
diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/FtpServerService.java b/src/main/java/org/onap/a1pesimulator/service/pm/FtpServerService.java
index c02ffc3..01b0672 100644
--- a/src/main/java/org/onap/a1pesimulator/service/fileready/FtpServerService.java
+++ b/src/main/java/org/onap/a1pesimulator/service/pm/FtpServerService.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 import static java.util.Objects.nonNull;
 import static org.onap.a1pesimulator.util.Constants.TEMP_DIR;
diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java b/src/main/java/org/onap/a1pesimulator/service/pm/PMBulkFileService.java
index 813c8a4..aec473c 100644
--- a/src/main/java/org/onap/a1pesimulator/service/fileready/PMBulkFileService.java
+++ b/src/main/java/org/onap/a1pesimulator/service/pm/PMBulkFileService.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 import static java.util.Comparator.comparing;
 import static java.util.Objects.isNull;
diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/RanFileReadyHolder.java b/src/main/java/org/onap/a1pesimulator/service/pm/RanFileReadyHolder.java
index cf3cf3a..d3a7970 100644
--- a/src/main/java/org/onap/a1pesimulator/service/fileready/RanFileReadyHolder.java
+++ b/src/main/java/org/onap/a1pesimulator/service/pm/RanFileReadyHolder.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
@@ -27,7 +27,7 @@ import org.onap.a1pesimulator.data.fileready.EventMemoryHolder;
 import org.onap.a1pesimulator.data.fileready.FileData;
 import org.onap.a1pesimulator.data.ves.VesEvent;
 import org.onap.a1pesimulator.exception.VesBrokerException;
-import org.onap.a1pesimulator.service.ves.RanVesSender;
+import org.onap.a1pesimulator.service.report.RanVesSender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/RanSaveFileReadyRunnable.java b/src/main/java/org/onap/a1pesimulator/service/pm/RanSaveFileReadyRunnable.java
index 53d4600..222680f 100644
--- a/src/main/java/org/onap/a1pesimulator/service/fileready/RanSaveFileReadyRunnable.java
+++ b/src/main/java/org/onap/a1pesimulator/service/pm/RanSaveFileReadyRunnable.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 import java.util.Collection;
 import java.util.UUID;
@@ -20,7 +20,7 @@ import org.onap.a1pesimulator.data.ves.VesEvent;
 import org.onap.a1pesimulator.exception.VesBrokerException;
 import org.onap.a1pesimulator.service.common.AbstractRanRunnable;
 import org.onap.a1pesimulator.service.common.EventCustomizer;
-import org.onap.a1pesimulator.service.ves.OnEventAction;
+import org.onap.a1pesimulator.service.report.OnEventAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/onap/a1pesimulator/service/fileready/RanSendReportsRunnable.java b/src/main/java/org/onap/a1pesimulator/service/pm/RanSendReportsRunnable.java
index f92d479..88cb5a2 100644
--- a/src/main/java/org/onap/a1pesimulator/service/fileready/RanSendReportsRunnable.java
+++ b/src/main/java/org/onap/a1pesimulator/service/pm/RanSendReportsRunnable.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 public class RanSendReportsRunnable implements Runnable {
 
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/OnEventAction.java b/src/main/java/org/onap/a1pesimulator/service/report/OnEventAction.java
index ba1ddab..f95f749 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/OnEventAction.java
+++ b/src/main/java/org/onap/a1pesimulator/service/report/OnEventAction.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import org.onap.a1pesimulator.data.ves.VesEvent;
 
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanCellEventCustomizer.java b/src/main/java/org/onap/a1pesimulator/service/report/RanCellEventCustomizer.java
index 7cb375f..f16e29c 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanCellEventCustomizer.java
+++ b/src/main/java/org/onap/a1pesimulator/service/report/RanCellEventCustomizer.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanCellFailureEventCustomizer.java b/src/main/java/org/onap/a1pesimulator/service/report/RanCellFailureEventCustomizer.java
index a21d1ad..6d62f33 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanCellFailureEventCustomizer.java
+++ b/src/main/java/org/onap/a1pesimulator/service/report/RanCellFailureEventCustomizer.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import java.text.MessageFormat;
 import java.util.Collection;
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanCheckCellIsDeadOnEvent.java b/src/main/java/org/onap/a1pesimulator/service/report/RanCheckCellIsDeadOnEvent.java
index 3d0c400..a3fc3da 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanCheckCellIsDeadOnEvent.java
+++ b/src/main/java/org/onap/a1pesimulator/service/report/RanCheckCellIsDeadOnEvent.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import static org.onap.a1pesimulator.service.cell.RanCellStateService.TOPIC_CELL;
 
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanEventCustomizerFactory.java b/src/main/java/org/onap/a1pesimulator/service/report/RanEventCustomizerFactory.java
index c7c2ee9..26ec13a 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanEventCustomizerFactory.java
+++ b/src/main/java/org/onap/a1pesimulator/service/report/RanEventCustomizerFactory.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import java.text.MessageFormat;
 
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerService.java b/src/main/java/org/onap/a1pesimulator/service/report/RanReportsBrokerService.java
index 1b92fbf..a1af9ac 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerService.java
+++ b/src/main/java/org/onap/a1pesimulator/service/report/RanReportsBrokerService.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import java.util.Collection;
 import java.util.Map;
@@ -22,11 +22,11 @@ import org.onap.a1pesimulator.data.fileready.RanPeriodicEvent;
 import org.onap.a1pesimulator.data.ves.VesEvent;
 import org.springframework.http.ResponseEntity;
 
-public interface RanVesBrokerService {
+public interface RanReportsBrokerService {
 
-    ResponseEntity<String> startSendingVesEvents(String identifier, VesEvent vesEvent, Integer interval, ReportingMethodEnum reportingMethods);
+    ResponseEntity<String> startSendingReports(String identifier, VesEvent vesEvent, Integer interval, ReportingMethodEnum reportingMethods);
 
-    Optional<RanPeriodicEvent> stopSendingVesEvents(String identifier);
+    Optional<RanPeriodicEvent> stopSendingReports(String identifier);
 
     Map<String, RanPeriodicEvent> getPeriodicEventsCache();
 
@@ -34,7 +34,7 @@ public interface RanVesBrokerService {
 
     RanPeriodicEvent getPeriodicEvent(String identifier);
 
-    VesEvent startSendingFailureVesEvents(String identifier, ReportingMethodEnum reportingMethods);
+    VesEvent startSendingFailureReports(String identifier, ReportingMethodEnum reportingMethods);
 
     VesEvent getGlobalPmVesStructure();
 
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerServiceImpl.java b/src/main/java/org/onap/a1pesimulator/service/report/RanReportsBrokerServiceImpl.java
index ea4b46d..b441164 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesBrokerServiceImpl.java
+++ b/src/main/java/org/onap/a1pesimulator/service/report/RanReportsBrokerServiceImpl.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -27,13 +27,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 @Service
-public class RanVesBrokerServiceImpl implements RanVesBrokerService {
+public class RanReportsBrokerServiceImpl implements RanReportsBrokerService {
 
     private final RanVesDataProvider vesDataProvider;
 
     private final RanVesHolder vesHolder;
 
-    public RanVesBrokerServiceImpl(RanVesDataProvider vesDataProvider, RanVesHolder vesHolder) {
+    public RanReportsBrokerServiceImpl(RanVesDataProvider vesDataProvider, RanVesHolder vesHolder) {
         this.vesDataProvider = vesDataProvider;
         this.vesHolder = vesHolder;
     }
@@ -44,14 +44,14 @@ public class RanVesBrokerServiceImpl implements RanVesBrokerService {
     }
 
     @Override
-    public ResponseEntity<String> startSendingVesEvents(String identifier, VesEvent vesEvent, Integer interval, ReportingMethodEnum reportingMethod) {
+    public ResponseEntity<String> startSendingReports(String identifier, VesEvent vesEvent, Integer interval, ReportingMethodEnum reportingMethod) {
         enrichWithIdentifier(identifier, vesEvent);
         ResponseEntity<String> response = vesHolder.startSendingVesEvents(identifier, vesEvent, interval, reportingMethod);
         return ResponseEntity.accepted().body(response.getBody());
     }
 
     @Override
-    public VesEvent startSendingFailureVesEvents(String identifier, ReportingMethodEnum reportingMethod) {
+    public VesEvent startSendingFailureReports(String identifier, ReportingMethodEnum reportingMethod) {
 
         var vesEvent = vesDataProvider.getFailurePmVesEvent();
 
@@ -61,7 +61,7 @@ public class RanVesBrokerServiceImpl implements RanVesBrokerService {
     }
 
     @Override
-    public Optional<RanPeriodicEvent> stopSendingVesEvents(String identifier) {
+    public Optional<RanPeriodicEvent> stopSendingReports(String identifier) {
         return vesHolder.stopSendingVesEvents(identifier);
     }
 
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanSendVesRunnable.java b/src/main/java/org/onap/a1pesimulator/service/report/RanSendVesRunnable.java
index c537a5f..e982417 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanSendVesRunnable.java
+++ b/src/main/java/org/onap/a1pesimulator/service/report/RanSendVesRunnable.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import java.util.Collection;
 
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesDataProvider.java b/src/main/java/org/onap/a1pesimulator/service/report/RanVesDataProvider.java
index 931b258..35f2773 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesDataProvider.java
+++ b/src/main/java/org/onap/a1pesimulator/service/report/RanVesDataProvider.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java b/src/main/java/org/onap/a1pesimulator/service/report/RanVesHolder.java
index 92d30e4..dba7898 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesHolder.java
+++ b/src/main/java/org/onap/a1pesimulator/service/report/RanVesHolder.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
@@ -31,10 +31,10 @@ import org.onap.a1pesimulator.data.fileready.RanPeriodicSendReport;
 import org.onap.a1pesimulator.data.ves.VesEvent;
 import org.onap.a1pesimulator.service.common.AbstractRanRunnable;
 import org.onap.a1pesimulator.service.common.EventCustomizer;
-import org.onap.a1pesimulator.service.fileready.RanFileReadyHolder;
-import org.onap.a1pesimulator.service.fileready.RanSaveFileReadyRunnable;
-import org.onap.a1pesimulator.service.fileready.RanSendReportsRunnable;
-import org.onap.a1pesimulator.service.ves.RanEventCustomizerFactory.Mode;
+import org.onap.a1pesimulator.service.pm.RanFileReadyHolder;
+import org.onap.a1pesimulator.service.pm.RanSaveFileReadyRunnable;
+import org.onap.a1pesimulator.service.pm.RanSendReportsRunnable;
+import org.onap.a1pesimulator.service.report.RanEventCustomizerFactory.Mode;
 import org.onap.a1pesimulator.util.VnfConfigReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesSender.java b/src/main/java/org/onap/a1pesimulator/service/report/RanVesSender.java
index 85bccbb..d12abd8 100644
--- a/src/main/java/org/onap/a1pesimulator/service/ves/RanVesSender.java
+++ b/src/main/java/org/onap/a1pesimulator/service/report/RanVesSender.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import static java.util.Objects.nonNull;
 
diff --git a/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java b/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java
index 2c2d9ff..1df8820 100644
--- a/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java
+++ b/src/test/java/org/onap/a1pesimulator/service/VesBrokerServiceImplTest.java
@@ -29,8 +29,8 @@ import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.onap.a1pesimulator.data.ReportingMethodEnum;
 import org.onap.a1pesimulator.data.ves.VesEvent;
-import org.onap.a1pesimulator.service.ves.RanVesBrokerService;
-import org.onap.a1pesimulator.service.ves.RanVesSender;
+import org.onap.a1pesimulator.service.report.RanReportsBrokerService;
+import org.onap.a1pesimulator.service.report.RanVesSender;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpEntity;
@@ -50,7 +50,7 @@ public class VesBrokerServiceImplTest {
     private static final String VES_COLLECTOR_URL = "someProtocol://someVesCollectorIP:someVesCollectorPort/somePath";
 
     @Autowired
-    private RanVesBrokerService vesBrokerService;
+    private RanReportsBrokerService vesBrokerService;
     @Autowired
     private RanVesSender vesSender;
     @Autowired
@@ -70,7 +70,7 @@ public class VesBrokerServiceImplTest {
         when(restTemplate.exchange(ArgumentMatchers.eq(VES_COLLECTOR_URL), ArgumentMatchers.eq(HttpMethod.POST),
                 ArgumentMatchers.any(HttpEntity.class), ArgumentMatchers.eq(String.class))).thenReturn(responseEntity);
 
-        ResponseEntity<String> response = vesBrokerService.startSendingVesEvents("CustomIdentifier",
+        ResponseEntity<String> response = vesBrokerService.startSendingReports("CustomIdentifier",
                 loadEventFromFile("VesBrokerControllerTest_pm_ves.json"), 10, ReportingMethodEnum.VES);
 
         Assert.assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
diff --git a/src/test/java/org/onap/a1pesimulator/service/cell/RanCellStateServiceTest.java b/src/test/java/org/onap/a1pesimulator/service/cell/RanCellStateServiceTest.java
index 3aefcb7..ee68836 100644
--- a/src/test/java/org/onap/a1pesimulator/service/cell/RanCellStateServiceTest.java
+++ b/src/test/java/org/onap/a1pesimulator/service/cell/RanCellStateServiceTest.java
@@ -19,7 +19,7 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.onap.a1pesimulator.service.fileready.CommonFileReady.TEST_CELL_ID;
+import static org.onap.a1pesimulator.service.pm.CommonFileReady.TEST_CELL_ID;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/CommonFileReady.java b/src/test/java/org/onap/a1pesimulator/service/pm/CommonFileReady.java
index 9727777..aae5e53 100644
--- a/src/test/java/org/onap/a1pesimulator/service/fileready/CommonFileReady.java
+++ b/src/test/java/org/onap/a1pesimulator/service/pm/CommonFileReady.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 import static org.onap.a1pesimulator.TestHelpers.deleteTempFiles;
 import static org.onap.a1pesimulator.util.Constants.TEMP_DIR;
diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/FileReadyEventServiceTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/FileReadyEventServiceTest.java
index 21794a2..141d455 100644
--- a/src/test/java/org/onap/a1pesimulator/service/fileready/FileReadyEventServiceTest.java
+++ b/src/test/java/org/onap/a1pesimulator/service/pm/FileReadyEventServiceTest.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/FtpServerServiceTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/FtpServerServiceTest.java
index 48515a8..4284e33 100644
--- a/src/test/java/org/onap/a1pesimulator/service/fileready/FtpServerServiceTest.java
+++ b/src/test/java/org/onap/a1pesimulator/service/pm/FtpServerServiceTest.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.onap.a1pesimulator.service.fileready.FtpServerService.deletePMBulkFile;
+import static org.onap.a1pesimulator.service.pm.FtpServerService.deletePMBulkFile;
 import static org.onap.a1pesimulator.util.Constants.TEMP_DIR;
 
 import java.io.File;
diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/PMBulkFileServiceTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/PMBulkFileServiceTest.java
index 8133266..ea9326e 100644
--- a/src/test/java/org/onap/a1pesimulator/service/fileready/PMBulkFileServiceTest.java
+++ b/src/test/java/org/onap/a1pesimulator/service/pm/PMBulkFileServiceTest.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/RanFileReadyHolderTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/RanFileReadyHolderTest.java
index d6fa574..dd82065 100644
--- a/src/test/java/org/onap/a1pesimulator/service/fileready/RanFileReadyHolderTest.java
+++ b/src/test/java/org/onap/a1pesimulator/service/pm/RanFileReadyHolderTest.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -33,7 +33,7 @@ import org.onap.a1pesimulator.data.fileready.EventMemoryHolder;
 import org.onap.a1pesimulator.data.fileready.FileData;
 import org.onap.a1pesimulator.data.fileready.FileReadyEvent;
 import org.onap.a1pesimulator.exception.VesBrokerException;
-import org.onap.a1pesimulator.service.ves.RanVesSender;
+import org.onap.a1pesimulator.service.report.RanVesSender;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/RanSaveFileReadyRunnableTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/RanSaveFileReadyRunnableTest.java
index 9b94107..198d46c 100644
--- a/src/test/java/org/onap/a1pesimulator/service/fileready/RanSaveFileReadyRunnableTest.java
+++ b/src/test/java/org/onap/a1pesimulator/service/pm/RanSaveFileReadyRunnableTest.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -29,9 +29,9 @@ import org.mockito.Mock;
 import org.onap.a1pesimulator.data.ves.VesEvent;
 import org.onap.a1pesimulator.exception.VesBrokerException;
 import org.onap.a1pesimulator.service.ue.RanUeHolder;
-import org.onap.a1pesimulator.service.ves.RanCellEventCustomizer;
-import org.onap.a1pesimulator.service.ves.RanEventCustomizerFactory;
-import org.onap.a1pesimulator.service.ves.RanEventCustomizerFactory.Mode;
+import org.onap.a1pesimulator.service.report.RanCellEventCustomizer;
+import org.onap.a1pesimulator.service.report.RanEventCustomizerFactory;
+import org.onap.a1pesimulator.service.report.RanEventCustomizerFactory.Mode;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/RanSendReportsRunnableTest.java b/src/test/java/org/onap/a1pesimulator/service/pm/RanSendReportsRunnableTest.java
index d2e8da8..b7de25b 100644
--- a/src/test/java/org/onap/a1pesimulator/service/fileready/RanSendReportsRunnableTest.java
+++ b/src/test/java/org/onap/a1pesimulator/service/pm/RanSendReportsRunnableTest.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.fileready;
+package org.onap.a1pesimulator.service.pm;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.onap.a1pesimulator.service.ue.RanUeHolder;
-import org.onap.a1pesimulator.service.ves.RanCellEventCustomizer;
-import org.onap.a1pesimulator.service.ves.RanEventCustomizerFactory;
+import org.onap.a1pesimulator.service.report.RanCellEventCustomizer;
+import org.onap.a1pesimulator.service.report.RanEventCustomizerFactory;
 
 class RanSendReportsRunnableTest extends CommonFileReady {
 
diff --git a/src/test/java/org/onap/a1pesimulator/service/ves/RanVesHolderTest.java b/src/test/java/org/onap/a1pesimulator/service/report/RanVesHolderTest.java
index 7f6258c..94a2b18 100644
--- a/src/test/java/org/onap/a1pesimulator/service/ves/RanVesHolderTest.java
+++ b/src/test/java/org/onap/a1pesimulator/service/report/RanVesHolderTest.java
@@ -11,7 +11,7 @@
  * limitations under the License
  */
 
-package org.onap.a1pesimulator.service.ves;
+package org.onap.a1pesimulator.service.report;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -31,8 +31,8 @@ import org.onap.a1pesimulator.data.ReportingMethodEnum;
 import org.onap.a1pesimulator.data.fileready.RanPeriodicEvent;
 import org.onap.a1pesimulator.data.ves.VesEvent;
 import org.onap.a1pesimulator.service.common.EventCustomizer;
-import org.onap.a1pesimulator.service.fileready.CommonFileReady;
-import org.onap.a1pesimulator.service.fileready.RanFileReadyHolder;
+import org.onap.a1pesimulator.service.pm.CommonFileReady;
+import org.onap.a1pesimulator.service.pm.RanFileReadyHolder;
 import org.onap.a1pesimulator.service.ue.RanUeHolder;
 import org.onap.a1pesimulator.util.VnfConfigReader;
 import org.springframework.http.HttpStatus;
@@ -127,7 +127,7 @@ class RanVesHolderTest extends CommonFileReady {
     }
 
     @Test
-    void getEventStructure() {
+    void getPMConfiguration() {
         VesEvent testedEvent = loadEventFromFile();
         ranCellsHolder.startSendingVesEvents(TEST_CELL_ID, testedEvent, 10, ReportingMethodEnum.FILE_READY);
         RanPeriodicEvent event = ranCellsHolder.getPeriodicEventForCell(TEST_CELL_ID);
@@ -137,7 +137,7 @@ class RanVesHolderTest extends CommonFileReady {
     }
 
     @Test
-    void getEventStructureError() {
+    void getPMConfigurationError() {
         assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> ranCellsHolder.getPeriodicEventForCell(TEST_CELL_ID));
     }
 }
 \ No newline at end of file