diff --git a/demo-exporter/.helmignore b/aether-mock-exporter/.helmignore
similarity index 100%
rename from demo-exporter/.helmignore
rename to aether-mock-exporter/.helmignore
diff --git a/demo-exporter/Chart.yaml b/aether-mock-exporter/Chart.yaml
similarity index 81%
rename from demo-exporter/Chart.yaml
rename to aether-mock-exporter/Chart.yaml
index 4d53ba5..66d7f9e 100644
--- a/demo-exporter/Chart.yaml
+++ b/aether-mock-exporter/Chart.yaml
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
-name: demo-exporter
-description: Aether ROC Demo Exporter
+name: aether-mock-exporter
+description: Aether ROC Mock Exporter
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.1.1
+version: 0.2.0
 appVersion: v0.0.0
 keywords:
   - aether
diff --git a/demo-exporter/README.md b/aether-mock-exporter/README.md
similarity index 100%
rename from demo-exporter/README.md
rename to aether-mock-exporter/README.md
diff --git a/demo-exporter/files/certs/README.md b/aether-mock-exporter/files/certs/README.md
similarity index 100%
rename from demo-exporter/files/certs/README.md
rename to aether-mock-exporter/files/certs/README.md
diff --git a/demo-exporter/files/certs/tls.cacert b/aether-mock-exporter/files/certs/tls.cacert
similarity index 100%
rename from demo-exporter/files/certs/tls.cacert
rename to aether-mock-exporter/files/certs/tls.cacert
diff --git a/demo-exporter/files/certs/tls.crt b/aether-mock-exporter/files/certs/tls.crt
similarity index 100%
rename from demo-exporter/files/certs/tls.crt
rename to aether-mock-exporter/files/certs/tls.crt
diff --git a/demo-exporter/files/certs/tls.key b/aether-mock-exporter/files/certs/tls.key
similarity index 100%
rename from demo-exporter/files/certs/tls.key
rename to aether-mock-exporter/files/certs/tls.key
diff --git a/demo-exporter/templates/_helpers.tpl b/aether-mock-exporter/templates/_helpers.tpl
similarity index 100%
rename from demo-exporter/templates/_helpers.tpl
rename to aether-mock-exporter/templates/_helpers.tpl
diff --git a/demo-exporter/templates/deployment.yaml b/aether-mock-exporter/templates/deployment.yaml
similarity index 97%
rename from demo-exporter/templates/deployment.yaml
rename to aether-mock-exporter/templates/deployment.yaml
index cb51907..06e6ab3 100644
--- a/demo-exporter/templates/deployment.yaml
+++ b/aether-mock-exporter/templates/deployment.yaml
@@ -44,7 +44,7 @@
                 fieldRef:
                   fieldPath: spec.nodeName
           args:
-            - "/usr/local/bin/sdcore-exporter"
+            - "/usr/local/bin/aether-mock-exporter"
           ports:
             - name: metrics
               containerPort: 2112
diff --git a/demo-exporter/templates/secret.yaml b/aether-mock-exporter/templates/secret.yaml
similarity index 100%
rename from demo-exporter/templates/secret.yaml
rename to aether-mock-exporter/templates/secret.yaml
diff --git a/demo-exporter/templates/service.yaml b/aether-mock-exporter/templates/service.yaml
similarity index 100%
rename from demo-exporter/templates/service.yaml
rename to aether-mock-exporter/templates/service.yaml
diff --git a/demo-exporter/values.yaml b/aether-mock-exporter/values.yaml
similarity index 72%
rename from demo-exporter/values.yaml
rename to aether-mock-exporter/values.yaml
index 692c105..2f873f8 100644
--- a/demo-exporter/values.yaml
+++ b/aether-mock-exporter/values.yaml
@@ -3,14 +3,14 @@
 # SPDX-License-Identifier: Apache-2.0
 
 nameOverride: ""
-fullnameOverride: "demo-exporter"
+fullnameOverride: "aether-mock-exporter"
 
 replicaCount: 1
 annotations: {}
 
 image:
-  repository: onosproject/sdcore-adapter
-  tag: v0.2.12
+  repository: onosproject/aether-mock-exporter
+  tag: v0.4.0
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 332b8ed..8349ca4 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 2.1.13
+version: 2.1.14
 appVersion: v0.0.0
 keywords:
   - aether
@@ -94,7 +94,7 @@
     repository: "file://../prom-label-proxy"
     version: 0.1.2
     alias: prom-label-proxy-acc
-  - name: demo-exporter
-    condition: import.demo-exporter.enabled
-    repository: "file://../demo-exporter"
-    version: 0.1.1
+  - name: aether-mock-exporter
+    condition: import.aether-mock-exporter.enabled
+    repository: "file://../aether-mock-exporter"
+    version: 0.2.0
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index ed2a3db..eb19513 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -69,7 +69,7 @@
       enabled: true
     amp:
       enabled: true
-  demo-exporter:
+  aether-mock-exporter:
     enabled: true
 
 # ONOS-TOPO
@@ -302,11 +302,11 @@
                summary: 'VCS {{ $labels.vcs_id }} jitter high'
     prometheus.yml:
       scrape_configs:
-        - job_name: demo-exporter
+        - job_name: aether-mock-exporter
           scrape_interval: 2s
           static_configs:
             - targets:
-                - demo-exporter:2112
+                - aether-mock-exporter:2112
 
 prometheus-amp:
   pushgateway:
@@ -320,11 +320,11 @@
   serverFiles:
     prometheus.yml:
       scrape_configs:
-        - job_name: demo-exporter
+        - job_name: aether-mock-exporter
           scrape_interval: 2s
           static_configs:
             - targets:
-                - demo-exporter:2112
+                - aether-mock-exporter:2112
 
 prometheus-ace:
   pushgateway:
@@ -338,11 +338,11 @@
   serverFiles:
     prometheus.yml:
       scrape_configs:
-        - job_name: demo-exporter
+        - job_name: aether-mock-exporter
           scrape_interval: 2s
           static_configs:
             - targets:
-                - demo-exporter:2112
+                - aether-mock-exporter:2112
         - job_name: kube-state-metrics
           scrape_interval: 2s
           static_configs: