Rename TOSCA Control Loop to ACM

This commit renames the TOSCA Control Loop functionality in CLAMP to
Automation Composition Management.

This review is a direct renaming review and, as everything is renamed
together it is large.

Issue-ID: POLICY-3939
Change-Id: I28f0a6dd889bf3570a4c1365ae9e71fc58db6d6c
Signed-off-by: liamfallon <liam.fallon@est.tech>

8 files changed, 101 insertions, 101 deletions

diff --git a/models/src/test/resources/META-INF/persistence.xml b/models/src/test/resources/META-INF/persistence.xml
index 54495a2fe..9bd136229 100644
--- a/models/src/test/resources/META-INF/persistence.xml
+++ b/models/src/test/resources/META-INF/persistence.xml
@@ -52,11 +52,11 @@
         <class>org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate</class>
         <class>org.onap.policy.models.tosca.simple.concepts.JpaToscaTopologyTemplate</class>
         <class>org.onap.policy.models.tosca.simple.concepts.JpaToscaTrigger</class>
-        <class>org.onap.policy.clamp.controlloop.models.controlloop.persistence.concepts.JpaControlLoop</class>
-        <class>org.onap.policy.clamp.controlloop.models.controlloop.persistence.concepts.JpaControlLoopElement</class>
-        <class>org.onap.policy.clamp.controlloop.models.controlloop.persistence.concepts.JpaParticipant</class>
-        <class>org.onap.policy.clamp.controlloop.models.controlloop.persistence.concepts.JpaParticipantStatistics</class>
-        <class>org.onap.policy.clamp.controlloop.models.controlloop.persistence.concepts.JpaClElementStatistics</class>
+        <class>org.onap.policy.clamp.models.acm.persistence.concepts.JpaAutomationComposition</class>
+        <class>org.onap.policy.clamp.models.acm.persistence.concepts.JpaAutomationCompositionElement</class>
+        <class>org.onap.policy.clamp.models.acm.persistence.concepts.JpaParticipant</class>
+        <class>org.onap.policy.clamp.models.acm.persistence.concepts.JpaParticipantStatistics</class>
+        <class>org.onap.policy.clamp.models.acm.persistence.concepts.JpaClElementStatistics</class>
 
         <properties>
             <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
diff --git a/models/src/test/resources/examples/controlloop/PMSubscriptionHandling.yaml b/models/src/test/resources/examples/acm/PMSubscriptionHandling.yaml
index 8e8f3cd39..c8796ac49 100644
--- a/models/src/test/resources/examples/controlloop/PMSubscriptionHandling.yaml
+++ b/models/src/test/resources/examples/acm/PMSubscriptionHandling.yaml
@@ -26,8 +26,8 @@ data_types:
       version:
         type: string
         required: true
-  org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo:
-    name: org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo
+  org.onap.datatypes.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElementConsulInfo:
+    name: org.onap.datatypes.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElementConsulInfo
     version: 0.0.0
     derived_from: tosca.datatypes.Root
     properties:
@@ -303,14 +303,14 @@ policy_types:
     derived_from: onap.policies.Monitoring
     metadata: {}
 node_types:
-  org.onap.policy.clamp.controlloop.Participant:
+  org.onap.policy.clamp.acm.Participant:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
       provider:
         type: string
         required: false
-  org.onap.policy.clamp.controlloop.ControlLoopElement:
+  org.onap.policy.clamp.acm.AutomationCompositionElement:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
@@ -327,11 +327,11 @@ node_types:
         - greater-or-equal: 0
         metadata:
             common: true
-        description: A value indicating the start phase in which this control loop element will be started, the
-                     first start phase is zero. Control Loop Elements are started in their start_phase order and stopped
-                     in reverse start phase order. Control Loop Elements with the same start phase are started and
-                     stopped simultaneously
-  org.onap.policy.clamp.controlloop.ControlLoop:
+        description: A value indicating the start phase in which this automation composition element will be started,
+                     the first start phase is zero. Automation composition elements are started in their start_phase
+                     order and stopped in reverse start phase order. Automation composition elements with the same start
+                     phase are started and stopped simultaneously
+  org.onap.policy.clamp.acm.AutomationComposition:
     version: 1.0.1
     derived_from: tosca.nodetypes.Root
     properties:
@@ -343,9 +343,9 @@ node_types:
         required: true
         entry_schema:
           type: onap.datatypes.ToscaConceptIdentifier
-  org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement:
+  org.onap.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElement:
     version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       dcae_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
@@ -357,10 +357,10 @@ node_types:
         type: list
         required: false
         entry_schema:
-          type: org.onap.datatypes.policy.clamp.controlloop.DCAEMicroserviceControlLoopElementConsulInfo
-  org.onap.policy.clamp.controlloop.PolicyControlLoopElement:
+          type: org.onap.datatypes.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElementConsulInfo
+  org.onap.policy.clamp.acm.PolicyAutomationCompositionElement:
     version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       policy_type_id:
         type: onap.datatypes.ToscaConceptIdentifier
@@ -368,9 +368,9 @@ node_types:
       policy_id:
         type: onap.datatypes.ToscaConceptIdentifier
         required: false
-  org.onap.policy.clamp.controlloop.CDSControlLoopElement:
+  org.onap.policy.clamp.acm.CDSAutomationCompositionElement:
     version: 1.0.1
-    derived_from: org.onap.policy.clamp.controlloop.ControlLoopElement
+    derived_from: org.onap.policy.clamp.acm.AutomationCompositionElement
     properties:
       cds_blueprint_id:
         type: onap.datatypes.ToscaConceptIdentifier
@@ -390,36 +390,36 @@ topology_template:
         name: operational.apex.pmcontrol
         version: 1.0.0
   node_templates:
-    org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant:
+    org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant:
       version: 2.3.4
-      type: org.onap.policy.clamp.controlloop.Participant
+      type: org.onap.policy.clamp.acm.Participant
       type_version: 1.0.1
       description: Participant for DCAE microservices
       properties:
         provider: ONAP
-    org.onap.policy.controlloop.PolicyControlLoopParticipant:
+    org.onap.policy.acm.PolicyAutomationCompositionParticipant:
       version: 2.3.1
-      type: org.onap.policy.clamp.controlloop.Participant
+      type: org.onap.policy.clamp.acm.Participant
       type_version: 1.0.1
       description: Participant for DCAE microservices
       properties:
         provider: ONAP
-    org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant:
+    org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant:
       version: 2.2.1
-      type: org.onap.policy.clamp.controlloop.Participant
+      type: org.onap.policy.clamp.acm.Participant
       type_version: 1.0.1
       description: Participant for DCAE microservices
       properties:
         provider: ONAP
     org.onap.domain.pmsh.PMSH_DCAEMicroservice:
       version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.DCAEMicroserviceControlLoopElement
+      type: org.onap.policy.clamp.acm.DCAEMicroserviceAutomationCompositionElement
       type_version: 1.0.0
-      description: Control loop element for the DCAE microservice for Performance Management Subscription Handling
+      description: Automation composition element for the DCAE microservice for Performance Management Subscription Handling
       properties:
         provider: Ericsson
         participantType:
-          name: org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant
+          name: org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant
           version: 2.3.4
         dcae_blueprint:
           tosca_definitions_version: cloudify_dsl_1_3
@@ -635,64 +635,64 @@ topology_template:
                   managedObjectDNsBasic:
                   - DN: dnc
                   - DN: dnd
-    org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement:
+    org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement:
       version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.PolicyControlLoopElement
+      type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
       type_version: 1.0.0
-      description: Control loop element for the monitoring policy for Performance Management Subscription Handling
+      description: Automation composition element for the monitoring policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
         participantType:
-          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
+          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
           version: 2.3.1
         policy_type_id:
           name: onap.policies.monitoring.pm-subscription-handler
           version: 1.0.0
         policy_id:
           get_input: pmsh_monitoring_policy
-    org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement:
+    org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement:
       version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.PolicyControlLoopElement
+      type: org.onap.policy.clamp.acm.PolicyAutomationCompositionElement
       type_version: 1.0.0
-      description: Control loop element for the operational policy for Performance Management Subscription Handling
+      description: Automation composition element for the operational policy for Performance Management Subscription Handling
       properties:
         provider: Ericsson
         participantType:
-          name: org.onap.policy.controlloop.PolicyControlLoopParticipant
+          name: org.onap.policy.acm.PolicyAutomationCompositionParticipant
           version: 2.2.1
         policy_type_id:
           name: onap.policies.operational.pm-subscription-handler
           version: 1.0.0
         policy_id:
           get_input: pmsh_operational_policy
-    org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement:
+    org.onap.domain.pmsh.PMSH_CDS_AutomationCompositionElement:
       version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.CDSControlLoopElement
+      type: org.onap.policy.clamp.acm.CDSAutomationCompositionElement
       type_version: 1.0.0
-      description: Control loop element for CDS for Performance Management Subscription Handling
+      description: Automation composition element for CDS for Performance Management Subscription Handling
       properties:
         provider: Ericsson
         participantType:
-          name: org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant
+          name: org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant
           version: 3.2.1
         cds_blueprint_id:
           name: org.onap.ccsdk.cds.PMSHCdsBlueprint
           version: 1.0.0
-    org.onap.domain.pmsh.PMSHControlLoopDefinition:
+    org.onap.domain.pmsh.PMSHAutomationCompositionDefinition:
       version: 1.2.3
-      type: org.onap.policy.clamp.controlloop.ControlLoop
+      type: org.onap.policy.clamp.acm.AutomationComposition
       type_version: 1.0.0
-      description: Control loop for Performance Management Subscription Handling
+      description: Automation composition for Performance Management Subscription Handling
       properties:
         provider: Ericsson
         elements:
         - name: org.onap.domain.pmsh.PMSH_DCAEMicroservice
           version: 1.2.3
-        - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement
+        - name: org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement
           version: 1.2.3
-        - name: org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement
+        - name: org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement
           version: 1.2.3
-        - name: org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement
+        - name: org.onap.domain.pmsh.PMSH_CDS_AutomationCompositionElement
           version: 1.2.3
   policies:
   - MICROSERVICE_vLoadBalancerMS_v1_0_dcae-pm-subscription-handler_1_0_0test:
@@ -753,7 +753,7 @@ topology_template:
                     onap.datatypes.monitoring.managedObjectDNsBasic:
                       DN: dnd
   - operational.apex.pmcontrol:
-      type: onap.policies.controlloop.operational.common.Apex
+      type: onap.policies.acm.operational.common.Apex
       type_version: 1.0.0
       version: 1.0.0
       metadata:
@@ -3212,7 +3212,7 @@ topology_template:
                   jsonAdapters:
                     Instant:
                       adaptedClass: java.time.Instant
-                      adaptorClass: org.onap.policy.controlloop.util.Serialization$GsonInstantAdapter
+                      adaptorClass: org.onap.policy.acm.util.Serialization$GsonInstantAdapter
         eventInputParameters:
           DCAEConsumer:
             carrierTechnologyParameters:
diff --git a/models/src/test/resources/json/ControlLoopElementNoOrderedState.json b/models/src/test/resources/json/AutomationCompositionElementNoOrderedState.json
index 33a63e604..872499abf 100644
--- a/models/src/test/resources/json/ControlLoopElementNoOrderedState.json
+++ b/models/src/test/resources/json/AutomationCompositionElementNoOrderedState.json
@@ -1,7 +1,7 @@
 {
     "id": "a95757ba-b34a-4049-a2a8-46773abcbe5e",
     "definition": {
-        "name": "cleDef",
+        "name": "aceDef",
         "version": "0.0.1"
     },
     "participantType": {
diff --git a/models/src/test/resources/json/ControlLoopNoOrderedState.json b/models/src/test/resources/json/AutomationCompositionNoOrderedState.json
index 6bff97580..d61a61117 100644
--- a/models/src/test/resources/json/ControlLoopNoOrderedState.json
+++ b/models/src/test/resources/json/AutomationCompositionNoOrderedState.json
@@ -1,12 +1,12 @@
 {
     "definition": {
-        "name": "controlLoopDefinitionName",
+        "name": "automationCompositionDefinitionName",
         "version": "0.0.1"
     },
     "state": "UNINITIALISED",
     "orderedState": null,
     "elements": [
     ],
-    "name": "control-loop",
+    "name": "automation-composition",
     "version": "0.0.1"
 }
diff --git a/models/src/test/resources/providers/TestClElementStatistics.json b/models/src/test/resources/providers/TestAcElementStatistics.json
index ae19e560d..cceb91d14 100644
--- a/models/src/test/resources/providers/TestClElementStatistics.json
+++ b/models/src/test/resources/providers/TestAcElementStatistics.json
@@ -1,5 +1,5 @@
 {
-  "clElementStatistics":[
+  "acElementStatistics":[
     {
       "participantId":{
         "name":"name1",
@@ -7,8 +7,8 @@
       },
       "id": "709c62b3-8918-41b9-a747-d21eb79c6c20",
       "timeStamp": "2021-01-10T13:45:00.000Z",
-      "controlLoopState": "UNINITIALISED",
-      "clElementUptime":250
+      "state": "UNINITIALISED",
+      "acElementUptime":250
     },
     {
       "participantId":{
@@ -17,8 +17,8 @@
       },
       "id": "709c62b3-8918-41b9-a747-d21eb79c6c21",
       "timeStamp": "2021-01-10T14:25:00.000Z",
-      "controlLoopState": "UNINITIALISED",
-      "clElementUptime":330
+      "state": "UNINITIALISED",
+      "acElementUptime":330
     }
   ]
 }
diff --git a/models/src/test/resources/providers/TestControlLoops.json b/models/src/test/resources/providers/TestAutomationCompositions.json
index fedda9600..906785244 100644
--- a/models/src/test/resources/providers/TestControlLoops.json
+++ b/models/src/test/resources/providers/TestAutomationCompositions.json
@@ -1,8 +1,8 @@
 {
-    "controlLoopList": [
+    "automationCompositionList": [
         {
             "definition": {
-                "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
+                "name": "org.onap.domain.pmsh.PMSHAutomationCompositionDefinition",
                 "version": "1.0.0"
             },
             "state": "UNINITIALISED",
@@ -15,63 +15,63 @@
                         "version": "1.2.3"
                     },
                     "participantType": {
-                        "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant",
+                        "name": "org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant",
                         "version": "2.3.4"
                     },
                     "state": "UNINITIALISED",
                     "orderedState": "UNINITIALISED",
-                    "description": "DCAE Control Loop Element for the PMSH instance 0 control loop"
+                    "description": "DCAE automation composition element for the PMSH instance 0 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-e21eb79c6c21": {
                     "id": "709c62b3-8918-41b9-a747-d21eb79c6c21",
                     "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
+                        "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement",
                         "version": "1.2.3"
                     },
                     "participantType": {
-                        "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
+                        "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant",
                         "version": "2.3.1"
                     },
                     "state": "UNINITIALISED",
                     "orderedState": "UNINITIALISED",
-                    "description": "Monitoring Policy Control Loop Element for the PMSH instance 0 control loop"
+                    "description": "Monitoring Policy element for the PMSH instance 0 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-e21eb79c6c22": {
                     "id": "709c62b3-8918-41b9-a747-d21eb79c6c22",
                     "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
+                        "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
                         "version": "1.2.3"
                     },
                     "participantType": {
-                        "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
+                        "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant",
                         "version": "2.3.1"
                     },
                     "state": "UNINITIALISED",
                     "orderedState": "UNINITIALISED",
-                    "description": "Operational Policy Control Loop Element for the PMSH instance 0 control loop"
+                    "description": "Operational Policy element for the PMSH instance 0 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-e21eb79c6c23": {
                     "id": "709c62b3-8918-41b9-a747-d21eb79c6c23",
                     "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement",
+                        "name": "org.onap.domain.pmsh.PMSH_CDS_AutomationCompositionElement",
                         "version": "1.2.3"
                     },
                     "participantType": {
-                        "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant",
+                        "name": "org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant",
                         "version": "2.2.1"
                     },
                     "state": "UNINITIALISED",
                     "orderedState": "UNINITIALISED",
-                    "description": "CDS Control Loop Element for the PMSH instance 0 control loop"
+                    "description": "CDS automation composition element for the PMSH instance 0 automation composition"
                 }
             },
             "name": "PMSHInstance0",
             "version": "1.0.1",
-            "description": "PMSH control loop instance 0"
+            "description": "PMSH automation composition instance 0"
         },
         {
             "definition": {
-                "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
+                "name": "org.onap.domain.pmsh.PMSHAutomationCompositionDefinition",
                 "version": "1.0.0"
             },
             "state": "UNINITIALISED",
@@ -84,59 +84,59 @@
                         "version": "1.2.3"
                     },
                     "participantType": {
-                        "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant",
+                        "name": "org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant",
                         "version": "2.3.4"
                     },
                     "state": "UNINITIALISED",
                     "orderedState": "UNINITIALISED",
-                    "description": "DCAE Control Loop Element for the PMSH instance 1 control loop"
+                    "description": "DCAE automation composition element for the PMSH instance 1 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-e21eb79c6c25": {
                     "id": "709c62b3-8918-41b9-a747-e21eb79c6c25",
                     "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
+                        "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement",
                         "version": "1.2.3"
                     },
                     "participantType": {
-                        "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
+                        "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant",
                         "version": "2.3.1"
                     },
                     "state": "UNINITIALISED",
                     "orderedState": "UNINITIALISED",
-                    "description": "Monitoring Policy Control Loop Element for the PMSH instance 1 control loop"
+                    "description": "Monitoring Policy element for the PMSH instance 1 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-e21eb79c6c26": {
                     "id": "709c62b3-8918-41b9-a747-e21eb79c6c26",
                     "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
+                        "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
                         "version": "1.2.3"
                     },
                     "participantType": {
-                        "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
+                        "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant",
                         "version": "2.3.1"
                     },
                     "state": "UNINITIALISED",
                     "orderedState": "UNINITIALISED",
-                    "description": "Operational Policy Control Loop Element for the PMSH instance 1 control loop"
+                    "description": "Operational Policy element for the PMSH instance 1 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-e21eb79c6c27": {
                     "id": "709c62b3-8918-41b9-a747-e21eb79c6c27",
                     "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement",
+                        "name": "org.onap.domain.pmsh.PMSH_CDS_AutomationCompositionElement",
                         "version": "1.2.3"
                     },
                     "participantType": {
-                        "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant",
+                        "name": "org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant",
                         "version": "2.2.1"
                     },
                     "state": "UNINITIALISED",
                     "orderedState": "UNINITIALISED",
-                    "description": "CDS Control Loop Element for the PMSH instance 1 control loop"
+                    "description": "CDS element for the PMSH instance 1 automation composition"
                 }
             },
             "name": "PMSHInstance1",
             "version": "1.0.1",
-            "description": "PMSH control loop instance 1"
+            "description": "PMSH automation composition instance 1"
         }
     ]
 }
diff --git a/models/src/test/resources/providers/TestParticipant.json b/models/src/test/resources/providers/TestParticipant.json
index 4722ead9b..7e4f9540f 100644
--- a/models/src/test/resources/providers/TestParticipant.json
+++ b/models/src/test/resources/providers/TestParticipant.json
@@ -2,14 +2,14 @@
   "name": "dummy_participant1",
   "version": "1.0.1",
   "definition":{
-    "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
+    "name": "org.onap.domain.pmsh.PMSHAutomationCompositionDefinition",
     "version": "1.0.0"
   },
   "participantState": "PASSIVE",
   "healthStatus": "HEALTHY",
   "description": "A dummy PMSH participant1",
   "participantType":{
-    "name": "org.onap.domain.pmsh.PolicyControlLoopDefinition",
+    "name": "org.onap.domain.pmsh.PolicyAutomationCompositionDefinition",
     "version": "1.0.0"
   }
 }
diff --git a/models/src/test/resources/providers/UpdateControlLoops.json b/models/src/test/resources/providers/UpdateAutomationCompositions.json
index 2d6bd0753..f118ea799 100644
--- a/models/src/test/resources/providers/UpdateControlLoops.json
+++ b/models/src/test/resources/providers/UpdateAutomationCompositions.json
@@ -1,15 +1,15 @@
 {
-    "controlLoopList": [
+    "automationCompositionList": [
         {
             "name": "PMSHInstance0",
             "version": "1.0.1",
             "definition": {
-                "name": "org.onap.domain.pmsh.PMSHControlLoopDefinition",
+                "name": "org.onap.domain.pmsh.PMSHAutomationCompositionDefinition",
                 "version": "1.0.0"
             },
             "state": "RUNNING",
             "orderedState": "RUNNING",
-            "description": "PMSH control loop instance 0",
+            "description": "PMSH automation composition instance 0",
             "elements": {
                 "709c62b3-8918-41b9-a747-d21eb79c6c20": {
                     "id": "709c62b3-8918-41b9-a747-d21eb79c6c20",
@@ -18,54 +18,54 @@
                         "version": "1.2.3"
                     },
                     "participantType": {
-                        "name": "org.onap.dcae.controlloop.DCAEMicroserviceControlLoopParticipant",
+                        "name": "org.onap.dcae.acm.DCAEMicroserviceAutomationCompositionParticipant",
                         "version": "2.3.4"
                     },
                     "state": "RUNNING",
                     "orderedState": "RUNNING",
-                    "description": "DCAE Control Loop Element for the PMSH instance 0 control loop"
+                    "description": "DCAE element for the PMSH instance 0 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-d21eb79c6c21": {
                     "id": "709c62b3-8918-41b9-a747-d21eb79c6c21",
                     "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyControlLoopElement",
+                        "name": "org.onap.domain.pmsh.PMSH_MonitoringPolicyAutomationCompositionElement",
                         "version": "1.2.3"
                     },
                     "participantType": {
-                        "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
+                        "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant",
                         "version": "2.3.1"
                     },
                     "state": "RUNNING",
                     "orderedState": "RUNNING",
-                    "description": "Monitoring Policy Control Loop Element for the PMSH instance 0 control loop"
+                    "description": "Monitoring Policy element for the PMSH instance 0 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-d21eb79c6c22": {
                     "id": "709c62b3-8918-41b9-a747-d21eb79c6c22",
                     "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyControlLoopElement",
+                        "name": "org.onap.domain.pmsh.PMSH_OperationalPolicyAutomationCompositionElement",
                         "version": "2.3.1"
                     },
                     "participantType": {
-                        "name": "org.onap.policy.controlloop.PolicyControlLoopParticipant",
+                        "name": "org.onap.policy.acm.PolicyAutomationCompositionParticipant",
                         "version": "1.0.0"
                     },
                     "state": "RUNNING",
                     "orderedState": "RUNNING",
-                    "description": "Operational Policy Control Loop Element for the PMSH instance 0 control loop"
+                    "description": "Operational Policy element for the PMSH instance 0 automation composition"
                 },
                 "709c62b3-8918-41b9-a747-d21eb79c6c23": {
                     "id": "709c62b3-8918-41b9-a747-d21eb79c6c23",
                     "definition": {
-                        "name": "org.onap.domain.pmsh.PMSH_CDS_ControlLoopElement",
+                        "name": "org.onap.domain.pmsh.PMSH_CDS_AutomationCompositionElement",
                         "version": "1.2.3"
                     },
                     "participantType": {
-                        "name": "org.onap.ccsdk.cds.controlloop.CdsControlLoopParticipant",
+                        "name": "org.onap.ccsdk.cds.acm.CdsAutomationCompositionParticipant",
                         "version": "2.2.1"
                     },
                     "state": "RUNNING",
                     "orderedState": "RUNNING",
-                    "description": "CDS Control Loop Element for the PMSH instance 0 control loop"
+                    "description": "CDS element for the PMSH instance 0 automation composition"
                 }
             }
         }