diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
index 0c22014c8e0..9ee2e75c89c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/geo-dashboard.hbs
@@ -710,9 +710,9 @@
                     createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/stationery_alert.html',
                                           'Add Stationary Alert', 'glyphicon glyphicon-link', geoToolsMenu);
                     createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/within_alert.html',
-                                          'Add Geo Fence Enter Alert', 'glyphicon glyphicon-log-in', geoToolsMenu);
+                                          'Add Geofence Alert', 'glyphicon glyphicon-log-in', geoToolsMenu);
                     createGeoToolListItem(geoPublicUri + '/assets/html_templates/modal/exit_alert.html',
-                                          'Add Geo Fence Exit Alert', 'glyphicon glyphicon-log-out', geoToolsMenu);
+                                          'Add Geofence Exit Alert', 'glyphicon glyphicon-log-out', geoToolsMenu);
                 {{/if}}
             }
         });
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html
index 8a9c9ea78c8..76fd5489342 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/exit_alert.html
@@ -24,7 +24,7 @@
                     </thead>
                     <tbody>
                     <div class="alert alert-info fence-not-exist" role="alert">
-                        <strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again.
+                        <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
                     </div>
 
                     </tbody>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
index 37b617e58d5..fce178aa2a8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/stationery_alert.html
@@ -56,7 +56,7 @@
                     </thead>
                     <tbody>
                     <div class="alert alert-info fence-not-exist" role="alert">
-                        <strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again.
+                        <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
                     </div>
                     </tbody>
                 </table>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html
index af1a9421c48..cf35da242c7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/traffic_point.html
@@ -75,7 +75,7 @@
                 else{
                 %>
                 <div class="alert alert-danger" role="alert">
-                      <strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again.
+                      <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
                 </div>
                 <%
                 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html
index 6055a124523..91e5210bc99 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-dashboard/public/assets/html_templates/modal/within_alert.html
@@ -24,7 +24,7 @@
                     </thead>
                     <tbody>
                     <div class="alert alert-info fence-not-exist" role="alert">
-                        <strong>Oh snap!</strong> Can't find any geo-fence areas,please draw a new area or try again.
+                        <strong>Oh snap!</strong> Can't find any geofence area,please draw a new area or try again.
                     </div>
 
                     </tbody>