diff --git a/chronos-exporter/Chart.yaml b/chronos-exporter/Chart.yaml
index 2cbf997..081f3c7 100644
--- a/chronos-exporter/Chart.yaml
+++ b/chronos-exporter/Chart.yaml
@@ -7,8 +7,8 @@
 description: Chronos Exporter
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.0.17
-appVersion: v0.0.14
+version: 0.0.18
+appVersion: v0.0.16
 keywords:
   - aether
   - exporter
diff --git a/chronos-exporter/files/configs/demo-configuration.yaml b/chronos-exporter/files/configs/demo-configuration.yaml
index 39758e6..de64f1e 100644
--- a/chronos-exporter/files/configs/demo-configuration.yaml
+++ b/chronos-exporter/files/configs/demo-configuration.yaml
@@ -6,43 +6,43 @@
   display-name: Tesla
   image: /chronos-exporter/images/tesla-logo.png
 sites:
-  - site-id: freemont
-    display-name: Freemont, CA
+  - site-id: fremont
+    display-name: Fremont, CA
     image: /chronos-exporter/images/los-angeles-us.png
     small-cells:
-      - small-cell-id: freemont-sc-north
+      - small-cell-id: fremont-sc-north
         display-name: North Cell
         position:
           position-x: 100
           position-y: 50
           site-plan: floor-0
-      - small-cell-id: freemont-sc-south
+      - small-cell-id: fremont-sc-south
         display-name: South Cell
         position:
           position-x: 100
           position-y: 150
           site-plan: floor-1
-      - small-cell-id: freemont-sc-east
+      - small-cell-id: fremont-sc-east
         display-name: East Cell
         position:
           position-x: 200
           position-y: 100
           site-plan: floor-2
-      - small-cell-id: freemont-sc-west
+      - small-cell-id: fremont-sc-west
         display-name: West Cell
         position:
           position-x: 10
           position-y: 100
           site-plan: floor-0
     slices:
-      - slice-id: freemont-slice-cameras
+      - slice-id: fremont-slice-cameras
         display-name: Cameras Slice
         device-groups:
           - cameras
         applications:
           - nvr-application
           - occupant-counter
-      - slice-id: freemont-slice-phones
+      - slice-id: fremont-slice-phones
         display-name: Phones Slice
         device-groups:
           - phones
@@ -174,25 +174,25 @@
         - layer-id: Text
       site-plan-list:
         - id: floor-0
-          svg-file: /chronos-exporter/site-plans/freemont/floor-0.svg
+          svg-file: /chronos-exporter/site-plans/fremont/floor-0.svg
           offsets:
             x-offset: 0
             y-offset: 0
             z-offset: 0
         - id: floor-1
-          svg-file: /chronos-exporter/site-plans/freemont/floor-1.svg
+          svg-file: /chronos-exporter/site-plans/fremont/floor-1.svg
           offsets:
             x-offset: 0
             y-offset: 0
             z-offset: 100
         - id: floor-2
-          svg-file: /chronos-exporter/site-plans/freemont/floor-2.svg
+          svg-file: /chronos-exporter/site-plans/fremont/floor-2.svg
           offsets:
             x-offset: 0
             y-offset: 0
             z-offset: 200
         - id: floor-3
-          svg-file: /chronos-exporter/site-plans/freemont/floor-3.svg
+          svg-file: /chronos-exporter/site-plans/fremont/floor-3.svg
           offsets:
             x-offset: 0
             y-offset: 0
diff --git a/chronos-exporter/files/site-plans/freemont/floor-0.svg b/chronos-exporter/files/site-plans/fremont/floor-0.svg
similarity index 100%
rename from chronos-exporter/files/site-plans/freemont/floor-0.svg
rename to chronos-exporter/files/site-plans/fremont/floor-0.svg
diff --git a/chronos-exporter/files/site-plans/freemont/floor-1.svg b/chronos-exporter/files/site-plans/fremont/floor-1.svg
similarity index 98%
rename from chronos-exporter/files/site-plans/freemont/floor-1.svg
rename to chronos-exporter/files/site-plans/fremont/floor-1.svg
index 754d428..66b56f1 100644
--- a/chronos-exporter/files/site-plans/freemont/floor-1.svg
+++ b/chronos-exporter/files/site-plans/fremont/floor-1.svg
@@ -112,7 +112,7 @@
        x="264.58334"
        y="9.5" />
     <rect
-       y="106.5"
+       y="9.5"
        x="238.12512"
        height="68.791664"
        width="26.45833"
@@ -147,7 +147,7 @@
        id="text4574"><tspan
          sodipodi:role="line"
          id="tspan4572"
-         x="57.558613"
+         x="37.558613"
          y="143.16763"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.81944466px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332">Office 1A</tspan></text>
     <text
@@ -203,7 +203,7 @@
        xml:space="preserve"><tspan
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.81944466px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
          y="140.54936"
-         x="205.6776"
+         x="185.6776"
          id="tspan4643"
          sodipodi:role="line">Office 1C</tspan></text>
     <text
@@ -215,11 +215,11 @@
        id="text4649"><tspan
          sodipodi:role="line"
          id="tspan4647"
-         x="140.59502"
+         x="130.59502"
          y="132.69456"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.81944466px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332">Copier</tspan><tspan
          sodipodi:role="line"
-         x="140.59502"
+         x="130.59502"
          y="145.92374"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.81944466px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
          id="tspan4651">Room</tspan></text>
@@ -232,7 +232,7 @@
          style="stroke-width:0.26458332"
          sodipodi:role="line"
          id="tspan1340"
-         x="207.48129"
+         x="197.48129"
          y="185.43088">Lifts</tspan></text>
     <text
        xml:space="preserve"
@@ -243,7 +243,7 @@
          style="stroke-width:0.26458332"
          sodipodi:role="line"
          id="tspan1360"
-         x="260.4614"
+         x="250.4614"
          y="185.50815">Stairs</tspan></text>
   </g>
 </svg>
diff --git a/chronos-exporter/files/site-plans/freemont/floor-2.svg b/chronos-exporter/files/site-plans/fremont/floor-2.svg
similarity index 100%
rename from chronos-exporter/files/site-plans/freemont/floor-2.svg
rename to chronos-exporter/files/site-plans/fremont/floor-2.svg
diff --git a/chronos-exporter/files/site-plans/freemont/floor-3.svg b/chronos-exporter/files/site-plans/fremont/floor-3.svg
similarity index 100%
rename from chronos-exporter/files/site-plans/freemont/floor-3.svg
rename to chronos-exporter/files/site-plans/fremont/floor-3.svg
diff --git a/chronos-exporter/templates/configmap.yaml b/chronos-exporter/templates/configmap.yaml
index bdf31cd..393926f 100644
--- a/chronos-exporter/templates/configmap.yaml
+++ b/chronos-exporter/templates/configmap.yaml
@@ -44,7 +44,7 @@
     heritage: "{{ .Release.Service }}"
 binaryData:
   {{ $root := . }}
-  {{ range $path, $bytes := .Files.Glob "files/site-plans/freemont/*.svg" }}
+  {{ range $path, $bytes := .Files.Glob "files/site-plans/fremont/*.svg" }}
   {{ base $path }}: '{{ $root.Files.Get $path | b64enc }}'
   {{ end }}
 
diff --git a/chronos-exporter/templates/deployment.yaml b/chronos-exporter/templates/deployment.yaml
index da871e8..bfe6ae5 100644
--- a/chronos-exporter/templates/deployment.yaml
+++ b/chronos-exporter/templates/deployment.yaml
@@ -70,7 +70,7 @@
               mountPath: /opt/images
               readOnly: true
             - name: exporter-site-plans
-              mountPath: /opt/site-plans/freemont
+              mountPath: /opt/site-plans/fremont
               readOnly: true
       volumes:
         - name: secret
diff --git a/chronos-exporter/values.yaml b/chronos-exporter/values.yaml
index 3a57f73..c9e1c7d 100644
--- a/chronos-exporter/values.yaml
+++ b/chronos-exporter/values.yaml
@@ -10,7 +10,7 @@
 
 image:
   repository: onosproject/chronos-exporter
-  tag: v0.0.14
+  tag: v0.0.16
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/chronos-umbrella/Chart.yaml b/chronos-umbrella/Chart.yaml
index 7c1744b..e693979 100644
--- a/chronos-umbrella/Chart.yaml
+++ b/chronos-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Chronos Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 0.1.19
+version: 0.1.20
 appVersion: v0.0.0
 keywords:
   - aether
@@ -29,7 +29,7 @@
   - name: chronos-exporter
     condition: import.chronos-exporter.enabled
     repository: "file://../chronos-exporter"
-    version: 0.0.17
+    version: 0.0.18
   - name: aether-enterprise-portal
     condition: import.aether-enterprise-portal.enabled
     repository: "file://../aether-enterprise-portal"