47 files changed, 52 insertions, 52 deletions

diff --git a/controlloop/common/controller-casablanca/.gitignore b/controlloop/common/controller-casablanca/.gitignore
deleted file mode 100644
index f4e96567c..000000000
--- a/controlloop/common/controller-casablanca/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src/main/resources/casablanca.drl
diff --git a/controlloop/common/controller-usecases/.gitignore b/controlloop/common/controller-usecases/.gitignore
new file mode 100644
index 000000000..3281b4569
--- /dev/null
+++ b/controlloop/common/controller-usecases/.gitignore
@@ -0,0 +1 @@
+src/main/resources/usecases.drl
diff --git a/controlloop/common/controller-casablanca/pom.xml b/controlloop/common/controller-usecases/pom.xml
index bd724ba4d..29fd55572 100644
--- a/controlloop/common/controller-casablanca/pom.xml
+++ b/controlloop/common/controller-usecases/pom.xml
@@ -28,11 +28,11 @@
         <version>1.4.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>controller-casablanca</artifactId>
+    <artifactId>controller-usecases</artifactId>
     <packaging>kjar</packaging>
 
     <name>${project.artifactId}</name>
-    <description>Casablanca Experimental Controller</description>
+    <description>Usecases Experimental Controller</description>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -60,9 +60,9 @@
                         </goals>
                         <configuration>
                             <sourceFile>
-                                ../../templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+                                ../../templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
                             </sourceFile>
-                            <destinationFile>src/main/resources/casablanca.drl</destinationFile>
+                            <destinationFile>src/main/resources/usecases.drl</destinationFile>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/controlloop/common/controller-casablanca/src/main/resources/META-INF/kmodule.xml b/controlloop/common/controller-usecases/src/main/resources/META-INF/kmodule.xml
index f46ff75a0..9ca418668 100644
--- a/controlloop/common/controller-casablanca/src/main/resources/META-INF/kmodule.xml
+++ b/controlloop/common/controller-usecases/src/main/resources/META-INF/kmodule.xml
@@ -20,6 +20,6 @@
   -->
 <kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule">
     <kbase name="onap.policies.controlloop.Operational">
-        <ksession name="casablanca"/>
+        <ksession name="usecases"/>
     </kbase>
 </kmodule>
diff --git a/controlloop/common/feature-controlloop-casablanca/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI b/controlloop/common/feature-controlloop-casablanca/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI
deleted file mode 100644
index 5252ca115..000000000
--- a/controlloop/common/feature-controlloop-casablanca/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI
+++ /dev/null
@@ -1 +0,0 @@
-org.onap.policy.drools.apps.controlloop.feature.casablanca.CasablancaFeature
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-casablanca b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-usecases
index b1924d54f..5662e7c92 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-casablanca
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-usecases
@@ -25,14 +25,14 @@
 
 source "${POLICY_HOME}"/etc/build.info
 
-echo "Control Loop CLI Generator for R2 Casablanca Release"
-echo "---------------------------------------------------"
+echo "Control Loop CLI Generator for R2 the ONAP Usecases Demo"
+echo "--------------------------------------------------------"
 echo
 
-GROUP_ID="org.onap.policy.rules.casablanca"
-ARTIFACT_ID="casablanca"
+GROUP_ID="org.onap.policy.rules.usecases"
+ARTIFACT_ID="usecases"
 VERSION="${version:-1.3.4}"
-PACKAGE="org.onap.policy.rules.casablanca"
+PACKAGE="org.onap.policy.rules.usecases"
 
 # vCPE Policy Parameters
 VCPE_CONTROL_LOOP_NAME="ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e"
@@ -68,7 +68,7 @@ pe%3A+Reroute%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A
 ure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
 
 # Generic Scope and Version
-POLICY_SCOPE="casablanca"
+POLICY_SCOPE="usecases"
 POLICY_VERSION="v0.0.1"
 
 BRMSGW_TOPIC="BRMSGW-POLICY"
@@ -233,7 +233,7 @@ if [ ! -w "${DIR_TMP}" ]; then
 fi
 
 ARCHETYPE_GROUP_ID="org.onap.policy.drools-applications.controlloop.templates"
-ARCHETYPE_ARTIFACT_ID="archetype-cl-casablanca"
+ARCHETYPE_ARTIFACT_ID="archetype-cl-usecases"
 ARCHETYPE_VERSION="${VERSION}"
 
 if [ -d "${DIR_TMP}/${ARTIFACT_ID}/" ]; then
@@ -353,7 +353,7 @@ echo "1. copy ${DIR_TMP}/${ARTIFACT_ID}/${ARTIFACT_ID}-controller.properties und
 echo "   and restart the pdp-d (policy stop; policy start)"
 echo "2. cd ${DIR_TMP}/${ARTIFACT_ID}/; rest-add-controller ${ARTIFACT_ID}"
 echo 
-echo "Once this Control Loop is deployed, you can run the push-policies-casablanca script"
+echo "Once this Control Loop is deployed, you can run the push-policies-usecases script"
 echo "to automatically insert the policies for all use cases supported in this release"
 echo
 )
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-casablanca b/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-usecases
index 2289aea1f..dc64c3ece 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-casablanca
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-usecases
@@ -142,4 +142,4 @@ echo "Policy insertions completed."
 echo
 
 echo "The working memory is now: "
-curl -k --silent --user @1b3rt:31nst31n -X GET https://localhost:9696/policy/pdp/engine/controllers/${CONTROLLER_NAME}/drools/facts/casablanca | python -m json.tool
+curl -k --silent --user @1b3rt:31nst31n -X GET https://localhost:9696/policy/pdp/engine/controllers/${CONTROLLER_NAME}/drools/facts/usecases | python -m json.tool
diff --git a/controlloop/common/feature-controlloop-casablanca/pom.xml b/controlloop/common/feature-controlloop-usecases/pom.xml
index a72a44d58..ad876d7b8 100644
--- a/controlloop/common/feature-controlloop-casablanca/pom.xml
+++ b/controlloop/common/feature-controlloop-usecases/pom.xml
@@ -27,10 +27,10 @@
         <version>1.4.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>feature-controlloop-casablanca</artifactId>
+    <artifactId>feature-controlloop-usecases</artifactId>
 
     <description>
-        Load Experimental Casablanca Control Loop Use Cases Controller as a feature.
+        Load Experimental Usecases Control Loop Use Cases Controller as a feature.
     </description>
 
     <properties>
@@ -97,7 +97,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-            <artifactId>controller-casablanca</artifactId>
+            <artifactId>controller-usecases</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml b/controlloop/common/feature-controlloop-usecases/src/assembly/assemble_zip.xml
index 9bee6bcd2..c284ede07 100644
--- a/controlloop/common/feature-controlloop-casablanca/src/assembly/assemble_zip.xml
+++ b/controlloop/common/feature-controlloop-usecases/src/assembly/assemble_zip.xml
@@ -24,7 +24,7 @@
 	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>feature-controlloop-casablanca-package</id>
+	<id>feature-controlloop-usecases-package</id>
 	<formats>
 		<format>zip</format>
 	</formats>
@@ -36,14 +36,14 @@
 			<directory>target</directory>
 			<outputDirectory>lib/feature</outputDirectory>
 			<includes>
-				<include>feature-controlloop-casablanca-${project.version}.jar</include>
+				<include>feature-controlloop-usecases-${project.version}.jar</include>
 			</includes>
 		</fileSet>
 		<fileSet>
 			<directory>target/assembly/lib</directory>
 			<outputDirectory>artifacts</outputDirectory>
 			<includes>
-				<include>controller-casablanca-${project.version}.jar</include>
+				<include>controller-usecases-${project.version}.jar</include>
 			</includes>
 		</fileSet>
 		<fileSet>
@@ -53,7 +53,7 @@
 				<include>*.jar</include>
 			</includes>
 			<excludes>
-				<exclude>controller-casablanca-${project.version}.jar</exclude>
+				<exclude>controller-usecases-${project.version}.jar</exclude>
 			</excludes>
 		</fileSet>
 		<fileSet>
diff --git a/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/logback-include-casablanca.xml b/controlloop/common/feature-controlloop-usecases/src/main/feature/config/logback-include-usecases.xml
index 292da7d27..46f2f0c4f 100644
--- a/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/logback-include-casablanca.xml
+++ b/controlloop/common/feature-controlloop-usecases/src/main/feature/config/logback-include-usecases.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  feature-controlloop-casablanca
+  feature-controlloop-usecases
   ================================================================================
   Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
   ================================================================================
@@ -28,14 +28,14 @@
 <included>
 
     <property name="logDir" value="${POLICY_LOGS}" />
-    <property name="casablancaLog" value="casablanca-network" />
+    <property name="usecasesLog" value="usecases-network" />
     <property name="networkPattern" value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" />
 
-    <!-- Casablanca Network Logging Properties -->
-    <appender name="CasablancaOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${logDir}/${casablancaLog}.log</file>
+    <!-- Usecases Network Logging Properties -->
+    <appender name="UsecasesOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDir}/${usecasesLog}.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logDir}/${casablancaLog}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
+            <fileNamePattern>${logDir}/${usecasesLog}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
             <maxFileSize>50MB</maxFileSize>
             <maxHistory>30</maxHistory>
             <totalSizeCap>10GB</totalSizeCap>
@@ -45,12 +45,12 @@
         </encoder>
     </appender>
 
-    <appender name="AsyncCasablancaOut" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="CasablancaOut" />
+    <appender name="AsyncUsecasesOut" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="UsecasesOut" />
     </appender>
 
-    <logger name="casablanca" level="INFO" additivity="false">
-        <appender-ref ref="AsyncCasablancaOut" />
+    <logger name="usecases" level="INFO" additivity="false">
+        <appender-ref ref="AsyncUsecasesOut" />
     </logger>
 
 </included>
\ No newline at end of file
diff --git a/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties b/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties
index 517096232..054be3cb6 100644
--- a/controlloop/common/feature-controlloop-casablanca/src/main/feature/config/casablanca-controller.properties
+++ b/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties
@@ -18,7 +18,7 @@
 # ============LICENSE_END=========================================================
 ###
 
-controller.name=casablanca
+controller.name=usecases
 
 dmaap.source.topics=${env:PDPD_CONFIGURATION_TOPIC},${env:DCAE_TOPIC},APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP
 
@@ -66,7 +66,7 @@ dmaap.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.u
 dmaap.sink.topics.POLICY-CL-MGT.https=true
 
 rules.groupId=${project.groupId}
-rules.artifactId=controller-casablanca
+rules.artifactId=controller-usecases
 rules.version=${project.version}
 
 dmaap.sink.topics.SDNR-CL.servers=${env:DMAAP_SERVERS}
diff --git a/controlloop/common/feature-controlloop-casablanca/src/main/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeature.java b/controlloop/common/feature-controlloop-usecases/src/main/java/org/onap/policy/drools/apps/controlloop/feature/usecases/UsecasesFeature.java
index 3904bbd05..94ef749e6 100644
--- a/controlloop/common/feature-controlloop-casablanca/src/main/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeature.java
+++ b/controlloop/common/feature-controlloop-usecases/src/main/java/org/onap/policy/drools/apps/controlloop/feature/usecases/UsecasesFeature.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.drools.apps.controlloop.feature.casablanca;
+package org.onap.policy.drools.apps.controlloop.feature.usecases;
 
 import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
 
 /**
- * Casablanca installation as a feature saves time
- * loading the Casablanca controller at runtime over the
+ * Usecases installation as a feature saves time
+ * loading the Usecases controller at runtime over the
  * usual installation from nexus.  It also reduces
  * potential for errors in the pom.xml generated in
  * the brmsgw side.
@@ -36,7 +36,7 @@ import org.onap.policy.drools.features.PolicyEngineFeatureAPI;
  * functionality
  *
  */
-public class CasablancaFeature implements PolicyEngineFeatureAPI {
+public class UsecasesFeature implements PolicyEngineFeatureAPI {
 
     public static final int SEQNO = 1000;
 
diff --git a/controlloop/common/feature-controlloop-usecases/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI b/controlloop/common/feature-controlloop-usecases/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI
new file mode 100644
index 000000000..3a8263942
--- /dev/null
+++ b/controlloop/common/feature-controlloop-usecases/src/main/resources/META-INF/services/org.onap.policy.drools.features.PolicyEngineFeatureAPI
@@ -0,0 +1 @@
+org.onap.policy.drools.apps.controlloop.feature.usecases.UsecasesFeature
diff --git a/controlloop/common/feature-controlloop-casablanca/src/test/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeatureTest.java b/controlloop/common/feature-controlloop-usecases/src/test/java/org/onap/policy/drools/apps/controlloop/feature/usecases/UsecasesFeatureTest.java
index e7629a8f2..ed1bba23d 100644
--- a/controlloop/common/feature-controlloop-casablanca/src/test/java/org/onap/policy/drools/apps/controlloop/feature/casablanca/CasablancaFeatureTest.java
+++ b/controlloop/common/feature-controlloop-usecases/src/test/java/org/onap/policy/drools/apps/controlloop/feature/usecases/UsecasesFeatureTest.java
@@ -18,14 +18,14 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.policy.drools.apps.controlloop.feature.casablanca;
+package org.onap.policy.drools.apps.controlloop.feature.usecases;
 
 import static org.junit.Assert.assertEquals;
 
-public class CasablancaFeatureTest {
+public class UsecasesFeatureTest {
 
     @org.junit.Test
     public void getSequenceNumber() {
-        assertEquals(CasablancaFeature.SEQNO, new CasablancaFeature().getSequenceNumber());
+        assertEquals(UsecasesFeature.SEQNO, new UsecasesFeature().getSequenceNumber());
     }
 }
diff --git a/controlloop/common/pom.xml b/controlloop/common/pom.xml
index bab8de9d5..020a1efbc 100644
--- a/controlloop/common/pom.xml
+++ b/controlloop/common/pom.xml
@@ -39,12 +39,12 @@
     <module>model-impl</module>
     <module>policy-yaml</module>
     <module>simulators</module>
-    <module>controller-casablanca</module>
+    <module>controller-usecases</module>
     <module>feature-controlloop-utils</module>
     <module>feature-controlloop-trans</module>
     <module>feature-controlloop-management</module>
     <module>feature-controlloop-amsterdam</module>
-    <module>feature-controlloop-casablanca</module>
+    <module>feature-controlloop-usecases</module>
   </modules>
 
 
diff --git a/controlloop/packages/apps-controlloop/pom.xml b/controlloop/packages/apps-controlloop/pom.xml
index 22f67646e..670e0343c 100644
--- a/controlloop/packages/apps-controlloop/pom.xml
+++ b/controlloop/packages/apps-controlloop/pom.xml
@@ -95,7 +95,7 @@
     </dependency>
     <dependency>
       <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-      <artifactId>feature-controlloop-casablanca</artifactId>
+      <artifactId>feature-controlloop-usecases</artifactId>
       <version>${project.version}</version>
       <type>zip</type>
     </dependency>
diff --git a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
index 0e65d644c..1f0527e44 100644
--- a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
+++ b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
@@ -25,10 +25,10 @@ RUN . ${POLICY_HOME}/etc/profile.d/env.sh && \
         -DgroupId=org.onap.policy.drools-applications.controlloop.common -Dversion=${BUILD_VERSION_APP_CL} && \
     ${POLICY_HOME}/bin/features install healthcheck distributed-locking && \
     ${POLICY_HOME}/bin/features install controlloop-utils controlloop-trans controlloop-management && \
-    ${POLICY_HOME}/bin/features install controlloop-amsterdam controlloop-casablanca && \
+    ${POLICY_HOME}/bin/features install controlloop-amsterdam controlloop-usecases && \
     ${POLICY_HOME}/bin/features enable healthcheck distributed-locking && \
     ${POLICY_HOME}/bin/features enable controlloop-trans controlloop-management && \
-    ${POLICY_HOME}/bin/features enable controlloop-amsterdam controlloop-casablanca && \
+    ${POLICY_HOME}/bin/features enable controlloop-amsterdam controlloop-usecases && \
     rm ${POLICY_INSTALL}/*.zip ${POLICY_INSTALL}/*.gz 2> /dev/null
 
 ENTRYPOINT ["/opt/app/policy/bin/docker-entrypoint.sh"]
diff --git a/controlloop/templates/archetype-cl-casablanca/pom.xml b/controlloop/templates/archetype-cl-usecases/pom.xml
index 9328b9502..40963c48d 100644
--- a/controlloop/templates/archetype-cl-casablanca/pom.xml
+++ b/controlloop/templates/archetype-cl-usecases/pom.xml
@@ -29,10 +29,10 @@
     <version>1.4.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>archetype-cl-casablanca</artifactId>
+  <artifactId>archetype-cl-usecases</artifactId>
 
   <name>${project.artifactId}</name>
-  <description>Archetype to generate a yaml based control loop for ONAP Casablanca release</description>
+  <description>Archetype to generate a yaml based control loop for ONAP Usecases release</description>
 
   <build>
     <extensions>
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/META-INF/maven/archetype-metadata.xml b/controlloop/templates/archetype-cl-usecases/src/main/resources/META-INF/maven/archetype-metadata.xml
index 18151b58d..18151b58d 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/pom.xml
index 9126edb98..e4629803a 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/pom.xml
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/pom.xml
@@ -29,7 +29,7 @@
   <packaging>kjar</packaging>
 
   <name>${artifactId}</name>
-  <description>Control Loop Casablanca Release Rules</description>
+  <description>Control Loop Usecases Release Rules</description>
 
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/CCVPN.yaml b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/CCVPN.yaml
index b5b37b0eb..b5b37b0eb 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/CCVPN.yaml
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/CCVPN.yaml
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml
index 03001520b..03001520b 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/VoLTE.yaml
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
index fb516ed13..fb516ed13 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json
index b5dc418f0..b5dc418f0 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.rest.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/appc.lcm.success.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/appc.lcm.success.json
index 985685000..985685000 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/appc.lcm.success.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/appc.lcm.success.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json
index 2c6570d03..2c6570d03 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/appc.legacy.success.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/ccvpn.brmsgw.params.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/ccvpn.brmsgw.params.json
index 5feeecd9e..5feeecd9e 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/ccvpn.brmsgw.params.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/ccvpn.brmsgw.params.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.ccvpn.onset.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.ccvpn.onset.json
index 474911e74..474911e74 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.ccvpn.onset.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.ccvpn.onset.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json
index d4cbc0e89..d4cbc0e89 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json
index df7ae6166..df7ae6166 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json
index 1465893d9..1465893d9 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json
index b135e9193..b135e9193 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json
index f17a1ea0f..f17a1ea0f 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/so.success.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/so.success.json
index 8f3387e4d..8f3387e4d 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/so.success.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/so.success.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vCPE.yaml b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vCPE.yaml
index 2838b6127..2838b6127 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vCPE.yaml
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vCPE.yaml
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vDNS.yaml b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vDNS.yaml
index ff5c08900..ff5c08900 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vDNS.yaml
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vDNS.yaml
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vFW.yaml b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vFW.yaml
index dcbdf5459..dcbdf5459 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vFW.yaml
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vFW.yaml
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vPCI.pcims.onset.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vPCI.pcims.onset.json
index 0e67d3251..0e67d3251 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vPCI.pcims.onset.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vPCI.pcims.onset.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vPCI.sdnr.success.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vPCI.sdnr.success.json
index 74d7f60bb..74d7f60bb 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vPCI.sdnr.success.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vPCI.sdnr.success.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json
index 6b0ebd227..6b0ebd227 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vcpe.brmsgw.params.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json
index 744723c87..744723c87 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vdns.brmsgw.params.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json
index 353c19c59..353c19c59 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/vfw.brmsgw.params.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json
index c20b25adc..c20b25adc 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/volte.brmsgw.params.json
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml
index d30e3c525..7e16cc5b7 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/resources/META-INF/kmodule.xml
@@ -24,6 +24,6 @@
 
 <kmodule xmlns="http://jboss.org/kie/6.0.0/kmodule">
     <kbase name="rules">
-        <ksession name="casablanca"/>
+        <ksession name="usecases"/>
     </kbase>
 </kmodule>
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
index b0262f989..b0262f989 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
diff --git a/controlloop/templates/archetype-cl-casablanca/src/test/resources/projects/basic/archetype.properties b/controlloop/templates/archetype-cl-usecases/src/test/resources/projects/basic/archetype.properties
index 8cc10c97c..8cc10c97c 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/test/resources/projects/basic/archetype.properties
+++ b/controlloop/templates/archetype-cl-usecases/src/test/resources/projects/basic/archetype.properties
diff --git a/controlloop/templates/pom.xml b/controlloop/templates/pom.xml
index 3bd3f6f58..b40f1287b 100644
--- a/controlloop/templates/pom.xml
+++ b/controlloop/templates/pom.xml
@@ -35,7 +35,7 @@
     <module>template.demo</module>
     <module>template.demo.clc</module>
     <module>archetype-cl-amsterdam</module>
-    <module>archetype-cl-casablanca</module>
+    <module>archetype-cl-usecases</module>
   </modules>