diff --git a/app-config/openshift/deploymentconfig.yaml b/app-config/openshift/deploymentconfig.yaml
index 887429ac..e96d65a1 100644
--- a/app-config/openshift/deploymentconfig.yaml
+++ b/app-config/openshift/deploymentconfig.yaml
@@ -72,21 +72,21 @@
       apiVersion: apps.openshift.io/v1
       kind: DeploymentConfig
       metadata:
-        name: caimira-app
-        labels: {app: caimira-app}
+        name: expert-app
+        labels: {app: expert-app}
       spec:
         replicas: 1
         template:
           metadata:
             labels:
-              app: caimira-app
+              app: expert-app
           spec:
             containers:
-              - name: caimira-webservice
+              - name: calculator-app
                 env:
                 - name: APP_NAME
                   value: caimira-voila
-                image: '${PROJECT_NAME}/caimira-webservice'
+                image: '${PROJECT_NAME}/calculator-app'
                 ports:
                   - containerPort: 8080
                     protocol: TCP
@@ -113,37 +113,37 @@
           type: Rolling
         test: false
         selector:
-          app: caimira-app
+          app: expert-app
         triggers:
           - type: ConfigChange
           - type: ImageChange
             imageChangeParams:
               automatic: true
               containerNames:
-                - caimira-webservice
+                - calculator-app
               from:
                 kind: ImageStreamTag
-                name: 'caimira-webservice:latest'
+                name: 'calculator-app:latest'
                 namespace: ${PROJECT_NAME}
     -
       apiVersion: apps.openshift.io/v1
       kind: DeploymentConfig
       metadata:
-        name: caimira-co2-app
-        labels: {app: caimira-co2-app}
+        name: expert-co2-app
+        labels: {app: expert-co2-app}
       spec:
         replicas: 1
         template:
           metadata:
             labels:
-              app: caimira-co2-app
+              app: expert-co2-app
           spec:
             containers:
-              - name: caimira-webservice
+              - name: calculator-app
                 env:
                 - name: APP_NAME
                   value: caimira-co2-voila
-                image: '${PROJECT_NAME}/caimira-webservice'
+                image: '${PROJECT_NAME}/calculator-app'
                 ports:
                   - containerPort: 8080
                     protocol: TCP
@@ -170,17 +170,17 @@
           type: Rolling
         test: false
         selector:
-          app: caimira-co2-app
+          app: expert-co2-app
         triggers:
           - type: ConfigChange
           - type: ImageChange
             imageChangeParams:
               automatic: true
               containerNames:
-                - caimira-webservice
+                - calculator-app
               from:
                 kind: ImageStreamTag
-                name: 'caimira-webservice:latest'
+                name: 'calculator-app:latest'
                 namespace: ${PROJECT_NAME}
     -
       apiVersion: apps.openshift.io/v1
@@ -239,19 +239,19 @@
       apiVersion: apps.openshift.io/v1
       kind: DeploymentConfig
       metadata:
-        name: caimira-webservice
+        name: calculator-app
         labels:
-          image: caimira-webservice
-          app: caimira-webservice
+          image: calculator-app
+          app: calculator-app
       spec:
         replicas: 1
         template:
           metadata:
             labels:
-              app: caimira-webservice
+              app: calculator-app
           spec:
             containers:
-              - name: caimira-webservice
+              - name: calculator-app
                 env:
                 - name: COOKIE_SECRET
                   valueFrom:
@@ -261,7 +261,7 @@
                 - name: REPORT_PARALLELISM
                   value: '3'
                 - name: APP_NAME
-                  value: caimira-webservice
+                  value: calculator-app
                 - name: APPLICATION_ROOT
                   value: /
                 - name: CAIMIRA_CALCULATOR_PREFIX
@@ -283,7 +283,7 @@
                     secretKeyRef:
                       key: ARVE_API_KEY
                       name: arve-api
-                image: '${PROJECT_NAME}/caimira-webservice'
+                image: '${PROJECT_NAME}/calculator-app'
                 ports:
                   - containerPort: 8080
                     protocol: TCP
@@ -324,43 +324,43 @@
           type: Rolling
         test: false
         selector:
-          app: caimira-webservice
+          app: calculator-app
         triggers:
           - type: ImageChange
             imageChangeParams:
               automatic: true
               containerNames:
-                - caimira-webservice
+                - calculator-app
               from:
                 kind: ImageStreamTag
-                name: 'caimira-webservice:latest'
+                name: 'calculator-app:latest'
                 namespace: ${PROJECT_NAME}
           - type: ConfigChange
     -
       apiVersion: apps.openshift.io/v1
       kind: DeploymentConfig
       metadata:
-        name: caimira-calculator-open
+        name: calculator-open-app
         labels:
-          image: caimira-webservice
-          app: caimira-calculator-open
+          image: calculator-app
+          app: calculator-open-app
       spec:
         replicas: 1
         template:
           metadata:
             labels:
-              app: caimira-calculator-open
+              app: calculator-open-app
           spec:
             containers:
-              - name: caimira-calculator-open
+              - name: calculator-open-app
                 env:
                 - name: APP_NAME
-                  value: caimira-webservice
+                  value: calculator-app
                 - name: APPLICATION_ROOT
                   value: /
                 - name: CAIMIRA_CALCULATOR_PREFIX
                   value: /calculator-open
-                image: '${PROJECT_NAME}/caimira-webservice'
+                image: '${PROJECT_NAME}/calculator-app'
                 ports:
                   - containerPort: 8080
                     protocol: TCP
@@ -391,17 +391,17 @@
           type: Rolling
         test: false
         selector:
-          app: caimira-calculator-open
+          app: calculator-open-app
         triggers:
           - type: ConfigChange
           - type: ImageChange
             imageChangeParams:
               automatic: true
               containerNames:
-                - caimira-calculator-open
+                - calculator-open-app
               from:
                 kind: ImageStreamTag
-                name: 'caimira-webservice:latest'
+                name: 'calculator-app:latest'
                 namespace: ${PROJECT_NAME}
           - type: ConfigChange
 
diff --git a/app-config/openshift/imagestreams.yaml b/app-config/openshift/imagestreams.yaml
index 86a4780d..9f6ec534 100644
--- a/app-config/openshift/imagestreams.yaml
+++ b/app-config/openshift/imagestreams.yaml
@@ -30,7 +30,7 @@
       kind: ImageStream
       apiVersion: image.openshift.io/v1
       metadata:
-        name: caimira-webservice
+        name: calculator-app
       spec:
         lookupPolicy:
           local: False
diff --git a/app-config/openshift/services.yaml b/app-config/openshift/services.yaml
index 2d01387e..f32ba062 100644
--- a/app-config/openshift/services.yaml
+++ b/app-config/openshift/services.yaml
@@ -32,8 +32,8 @@
       kind: Service
       metadata:
         labels:
-          app: caimira-app
-        name: caimira-app
+          app: expert-app
+        name: expert-app
       spec:
         ports:
           - name: 8080-tcp
@@ -41,7 +41,7 @@
             protocol: TCP
             targetPort: 8080
         selector:
-          deploymentconfig: caimira-app
+          deploymentconfig: expert-app
         sessionAffinity: 'None'
         type: 'ClusterIP'
     -
@@ -49,8 +49,8 @@
       kind: Service
       metadata:
         labels:
-          app: caimira-co2-app
-        name: caimira-co2-app
+          app: expert-co2-app
+        name: expert-co2-app
       spec:
         ports:
           - name: 8080-tcp
@@ -58,7 +58,7 @@
             protocol: TCP
             targetPort: 8080
         selector:
-          deploymentconfig: caimira-co2-app
+          deploymentconfig: expert-co2-app
         sessionAffinity: 'None'
         type: 'ClusterIP'
     -
@@ -83,8 +83,8 @@
       kind: Service
       metadata:
         labels:
-          app: caimira-webservice
-        name: caimira-webservice
+          app: calculator-app
+        name: calculator-app
       spec:
         ports:
           - name: 8080-tcp
@@ -92,7 +92,7 @@
             protocol: TCP
             targetPort: 8080
         selector:
-          deploymentconfig: caimira-webservice
+          deploymentconfig: calculator-app
         sessionAffinity: 'None'
         type: 'ClusterIP'
     -
@@ -100,8 +100,8 @@
       kind: Service
       metadata:
         labels:
-          app: caimira-calculator-open
-        name: caimira-calculator-open
+          app: calculator-open-app
+        name: calculator-open-app
       spec:
         ports:
           - name: 8080-tcp
@@ -109,6 +109,6 @@
             protocol: TCP
             targetPort: 8080
         selector:
-          deploymentconfig: caimira-calculator-open
+          deploymentconfig: calculator-open-app
         sessionAffinity: 'None'
         type: 'ClusterIP'