#318 - ZM<->NVR

Former-commit-id: 36a54d3203893c7b240ba458a927b259cb6b5141

25 files changed, 1092 insertions, 1092 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 5f292909..233e92df 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -10,7 +10,7 @@
 
 angular.module('zmApp.controllers')
 
-.service('ZMDataModel', ['$http', '$q', '$ionicLoading', '$ionicBackdrop', '$fileLogger', 'zm', '$rootScope', '$ionicContentBanner', '$timeout', '$cordovaPinDialog', '$ionicPopup', '$localstorage', '$state', '$ionicNativeTransitions', '$translate', '$cordovaSQLite',
+.service('NVRDataModel', ['$http', '$q', '$ionicLoading', '$ionicBackdrop', '$fileLogger', 'zm', '$rootScope', '$ionicContentBanner', '$timeout', '$cordovaPinDialog', '$ionicPopup', '$localstorage', '$state', '$ionicNativeTransitions', '$translate', '$cordovaSQLite',
  function
     ($http, $q, $ionicLoading, $ionicBackdrop, $fileLogger,
         zm, $rootScope, $ionicContentBanner, $timeout, $cordovaPinDialog,
@@ -144,7 +144,7 @@ angular.module('zmApp.controllers')
         //--------------------------------------------------------------------------
 
         // separate out a debug so we don't do this if comparison for normal logs
-        function zmDebug(val) {
+        function debug(val) {
             if (loginData.enableDebug && loginData.enableLogs) {
                 if (val !== undefined) {
                     var regex1 = /"password":".*?"/g;
@@ -159,7 +159,7 @@ angular.module('zmApp.controllers')
             }
         }
 
-        function zmLog(val, logtype) {
+        function log(val, logtype) {
             if (loginData.enableLogs) {
                 if (val !== undefined) {
                     var regex1 = /"password":".*?"/g;
@@ -190,11 +190,11 @@ angular.module('zmApp.controllers')
             //console.log ("****serverLogin was encrypted to " + ct);
             //$localstorage.setObject("serverGroupList", serverGroupList);
             localforage.setItem("serverGroupList", ct, function (err) {
-                if (err) zmLog("localforage store error " + JSON.stringify(err));
+                if (err) log("localforage store error " + JSON.stringify(err));
             });
             //$localstorage.set("defaultServerName", loginData.serverName);
             localforage.setItem("defaultServerName", loginData.serverName, function (err) {
-                if (err) zmLog("localforage store error " + JSON.stringify(err));
+                if (err) log("localforage store error " + JSON.stringify(err));
             });
 
 
@@ -263,18 +263,18 @@ angular.module('zmApp.controllers')
                 return isEmpty(obj);
             },
 
-            zmLog: function (val, type) {
+            log: function (val, type) {
                 var logtype = 'info';
                 if (type != undefined)
                     logtype = type;
-                zmLog(val, logtype);
+                log(val, logtype);
 
             },
 
-            zmDebug: function (val) {
+            debug: function (val) {
 
 
-                zmDebug(val);
+                debug(val);
             },
 
             setLastUpdateCheck: function (val) {
@@ -323,7 +323,7 @@ angular.module('zmApp.controllers')
             getReachableConfig: function (skipFirst) {
                 var d = $q.defer();
                 if (loginData.serverName == "") {
-                    zmLog("Reachable: No server name configured, likely first use?");
+                    log("Reachable: No server name configured, likely first use?");
                     d.reject("No servers");
                     return d.promise;
                 }
@@ -331,7 +331,7 @@ angular.module('zmApp.controllers')
                 var chainURLs = [];
                 var savedLoginData = angular.copy(loginData);
 
-                //zmLog ("Making sure " + loginData.serverName + " is reachable...");
+                //log ("Making sure " + loginData.serverName + " is reachable...");
                 var tLd = serverGroupList[loginData.serverName];
                 if (skipFirst && tLd.fallbackConfiguration) {
                     tLd = serverGroupList[tLd.fallbackConfiguration];
@@ -349,24 +349,24 @@ angular.module('zmApp.controllers')
                 while (keepBuilding == true && tLd) {
                     if (arrayObjectIndexOf(chainURLs, tLd.url + "/index.php", "url") == -1 && tLd.url !== undefined && tLd.url != '') // no loop
                     {
-                        zmLog("Adding to chain stack: " + tLd.serverName + ">" + tLd.url);
+                        log("Adding to chain stack: " + tLd.serverName + ">" + tLd.url);
                         chainURLs.push({
                             url: tLd.url + "/index.php",
                             server: tLd.serverName
                         });
-                        zmLog("Fallback of " + tLd.serverName + " is " + tLd.fallbackConfiguration);
+                        log("Fallback of " + tLd.serverName + " is " + tLd.fallbackConfiguration);
                         if (tLd.fallbackConfiguration) {
                             tLd = serverGroupList[tLd.fallbackConfiguration];
                             if (tLd === undefined) {
                                 // This can happen if the fallback profile was deleted
-                                zmLog("Looks like a server object was deleted, but is still in fallback");
+                                log("Looks like a server object was deleted, but is still in fallback");
                                 keepBuilding = false;
                             }
                         } else {
-                            zmLog("reached end of chain loop");
+                            log("reached end of chain loop");
                         }
                     } else {
-                        zmLog("detected loop when " + tLd.serverName + " fallsback to " + tLd.fallbackConfiguration);
+                        log("detected loop when " + tLd.serverName + " fallsback to " + tLd.fallbackConfiguration);
                         keepBuilding = false;
                     }
                 }
@@ -383,7 +383,7 @@ angular.module('zmApp.controllers')
                     setLogin(loginData);
                     //$localstorage.set("defaultServerName",firstReachableUrl.server);
 
-                    zmLog("Based on reachability, first serverName will be " + firstReachableUrl.server);
+                    log("Based on reachability, first serverName will be " + firstReachableUrl.server);
                     //console.log("set login Data to " + JSON.stringify(loginData));
 
                     return d.promise;
@@ -409,21 +409,21 @@ angular.module('zmApp.controllers')
                         $ionicLoading.show({
                             template: $translate.instant('kTrying') + ' ' + urls[0].server
                         });
-                        zmLog("Reachability test.." + urls[0].url);
+                        log("Reachability test.." + urls[0].url);
 
                         if (loginData.reachability) {
 
                             //console.log ("************* AUGH");
                             return $http.get(urls[0].url).then(function () {
-                                zmLog("Success: reachability on " + urls[0].url);
+                                log("Success: reachability on " + urls[0].url);
                                 $ionicLoading.hide();
                                 return urls[0];
                             }, function (err) {
-                                zmLog("Failed reachability on " + urls[0].url + " with error " + JSON.stringify(err));
+                                log("Failed reachability on " + urls[0].url + " with error " + JSON.stringify(err));
                                 return findFirstReachableUrl(urls.slice(1));
                             });
                         } else {
-                            zmLog("Reachability is disabled in config, faking this test and returning success on " + urls[0]);
+                            log("Reachability is disabled in config, faking this test and returning success on " + urls[0]);
                             return urls[0];
                         }
                     } else {
@@ -449,7 +449,7 @@ angular.module('zmApp.controllers')
 
 
 
-                zmLog("ZMData init: checking for stored variables & setting up log file");
+                log("ZMData init: checking for stored variables & setting up log file");
 
                 latestBlogPostChecked = localforage.getItem("latestBlogPostChecked") || null;
 
@@ -466,18 +466,18 @@ angular.module('zmApp.controllers')
                     var decodedVal;
 
                     if (typeof val == 'string') {
-                        zmLog("user profile encrypted, decoding...");
+                        log("user profile encrypted, decoding...");
                         var bytes = CryptoJS.AES.decrypt(val.toString(), zm.cipherKey);
                         decodedVal = JSON.parse(bytes.toString(CryptoJS.enc.Utf8));
 
                     } else {
-                        zmLog("user profile not encrypted");
+                        log("user profile not encrypted");
                         decodedVal = val;
                     }
 
                     //decodedVal = val;
 
-                    zmDebug("user profile retrieved:" + JSON.stringify(decodedVal));
+                    debug("user profile retrieved:" + JSON.stringify(decodedVal));
 
                     $ionicLoading.hide();
                     serverGroupList = decodedVal;
@@ -501,7 +501,7 @@ angular.module('zmApp.controllers')
                     // because this means the user deleted it 
 
                     if (!isFoundDemo && as.length == 0) {
-                        zmDebug("Pushing demo server config to server groups");
+                        debug("Pushing demo server config to server groups");
                         //serverGroupList.push(demoS);
                         serverGroupList[demoS.serverName] = angular.copy(demoS);
                     }
@@ -524,7 +524,7 @@ angular.module('zmApp.controllers')
                                 // old version hacks for new variables
 
                                 if (typeof loginData.enableAlarmCount === 'undefined') {
-                                    zmDebug("enableAlarmCount does not exist, setting to true");
+                                    debug("enableAlarmCount does not exist, setting to true");
                                     loginData.enableAlarmCount = true;
                                 }
 
@@ -535,42 +535,42 @@ angular.module('zmApp.controllers')
                                 if (loginData.onTapScreen != $translate.instant('kTapMontage') &&
                                     loginData.onTapScreen != $translate.instant('kTapEvents') &&
                                     loginData.onTapScreen != $translate.instant('kTapLiveMonitor')) {
-                                    zmLog("Invalid onTap setting found, resetting");
+                                    log("Invalid onTap setting found, resetting");
                                     loginData.onTapScreen = $translate.instant('kMontage');
                                 }
 
 
                                 if (typeof loginData.minAlarmCount === 'undefined') {
-                                    zmDebug("minAlarmCount does not exist, setting to true");
+                                    debug("minAlarmCount does not exist, setting to true");
                                     loginData.minAlarmCount = 1;
                                 }
 
 
                                 if (typeof loginData.montageSize == 'undefined') {
-                                    zmDebug("montageSize does not exist, setting to 2 (2 per col)");
+                                    debug("montageSize does not exist, setting to 2 (2 per col)");
                                     loginData.montageSize = 2;
                                 }
 
 
                                 if (typeof loginData.useNphZms == 'undefined') {
-                                    zmDebug("useNphZms does not exist. Setting to true");
+                                    debug("useNphZms does not exist. Setting to true");
                                     loginData.useNphZms = true;
                                 }
 
 
 
                                 if (typeof loginData.useNphZmsForEvents == 'undefined') {
-                                    zmDebug("useNphZmsForEvents does not exist. Setting to true");
+                                    debug("useNphZmsForEvents does not exist. Setting to true");
                                     loginData.useNphZmsForEvents = true;
                                 }
 
                                 if (typeof loginData.forceImageModePath == 'undefined') {
-                                    zmDebug("forceImageModePath does not exist. Setting to false");
+                                    debug("forceImageModePath does not exist. Setting to false");
                                     loginData.forceImageModePath = false;
                                 }
 
                                 if (typeof loginData.reachability == 'undefined') {
-                                    zmDebug("reachability does not exist. Setting to true");
+                                    debug("reachability does not exist. Setting to true");
                                     loginData.reachability = true;
                                 }
                                 // force it - this may not be the problem
@@ -581,67 +581,67 @@ angular.module('zmApp.controllers')
                                 loginData.useNphZmsForEvents = true;
 
                                 if (typeof loginData.packMontage == 'undefined') {
-                                    zmDebug("packMontage does not exist. Setting to false");
+                                    debug("packMontage does not exist. Setting to false");
                                     loginData.packMontage = false;
                                 }
 
                                 if (typeof loginData.forceNetworkStop == 'undefined') {
-                                    zmDebug("forceNetwork does not exist. Setting to false");
+                                    debug("forceNetwork does not exist. Setting to false");
                                     loginData.forceNetworkStop = false;
                                 }
 
                                 if (typeof loginData.enableLogs == 'undefined') {
-                                    zmDebug("enableLogs does not exist. Setting to true");
+                                    debug("enableLogs does not exist. Setting to true");
                                     loginData.enableLogs = true;
                                 }
 
 
 
                                 if (typeof loginData.defaultPushSound == 'undefined') {
-                                    zmDebug("defaultPushSound does not exist. Setting to false");
+                                    debug("defaultPushSound does not exist. Setting to false");
                                     loginData.defaultPushSound = false;
                                 }
 
 
 
                                 if (typeof loginData.exitOnSleep == 'undefined') {
-                                    zmDebug("exitOnSleep does not exist. Setting to false");
+                                    debug("exitOnSleep does not exist. Setting to false");
                                     loginData.exitOnSleep = false;
                                 }
 
                                 if (typeof loginData.enableBlog == 'undefined') {
-                                    zmDebug("enableBlog does not exist. Setting to true");
+                                    debug("enableBlog does not exist. Setting to true");
                                     loginData.enableBlog = true;
 
                                 }
 
                                 if (typeof loginData.packeryPositions == 'undefined') {
-                                    zmDebug("packeryPositions does not exist. Setting to empty");
+                                    debug("packeryPositions does not exist. Setting to empty");
                                     loginData.packeryPositions = "";
 
                                 }
 
 
                                 if (typeof loginData.packerySizes == 'undefined') {
-                                    zmDebug("packerySizes does not exist. Setting to empty");
+                                    debug("packerySizes does not exist. Setting to empty");
                                     loginData.packerySizes = "";
 
                                 }
 
                                 if (typeof loginData.use24hr == 'undefined') {
-                                    zmDebug("use24hr does not exist. Setting to false");
+                                    debug("use24hr does not exist. Setting to false");
                                     loginData.use24hr = false;
 
                                 }
 
                                 if (typeof timelineModalGraphType == 'undefined') {
-                                    zmDebug("timeline graph type not set. Setting to all");
+                                    debug("timeline graph type not set. Setting to all");
                                     loginData.timelineModalGraphType = $translate.instant('kGraphAll');
                                     //console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" + loginData.timelineModalGraphType);
                                 }
 
                                 if (typeof loginData.resumeDelay == 'undefined') {
-                                    zmDebug("resumeDelay does not exist. Setting to 0");
+                                    debug("resumeDelay does not exist. Setting to 0");
                                     loginData.resumeDelay = 0;
 
                                 }
@@ -651,33 +651,33 @@ angular.module('zmApp.controllers')
 
 
                                 if (typeof loginData.montageHistoryQuality == 'undefined') {
-                                    zmDebug("montageHistoryQuality does not exist. Setting to 50");
+                                    debug("montageHistoryQuality does not exist. Setting to 50");
                                     loginData.montageHistoryQuality = "50";
 
                                 }
 
                                 if (typeof loginData.disableNative == 'undefined') {
-                                    zmDebug("disableNative not found, setting to false");
+                                    debug("disableNative not found, setting to false");
                                     loginData.disableNative = false;
 
                                 }
 
                                 if (typeof loginData.vibrateOnPush == 'undefined') {
-                                    zmDebug("vibrate on push not found, setting to true");
+                                    debug("vibrate on push not found, setting to true");
                                     loginData.vibrateOnPush = true;
 
                                 }
 
                                 if (typeof loginData.soundOnPush == 'undefined') {
-                                    zmDebug("sound on push not found, setting to true");
+                                    debug("sound on push not found, setting to true");
                                     loginData.soundOnPush = true;
 
                                 }
 
 
-                                zmLog("DataModel init recovered this loginData as " + JSON.stringify(loginData));
+                                log("DataModel init recovered this loginData as " + JSON.stringify(loginData));
                             } else {
-                                zmLog("defaultServer configuration NOT found. Keeping login at defaults");
+                                log("defaultServer configuration NOT found. Keeping login at defaults");
                             }
                             // FIXME: HACK: This is the latest entry point into dataModel init, so start portal login after this
                             // not the neatest way
@@ -685,9 +685,9 @@ angular.module('zmApp.controllers')
                         });
 
                     monitorsLoaded = 0;
-                    //console.log("Getting out of ZMDataModel init");
+                    //console.log("Getting out of NVRDataModel init");
                     $rootScope.showBlog = loginData.enableBlog;
-                    //zmDebug("loginData structure values: " + JSON.stringify(loginData));
+                    //debug("loginData structure values: " + JSON.stringify(loginData));
 
                 });
 
@@ -706,10 +706,10 @@ angular.module('zmApp.controllers')
                 if (str) s = str + ":";
                 if (justResumed) {
                     // we don't call stop as we did stop on pause
-                    zmLog(s + " Not calling window stop as we just resumed");
+                    log(s + " Not calling window stop as we just resumed");
                     justResumed = false;
                 } else {
-                    zmLog(s + " Calling window.stop()");
+                    log(s + " Calling window.stop()");
                     window.stop();
                 }
             },
@@ -742,19 +742,19 @@ angular.module('zmApp.controllers')
                     //console.log("setting default lang");
                     localforage.setItem("defaultLang", l)
                         .then(function (val) {
-                            zmLog("Set language in localforage to: " + val);
+                            log("Set language in localforage to: " + val);
                         });
                 }
 
                 //console.log("invoking translate use with " + l);
                 $translate.use(l).then(function (data) {
-                    zmLog("Device Language is:" + data);
+                    log("Device Language is:" + data);
                     moment.locale(data);
                     $translate.fallbackLanguage('en');
                     d.resolve(data);
                     return d.promise;
                 }, function (error) {
-                    zmLog("Device Language error: " + error);
+                    log("Device Language error: " + error);
                     $translate.use('en');
                     moment.locale('en');
                     d.resolve('en');
@@ -821,7 +821,7 @@ angular.module('zmApp.controllers')
             setFirstUse: function (val) {
                 //window.localStorage.setItem("isFirstUse", val ? "1" : "0");
                 //localforage.setItem("isFirstUse", val, 
-                //   function(err) {if (err) zmLog ("localforage error, //storing isFirstUse: " + JSON.stringify(err));});
+                //   function(err) {if (err) log ("localforage error, //storing isFirstUse: " + JSON.stringify(err));});
                 isFirstUse = val;
                 localforage.setItem("isFirstUse", val);
                 //console.log (">>>>>>setting isFirstUse to " + val);
@@ -843,7 +843,7 @@ angular.module('zmApp.controllers')
 
 
                 //console.log ("**** setAwake called with:" + val);
-                // zmLog("Switching screen always on to " + val);
+                // log("Switching screen always on to " + val);
                 if (val) {
 
                     if (window.cordova != undefined) {
@@ -878,7 +878,7 @@ angular.module('zmApp.controllers')
             // returns API version or none 
             //-------------------------------------------------------
             getAPIversion: function () {
-                zmDebug("getAPIversion called");
+                debug("getAPIversion called");
                 var d = $q.defer();
                 var apiurl = loginData.apiurl + '/host/getVersion.json';
                 $http.get(apiurl)
@@ -892,7 +892,7 @@ angular.module('zmApp.controllers')
 
                         },
                         function (error) {
-                            zmDebug("getAPIversion error handler " + JSON.stringify(error));
+                            debug("getAPIversion error handler " + JSON.stringify(error));
                             d.reject("-1.-1.-1");
                             return (d.promise);
                         });
@@ -909,12 +909,12 @@ angular.module('zmApp.controllers')
                 var d = $q.defer();
 
                 var myurl = loginData.url;
-                zmLog("Checking if reCaptcha is enabled in ZM...");
+                log("Checking if reCaptcha is enabled in ZM...");
                 $http.get(myurl)
                     .then(function (success) {
                         if (success.data.search("g-recaptcha") != -1) {
                             // recaptcha enable. zmNinja won't work
-                            zmLog("ZM has recaptcha enabled", "error");
+                            log("ZM has recaptcha enabled", "error");
                             displayBanner('error', ['Recaptcha must be disabled in Zoneminder', $rootScope.appName + ' will not work with recaptcha'], "", 8000);
                             d.resolve(true);
                             return (d.promise);
@@ -922,7 +922,7 @@ angular.module('zmApp.controllers')
 
                         } else {
                             d.resolve(false);
-                            zmLog("ZM has recaptcha disabled - good");
+                            log("ZM has recaptcha disabled - good");
                             return (d.promise);
                         }
                     });
@@ -940,7 +940,7 @@ angular.module('zmApp.controllers')
                 var d = $q.defer();
 
                 if (!mid) {
-                    zmLog("Deferring auth key, as monitorId unknown");
+                    log("Deferring auth key, as monitorId unknown");
                     d.resolve("");
                     return (d.promise);
                 }
@@ -948,23 +948,23 @@ angular.module('zmApp.controllers')
                 // Skipping monitor number as I only need an auth key
                 // so no need to generate an image
                 var myurl = loginData.url + "/index.php?view=watch&mid=" + mid + "&connkey=" + ck;
-                zmDebug("DataModel: Getting auth from " + myurl + " with mid=" + mid);
+                debug("DataModel: Getting auth from " + myurl + " with mid=" + mid);
                 $http.get(myurl)
                     .then(function (success) {
                             // console.log ("**** RESULT IS " + JSON.stringify(success));
                             // Look for auth=
                             var auth = success.data.match("auth=(.*?)&");
                             if (auth && (auth[1] != null)) {
-                                zmLog("DataModel: Extracted a stream authentication key of: " + auth[1]);
+                                log("DataModel: Extracted a stream authentication key of: " + auth[1]);
                                 d.resolve("&auth=" + auth[1]);
                             } else {
-                                zmLog("DataModel: Did not find a stream auth key, looking for user=");
+                                log("DataModel: Did not find a stream auth key, looking for user=");
                                 auth = success.data.match("user=(.*?)&");
                                 if (auth && (auth[1] != null)) {
-                                    zmLog("DataModel: Found simple stream auth mode (user=)");
+                                    log("DataModel: Found simple stream auth mode (user=)");
                                     d.resolve("&user=" + loginData.username + "&pass=" + loginData.password);
                                 } else {
-                                    zmLog("Data Model: Did not find any  stream mode of auth");
+                                    log("Data Model: Did not find any  stream mode of auth");
                                     d.resolve("");
                                 }
                                 return (d.promise);
@@ -972,7 +972,7 @@ angular.module('zmApp.controllers')
 
                         },
                         function (error) {
-                            zmLog("DataModel: Error resolving auth key " + JSON.stringify(error));
+                            log("DataModel: Error resolving auth key " + JSON.stringify(error));
                             d.resolve("");
                             return (d.promise);
                         });
@@ -991,25 +991,25 @@ angular.module('zmApp.controllers')
                 if (forceReload == 1 || configParams.ZM_EVENT_IMAGE_DIGITS == '-1') {
                     var apiurl = loginData.apiurl;
                     var myurl = apiurl + '/configs/viewByName/ZM_EVENT_IMAGE_DIGITS.json';
-                    zmDebug("Config URL for digits is:" + myurl);
+                    debug("Config URL for digits is:" + myurl);
                     $http.get(myurl)
                         .success(function (data) {
-                            zmLog("ZM_EVENT_IMAGE_DIGITS is " + data.config.Value);
+                            log("ZM_EVENT_IMAGE_DIGITS is " + data.config.Value);
                             configParams.ZM_EVENT_IMAGE_DIGITS = data.config.Value;
                             d.resolve(configParams.ZM_EVENT_IMAGE_DIGITS);
                             return (d.promise);
 
                         })
                         .error(function (err) {
-                            zmLog("Error retrieving ZM_EVENT_IMAGE_DIGITS" + JSON.stringify(err), "error");
-                            zmLog("Taking a guess, setting ZM_EVENT_IMAGE_DIGITS to 5");
+                            log("Error retrieving ZM_EVENT_IMAGE_DIGITS" + JSON.stringify(err), "error");
+                            log("Taking a guess, setting ZM_EVENT_IMAGE_DIGITS to 5");
                             // FIXME: take a plunge and keep it at 5?
                             configParams.ZM_EVENT_IMAGE_DIGITS = 5;
                             d.resolve(configParams.ZM_EVENT_IMAGE_DIGITS);
                             return (d.promise);
                         });
                 } else {
-                    zmLog("ZM_EVENT_IMAGE_DIGITS is already configured for " +
+                    log("ZM_EVENT_IMAGE_DIGITS is already configured for " +
                         configParams.ZM_EVENT_IMAGE_DIGITS);
                     d.resolve(configParams.ZM_EVENT_IMAGE_DIGITS);
                 }
@@ -1025,7 +1025,7 @@ angular.module('zmApp.controllers')
                 var d = $q.defer();
                 var apiurl = loginData.apiurl;
                 var myurl = apiurl + '/configs/viewByName/ZM_PATH_ZMS.json';
-                zmDebug("Config URL for ZMS PATH is:" + myurl);
+                debug("Config URL for ZMS PATH is:" + myurl);
                 $http.get(myurl)
                     .success(function (data) {
                         configParams.ZM_PATH_ZMS = data.config.Value;
@@ -1033,7 +1033,7 @@ angular.module('zmApp.controllers')
                         return (d.promise);
                     })
                     .error(function (error) {
-                        zmLog("Error retrieving ZM_PATH_ZMS: " + JSON.stringify(error));
+                        log("Error retrieving ZM_PATH_ZMS: " + JSON.stringify(error));
                         d.reject("");
                         return (d.promise);
                     });
@@ -1067,7 +1067,7 @@ angular.module('zmApp.controllers')
                     //console.log("Order string is " + montageOrder.toString());
                     //console.log("Hiddent string is " + hiddenOrder.toString());
 
-                    zmLog("Stored montage order does not exist");
+                    log("Stored montage order does not exist");
                 } else
                 // there is a saved order
                 {
@@ -1075,8 +1075,8 @@ angular.module('zmApp.controllers')
                     var myhiddenorder = loginData.montageHiddenOrder;
 
 
-                    zmDebug("MontageCtrl: Montage order is " + myorder);
-                    zmDebug("MontageCtrl: Hidden order is " + myhiddenorder);
+                    debug("MontageCtrl: Montage order is " + myorder);
+                    debug("MontageCtrl: Hidden order is " + myhiddenorder);
                     if (myorder) montageOrder = myorder.split(",");
                     if (myhiddenorder) hiddenOrder = myhiddenorder.split(",");
 
@@ -1084,7 +1084,7 @@ angular.module('zmApp.controllers')
                     // saved
 
                     if (monitors.length != montageOrder.length) {
-                        zmLog("Monitors array length different from stored hidden/order array. It's possible monitors were added/removed. Resetting...");
+                        log("Monitors array length different from stored hidden/order array. It's possible monitors were added/removed. Resetting...");
                         montageOrder = [];
                         hiddenOrder = [];
                         for (i = 0; i < monitors.length; i++) {
@@ -1118,7 +1118,7 @@ angular.module('zmApp.controllers')
 
                         if (monitors[i] !== undefined)
                             monitors[i].Monitor.listDisplay = 'noshow';
-                        zmLog("Monitor " + i + " is marked as hidden in montage");
+                        log("Monitor " + i + " is marked as hidden in montage");
                     } else {
                         if (monitors[i] !== undefined)
                             monitors[i].Monitor.listDisplay = 'show';
@@ -1178,8 +1178,8 @@ angular.module('zmApp.controllers')
                 var d = $q.defer();
                 if ((monitorsLoaded == 0) || (forceReload == 1)) // monitors are empty or force reload
                 {
-                    //console.log("ZMDataModel: Invoking HTTP get to load monitors");
-                    zmLog((forceReload == 1) ? "getMonitors:Force reloading all monitors" : "getMonitors:Loading all monitors");
+                    //console.log("NVRDataModel: Invoking HTTP get to load monitors");
+                    log((forceReload == 1) ? "getMonitors:Force reloading all monitors" : "getMonitors:Loading all monitors");
                     var apiurl = loginData.apiurl;
                     var myurl = apiurl + "/monitors.json";
                     //console.log ("API:"+myurl);
@@ -1192,12 +1192,12 @@ angular.module('zmApp.controllers')
                             });
                             //console.log("promise resolved inside HTTP success");
                             monitorsLoaded = 1;
-                            zmDebug("Now trying to get multi-server data, if present");
+                            debug("Now trying to get multi-server data, if present");
                             $http.get(apiurl + "/servers.json")
                                 .success(function (data) {
                                     // We found a server list API, so lets make sure
                                     // we get the hostname as it will be needed for playback
-                                    zmLog("multi server list loaded" + JSON.stringify(data));
+                                    log("multi server list loaded" + JSON.stringify(data));
                                     multiservers = data.servers;
 
                                     for (var i = 0; i < monitors.length; i++) {
@@ -1218,7 +1218,7 @@ angular.module('zmApp.controllers')
                                         }
                                         if (serverFound) {
 
-                                            zmDebug("Monitor " + monitors[i].Monitor.Id + " has a recording server hostname of " + multiservers[j].Server.Hostname);
+                                            debug("Monitor " + monitors[i].Monitor.Id + " has a recording server hostname of " + multiservers[j].Server.Hostname);
 
                                             // Now here is the logic, I need to retrieve serverhostname,
                                             // and slap on the host protocol and path. Meh.
@@ -1226,8 +1226,8 @@ angular.module('zmApp.controllers')
                                             var p = URI.parse(loginData.streamingurl);
                                             var s = URI.parse(multiservers[j].Server.Hostname);
 
-                                            zmDebug("recording server parsed is " + JSON.stringify(s));
-                                            zmDebug("portal  parsed is " + JSON.stringify(p));
+                                            debug("recording server parsed is " + JSON.stringify(s));
+                                            debug("portal  parsed is " + JSON.stringify(p));
 
                                             var st = "";
                                             var baseurl = "";
@@ -1256,10 +1256,10 @@ angular.module('zmApp.controllers')
                                             monitors[i].Monitor.baseURL = baseurl;
                                             // starting 1.30 we have fid=xxx mode to return images
                                             monitors[i].Monitor.imageMode = (versionCompare($rootScope.apiVersion, "1.30") == -1) ? "path" : "fid";
-                                            zmDebug("API " + $rootScope.apiVersion + ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access");
+                                            debug("API " + $rootScope.apiVersion + ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access");
 
-                                            //zmDebug ("Streaming URL for Monitor " + monitors[i].Monitor.Id  + " is " + monitors[i].Monitor.streamingURL );
-                                            //zmDebug ("Base URL for Monitor " + monitors[i].Monitor.Id  + " is " + monitors[i].Monitor.baseURL );
+                                            //debug ("Streaming URL for Monitor " + monitors[i].Monitor.Id  + " is " + monitors[i].Monitor.streamingURL );
+                                            //debug ("Base URL for Monitor " + monitors[i].Monitor.Id  + " is " + monitors[i].Monitor.baseURL );
 
 
                                         } else {
@@ -1273,17 +1273,17 @@ angular.module('zmApp.controllers')
 
                                             // but now check if forced path 
                                             if (loginData.forceImageModePath) {
-                                                zmDebug("Overriding, setting image mode to true as you have requested force enable");
+                                                debug("Overriding, setting image mode to true as you have requested force enable");
                                                 monitors[i].Monitor.imageMode = 'path';
                                             }
 
-                                            zmDebug("API " + $rootScope.apiVersion + ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access");
+                                            debug("API " + $rootScope.apiVersion + ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access");
                                         }
                                     }
                                     d.resolve(monitors);
                                 })
                                 .error(function (err) {
-                                    zmLog("multi server list loading error");
+                                    log("multi server list loading error");
                                     multiservers = [];
 
                                     for (var i = 0; i < monitors.length; i++) {
@@ -1293,7 +1293,7 @@ angular.module('zmApp.controllers')
                                         monitors[i].Monitor.streamingURL = loginData.streamingurl;
                                         monitors[i].Monitor.baseURL = loginData.url;
                                         monitors[i].Monitor.imageMode = (versionCompare($rootScope.apiVersion, "1.30") == -1) ? "path" : "fid";
-                                        zmDebug("API " + $rootScope.apiVersion + ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access");
+                                        debug("API " + $rootScope.apiVersion + ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access");
 
 
 
@@ -1304,14 +1304,14 @@ angular.module('zmApp.controllers')
                                 });
 
                             $ionicLoading.hide();
-                            zmLog("Monitor load was successful, loaded " + monitors.length + " monitors");
+                            log("Monitor load was successful, loaded " + monitors.length + " monitors");
 
 
 
                         })
                         .error(function (err) {
                             //console.log("HTTP Error " + err);
-                            zmLog("Monitor load failed " + JSON.stringify(err), "error");
+                            log("Monitor load failed " + JSON.stringify(err), "error");
                             // To keep it simple for now, I'm translating an error
                             // to imply no monitors could be loaded. FIXME: conver to proper error
                             monitors = [];
@@ -1326,7 +1326,7 @@ angular.module('zmApp.controllers')
                 } else // monitors are loaded
                 {
                     //console.log("Returning pre-loaded list of " + monitors.length + " monitors");
-                    zmLog("Returning pre-loaded list of " + monitors.length + " monitors");
+                    log("Returning pre-loaded list of " + monitors.length + " monitors");
                     d.resolve(monitors);
                     $ionicLoading.hide();
                     return d.promise;
@@ -1346,7 +1346,7 @@ angular.module('zmApp.controllers')
             // When I display events in the event controller, this is the first function I call
             // This returns the total number of pages
             // I then proceed to display pages in reverse order to display the latest events first
-            // I also reverse sort them in ZMDataModel to sort by date
+            // I also reverse sort them in NVRDataModel to sort by date
             // All this effort because the ZM APIs return events in sorted order, oldest first. Yeesh.
             //-----------------------------------------------------------------------------
 
@@ -1391,7 +1391,7 @@ angular.module('zmApp.controllers')
                     .error(function (error) {
                         $ionicLoading.hide();
                         // console.log("*** ERROR GETTING TOTAL PAGES ***");
-                        zmLog("Error retrieving page count of events " + JSON.stringify(error), "error");
+                        log("Error retrieving page count of events " + JSON.stringify(error), "error");
                         displayBanner('error', ['error retrieving event page count', 'please try again']);
 
                         d.reject(error);
@@ -1477,7 +1477,7 @@ angular.module('zmApp.controllers')
                         if (loadingStr != 'none') $ionicLoading.hide();
                         displayBanner('error', ['error retrieving event list', 'please try again']);
                         //console.log("HTTP Events error " + err);
-                        zmLog("Error fetching events for page " + pageId + " Err: " + JSON.stringify(err), "error");
+                        log("Error fetching events for page " + pageId + " Err: " + JSON.stringify(err), "error");
                         // I need to reject this as I have infinite scrolling
                         // implemented in EventCtrl.js --> and if it does not know
                         // it got an error going to the next page, it will get into
@@ -1551,7 +1551,7 @@ angular.module('zmApp.controllers')
                     if (foundIndex >= monitors.length) foundIndex = 0;
                     return (monitors[foundIndex].Monitor.Id);
                 } else {
-                    zmLog("getNextMonitor could not find monitor " + monitorId);
+                    log("getNextMonitor could not find monitor " + monitorId);
                     return (monitorId);
                 }
 
diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js
index fab6cfc2..a4b8d002 100644
--- a/www/js/DevOptionsCtrl.js
+++ b/www/js/DevOptionsCtrl.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console */
 
-angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope', '$rootScope', '$ionicModal', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', '$ionicHistory', '$state', 'SecuredPopups', '$translate', function ($scope, $rootScope, $ionicModal, zm, ZMDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, $ionicHistory, $state, SecuredPopups, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope', '$rootScope', '$ionicModal', 'zm', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', '$ionicHistory', '$state', 'SecuredPopups', '$translate', function ($scope, $rootScope, $ionicModal, zm, NVRDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, $ionicHistory, $state, SecuredPopups, $translate) {
 
 
     $scope.openMenu = function () {
@@ -49,9 +49,9 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
         //console.log("**VIEW ** DevOptions Ctrl Entered");
-        $scope.loginData = ZMDataModel.getLogin();
+        $scope.loginData = NVRDataModel.getLogin();
 
-        ZMDataModel.setAwake(false);
+        NVRDataModel.setAwake(false);
     });
 
     //------------------------------------------------------------------
@@ -59,7 +59,7 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
     //------------------------------------------------------------------
 
     function saveDevOptions() {
-        ZMDataModel.zmDebug("SaveDevOptions: called");
+        NVRDataModel.debug("SaveDevOptions: called");
 
 
 
@@ -68,7 +68,7 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
         }
 
         if (parseInt($scope.loginData.refreshSec) <= 0) {
-            ZMDataModel.zmDebug("SaveDevOptions: refresh sec was too low at " +
+            NVRDataModel.debug("SaveDevOptions: refresh sec was too low at " +
                 $scope.loginData.refreshSec + " reset to 1");
             $scope.loginData.refreshSec = 1;
 
@@ -87,9 +87,9 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
         }
 
 
-        ZMDataModel.zmDebug("SaveDevOptions: Saving to disk");
-        ZMDataModel.setLogin($scope.loginData);
-        ZMDataModel.getMonitors(1);
+        NVRDataModel.debug("SaveDevOptions: Saving to disk");
+        NVRDataModel.setLogin($scope.loginData);
+        NVRDataModel.getMonitors(1);
 
 
     }
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 16f7016c..d7ebdfa9 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -33,7 +33,7 @@ angular.module('zmApp.controllers')
 
 })
 
-.controller('zmApp.EventCtrl', ['$scope', '$rootScope', 'zm', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', '$ionicSlideBoxDelegate', '$ionicPosition', '$ionicPopover', '$ionicPopup', 'EventServer', '$sce', '$cordovaBadge', '$cordovaLocalNotification', '$q', 'carouselUtils', '$translate', function ($scope, $rootScope, zm, ZMDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, $ionicSlideBoxDelegate, $ionicPosition, $ionicPopover, $ionicPopup, EventServer, $sce, $cordovaBadge, $cordovaLocalNotification, $q, carouselUtils, $translate) {
+.controller('zmApp.EventCtrl', ['$scope', '$rootScope', 'zm', 'NVRDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', '$ionicSlideBoxDelegate', '$ionicPosition', '$ionicPopover', '$ionicPopup', 'EventServer', '$sce', '$cordovaBadge', '$cordovaLocalNotification', '$q', 'carouselUtils', '$translate', function ($scope, $rootScope, zm, NVRDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, $ionicSlideBoxDelegate, $ionicPosition, $ionicPopover, $ionicPopup, EventServer, $sce, $cordovaBadge, $cordovaLocalNotification, $q, carouselUtils, $translate) {
 
     // events in last 5 minutes
     // TODO https://server/zm/api/events/consoleEvents/5%20minute.json
@@ -105,12 +105,12 @@ angular.module('zmApp.controllers')
         scrollbynumber = 0;
         $scope.eventsBeingLoaded = true;
         $scope.FrameArray = []; // will hold frame info from detailed Events API
-        loginData = ZMDataModel.getLogin();
-        ZMDataModel.getKeyConfigParams(0)
+        loginData = NVRDataModel.getLogin();
+        NVRDataModel.getKeyConfigParams(0)
             .then(function (data) {
                 //console.log ("***GETKEY: " + JSON.stringify(data));
                 eventImageDigits = parseInt(data);
-                ZMDataModel.zmLog("Image padding digits reported as " + eventImageDigits);
+                NVRDataModel.log("Image padding digits reported as " + eventImageDigits);
             });
 
 
@@ -126,7 +126,7 @@ angular.module('zmApp.controllers')
         };
         $scope.myfilter = "";
 
-        $scope.loginData = ZMDataModel.getLogin();
+        $scope.loginData = NVRDataModel.getLogin();
         $scope.playbackURL = $scope.loginData.url;
 
     });
@@ -147,11 +147,11 @@ angular.module('zmApp.controllers')
         e.preventDefault();
         if ($scope.modal != undefined && $scope.modal.isShown()) {
             // switch off awake, as liveview is finished
-            ZMDataModel.zmDebug("Modal is open, closing it");
-            ZMDataModel.setAwake(false);
+            NVRDataModel.debug("Modal is open, closing it");
+            NVRDataModel.setAwake(false);
             $scope.modal.remove();
         } else {
-            ZMDataModel.zmDebug("Modal is closed, so toggling or exiting");
+            NVRDataModel.debug("Modal is closed, so toggling or exiting");
             if (!$ionicSideMenuDelegate.isOpenLeft()) {
                 $ionicSideMenuDelegate.toggleLeft();
 
@@ -168,7 +168,7 @@ angular.module('zmApp.controllers')
     // monitor the slider for carousels
     //--------------------------------------
     function setupWatchers() {
-        ZMDataModel.zmDebug("Setting up carousel watchers");
+        NVRDataModel.debug("Setting up carousel watchers");
 
         ionRangeWatcher = $scope.$watch('ionRange.index', function () {
             // console.log ("Watching index");
@@ -211,15 +211,15 @@ angular.module('zmApp.controllers')
     // --------------------------------------------------------      
 
     function getInitialEvents() {
-        ZMDataModel.zmDebug("getInitialEvents called");
-        var lData = ZMDataModel.getLogin();
+        NVRDataModel.debug("getInitialEvents called");
+        var lData = NVRDataModel.getLogin();
 
         var stackState = $ionicHistory.backTitle();
 
         // If you came from Monitors, disregard hidden monitors in montage
         if (lData.persistMontageOrder && stackState != "Monitors") {
             var tempMon = message;
-            $scope.monitors = ZMDataModel.applyMontageMonitorPrefs(tempMon, 2)[0];
+            $scope.monitors = NVRDataModel.applyMontageMonitorPrefs(tempMon, 2)[0];
         } else
             $scope.monitors = message;
 
@@ -244,22 +244,22 @@ angular.module('zmApp.controllers')
         // First get total pages and then
         // start from the latest. If this fails, nothing displays
 
-        ZMDataModel.zmDebug("EventCtrl: grabbing # of event pages");
-        ZMDataModel.getEventsPages($scope.id, $rootScope.fromString, $rootScope.toString)
+        NVRDataModel.debug("EventCtrl: grabbing # of event pages");
+        NVRDataModel.getEventsPages($scope.id, $rootScope.fromString, $rootScope.toString)
             .then(function (data) {
                 eventsPage = data.pageCount;
-                ZMDataModel.zmDebug("EventCtrl: found " + eventsPage + " pages of events");
+                NVRDataModel.debug("EventCtrl: found " + eventsPage + " pages of events");
 
                 pageLoaded = true;
                 $scope.viewTitle.title = data.count;
-                ZMDataModel.zmDebug("EventCtrl: grabbing events for: id=" + $scope.id + " Date/Time:" + $rootScope.fromString +
+                NVRDataModel.debug("EventCtrl: grabbing events for: id=" + $scope.id + " Date/Time:" + $rootScope.fromString +
                     "-" + $rootScope.toString);
-                ZMDataModel.getEvents($scope.id, eventsPage, "", $rootScope.fromString, $rootScope.toString)
+                NVRDataModel.getEvents($scope.id, eventsPage, "", $rootScope.fromString, $rootScope.toString)
                     .then(function (data) {
 
                         var myevents = data;
-                        ZMDataModel.zmDebug("EventCtrl: success, got " + myevents.length + " events");
-                        var loginData = ZMDataModel.getLogin();
+                        NVRDataModel.debug("EventCtrl: success, got " + myevents.length + " events");
+                        var loginData = NVRDataModel.getLogin();
                         for (var i = 0; i < myevents.length; i++) {
 
                             var idfound = true;
@@ -276,15 +276,15 @@ angular.module('zmApp.controllers')
 
 
                             myevents[i].Event.humanizeTime = humanizeTime(myevents[i].Event.StartTime);
-                            myevents[i].Event.streamingURL = ZMDataModel.getStreamingURL(myevents[i].Event.MonitorId);
-                            myevents[i].Event.baseURL = ZMDataModel.getBaseURL(myevents[i].Event.MonitorId);
-                            myevents[i].Event.imageMode = ZMDataModel.getImageMode(myevents[i].Event.MonitorId);
+                            myevents[i].Event.streamingURL = NVRDataModel.getStreamingURL(myevents[i].Event.MonitorId);
+                            myevents[i].Event.baseURL = NVRDataModel.getBaseURL(myevents[i].Event.MonitorId);
+                            myevents[i].Event.imageMode = NVRDataModel.getImageMode(myevents[i].Event.MonitorId);
 
                             //console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL);
 
                             // console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.baseURL);
 
-                            myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId);
+                            myevents[i].Event.MonitorName = NVRDataModel.getMonitorName(myevents[i].Event.MonitorId);
                             myevents[i].Event.ShowScrub = false;
                             myevents[i].Event.height = zm.eventsListDetailsHeight;
                             // now construct base path
@@ -295,10 +295,10 @@ angular.module('zmApp.controllers')
                             // in multiserver BasePath is login url for frames 
                             // http://login.url/index.php?view=frame&eid=19696772&fid=21
 
-                            //  console.log ("COMPARING "+ZMDataModel.getLogin().url+ " TO " +myevents[i].Event.baseURL);
-                            if (ZMDataModel.getLogin().url != myevents[i].Event.baseURL) {
-                                //ZMDataModel.zmDebug ("Multi server, changing base");
-                                myevents[i].Event.baseURL = ZMDataModel.getLogin().url;
+                            //  console.log ("COMPARING "+NVRDataModel.getLogin().url+ " TO " +myevents[i].Event.baseURL);
+                            if (NVRDataModel.getLogin().url != myevents[i].Event.baseURL) {
+                                //NVRDataModel.debug ("Multi server, changing base");
+                                myevents[i].Event.baseURL = NVRDataModel.getLogin().url;
 
                             }
 
@@ -320,7 +320,7 @@ angular.module('zmApp.controllers')
                         // if last page has less events
                         //console.log("**Loading Next Page ***");
                         if (myevents.length < 50) {
-                            ZMDataModel.zmDebug("EventCtrl:loading one more page just in case we don't have enough to display");
+                            NVRDataModel.debug("EventCtrl:loading one more page just in case we don't have enough to display");
                             loadMore();
                         }
                     });
@@ -340,7 +340,7 @@ angular.module('zmApp.controllers')
             noBackdrop: true,
             duration: 1000
         });
-        ZMDataModel.zmDebug("ModalCtrl:Photo saved successfuly");
+        NVRDataModel.debug("ModalCtrl:Photo saved successfuly");
     }
 
     function SaveError(e) {
@@ -349,7 +349,7 @@ angular.module('zmApp.controllers')
             noBackdrop: true,
             duration: 2000
         });
-        ZMDataModel.zmLog("Error saving image: " + e.message);
+        NVRDataModel.log("Error saving image: " + e.message);
         //console.log("***ERROR");
     }
 
@@ -362,7 +362,7 @@ angular.module('zmApp.controllers')
             duration: zm.httpTimeout
         });
         var url = imgsrc;
-        ZMDataModel.zmLog("saveNow: File path to grab is " + url);
+        NVRDataModel.log("saveNow: File path to grab is " + url);
 
         var img = new Image();
         img.onload = function () {
@@ -427,7 +427,7 @@ angular.module('zmApp.controllers')
         // note ndx may be incorrect if we are looking 
         // at unique frames;
 
-        // ZMDataModel.zmDebug("Hello");
+        // NVRDataModel.debug("Hello");
         if ($scope.typeOfFrames == $translate.instant('kShowTimeDiffFrames')) {
 
             var ic;
@@ -438,10 +438,10 @@ angular.module('zmApp.controllers')
             }
 
 
-            ZMDataModel.zmDebug("Readjusting selected frame ID from:" + $scope.ndx + "  to actual frame ID of:" + ic);
+            NVRDataModel.debug("Readjusting selected frame ID from:" + $scope.ndx + "  to actual frame ID of:" + ic);
             $scope.ndx = ic;
         } else {
-            ZMDataModel.zmDebug("No index adjustment necessary as we are using all frames");
+            NVRDataModel.debug("No index adjustment necessary as we are using all frames");
         }
 
 
@@ -591,7 +591,7 @@ angular.module('zmApp.controllers')
     // This is what the pullup bar calls depending on what range is specified
     //--------------------------------------------------------------------------
     $scope.showEvents = function (val, unit, monitorId) {
-        ZMDataModel.zmDebug("ShowEvents called with val:" + val + " unit:" + unit + " for Monitor:" + monitorId);
+        NVRDataModel.debug("ShowEvents called with val:" + val + " unit:" + unit + " for Monitor:" + monitorId);
 
         $ionicHistory.nextViewOptions({
             disableBack: true
@@ -608,8 +608,8 @@ angular.module('zmApp.controllers')
         $rootScope.fromDate = $rootScope.fromTime;
         $rootScope.toDate = $rootScope.toTime;
 
-        ZMDataModel.zmDebug("From: " + $rootScope.fromTime);
-        ZMDataModel.zmDebug("To: " + $rootScope.toTime);
+        NVRDataModel.debug("From: " + $rootScope.fromTime);
+        NVRDataModel.debug("To: " + $rootScope.toTime);
 
         //$rootScope.fromDate = fromDate.toDate();
         //$rootScope.toDate = toDate.toDate();
@@ -658,10 +658,10 @@ angular.module('zmApp.controllers')
     $scope.deleteEvent = function (id, itemid) {
         //$scope.eventList.showDelete = false;
         //curl -XDELETE http://server/zm/api/events/1.json
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var apiDelete = loginData.apiurl + "/events/" + id + ".json";
-        ZMDataModel.zmDebug("DeleteEvent: ID=" + id + " item=" + itemid);
-        ZMDataModel.zmLog("Delete event " + apiDelete);
+        NVRDataModel.debug("DeleteEvent: ID=" + id + " item=" + itemid);
+        NVRDataModel.log("Delete event " + apiDelete);
 
         $ionicLoading.show({
             template: "{{'kDeletingEvent' | translate}}...",
@@ -672,8 +672,8 @@ angular.module('zmApp.controllers')
         $http.delete(apiDelete)
             .success(function (data) {
                 $ionicLoading.hide();
-                ZMDataModel.zmDebug("delete success: " + JSON.stringify(data));
-                ZMDataModel.displayBanner('info', [$translate.instant('kDeleteEventSuccess')], 2000, 2000);
+                NVRDataModel.debug("delete success: " + JSON.stringify(data));
+                NVRDataModel.displayBanner('info', [$translate.instant('kDeleteEventSuccess')], 2000, 2000);
 
                 $scope.events.splice(itemid, 1);
                 //doRefresh();
@@ -681,8 +681,8 @@ angular.module('zmApp.controllers')
             })
             .error(function (data) {
                 $ionicLoading.hide();
-                ZMDataModel.zmDebug("delete error: " + JSON.stringify(data));
-                ZMDataModel.displayBanner('error', [$translate.instant('kDeleteEventError1'), $translate.instant('kDeleteEventError2')]);
+                NVRDataModel.debug("delete error: " + JSON.stringify(data));
+                NVRDataModel.displayBanner('error', [$translate.instant('kDeleteEventError1'), $translate.instant('kDeleteEventError2')]);
             });
 
 
@@ -694,8 +694,8 @@ angular.module('zmApp.controllers')
 
     $scope.filterTapped = function () {
         //console.log("FILTER TAPPED");
-        var myFrom = moment($rootScope.fromString).format("MMM/DD/YYYY " + ZMDataModel.getTimeFormat()).toString();
-        var toString = moment($rootScope.toString).format("MMM/DD/YYYY " + ZMDataModel.getTimeFormat()).toString();
+        var myFrom = moment($rootScope.fromString).format("MMM/DD/YYYY " + NVRDataModel.getTimeFormat()).toString();
+        var toString = moment($rootScope.toString).format("MMM/DD/YYYY " + NVRDataModel.getTimeFormat()).toString();
 
         $rootScope.zmPopup = $ionicPopup.confirm({
             title: $translate.instant('kFilterSettings'),
@@ -703,7 +703,7 @@ angular.module('zmApp.controllers')
         });
         $rootScope.zmPopup.then(function (res) {
             if (res) {
-                ZMDataModel.zmLog("Filter reset requested in popup");
+                NVRDataModel.log("Filter reset requested in popup");
                 $rootScope.isEventFilterOn = false;
                 $rootScope.fromDate = "";
                 $rootScope.fromTime = "";
@@ -718,7 +718,7 @@ angular.module('zmApp.controllers')
                     "id": 0
                 });
             } else {
-                ZMDataModel.zmLog("Filter reset cancelled in popup");
+                NVRDataModel.log("Filter reset cancelled in popup");
             }
         });
 
@@ -731,17 +731,17 @@ angular.module('zmApp.controllers')
 
     $scope.footerExpand = function () {
         //https://server/zm/api/events/consoleEvents/5%20minute.json
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
 
         var af = "/AlarmFrames >=: " + ld.enableAlarmCount;
 
         var apiurl = ld.apiurl + "/events/consoleEvents/1%20hour" + af + ".json";
-        ZMDataModel.zmDebug("consoleEvents API:" + apiurl);
+        NVRDataModel.debug("consoleEvents API:" + apiurl);
 
 
         $http.get(apiurl)
             .success(function (data) {
-                ZMDataModel.zmDebug(JSON.stringify(data));
+                NVRDataModel.debug(JSON.stringify(data));
                 $scope.hours = [];
                 var p = data.results;
                 for (var key in data.results) {
@@ -760,10 +760,10 @@ angular.module('zmApp.controllers')
                                 }
                             }
                         }
-                        //console.log(ZMDataModel.getMonitorName(key) + " -> " + p[key]);
+                        //console.log(NVRDataModel.getMonitorName(key) + " -> " + p[key]);
                         if (idfound)
                             $scope.hours.push({
-                                monitor: ZMDataModel.getMonitorName(key),
+                                monitor: NVRDataModel.getMonitorName(key),
                                 events: p[key],
                                 mid: key
                             });
@@ -774,10 +774,10 @@ angular.module('zmApp.controllers')
 
 
         apiurl = ld.apiurl + "/events/consoleEvents/1%20day" + af + ".json";
-        ZMDataModel.zmDebug("consoleEvents API:" + apiurl);
+        NVRDataModel.debug("consoleEvents API:" + apiurl);
         $http.get(apiurl)
             .success(function (data) {
-                ZMDataModel.zmDebug(JSON.stringify(data));
+                NVRDataModel.debug(JSON.stringify(data));
                 $scope.days = [];
                 var p = data.results;
                 for (var key in data.results) {
@@ -792,11 +792,11 @@ angular.module('zmApp.controllers')
                                 }
                             }
                         }
-                        //console.log(ZMDataModel.getMonitorName(key) + " -> " + p[key]);
+                        //console.log(NVRDataModel.getMonitorName(key) + " -> " + p[key]);
                         if (idfound)
-                        //console.log(ZMDataModel.getMonitorName(key) + " -> " + p[key]);
+                        //console.log(NVRDataModel.getMonitorName(key) + " -> " + p[key]);
                             $scope.days.push({
-                            monitor: ZMDataModel.getMonitorName(key),
+                            monitor: NVRDataModel.getMonitorName(key),
                             events: p[key],
                             mid: key
                         });
@@ -808,10 +808,10 @@ angular.module('zmApp.controllers')
 
 
         apiurl = ld.apiurl + "/events/consoleEvents/1%20week" + af + ".json";
-        ZMDataModel.zmDebug("consoleEvents API:" + apiurl);
+        NVRDataModel.debug("consoleEvents API:" + apiurl);
         $http.get(apiurl)
             .success(function (data) {
-                ZMDataModel.zmDebug(JSON.stringify(data));
+                NVRDataModel.debug(JSON.stringify(data));
                 $scope.weeks = [];
                 var p = data.results;
                 for (var key in data.results) {
@@ -827,11 +827,11 @@ angular.module('zmApp.controllers')
                                 }
                             }
                         }
-                        //console.log(ZMDataModel.getMonitorName(key) + " -> " + p[key]);
+                        //console.log(NVRDataModel.getMonitorName(key) + " -> " + p[key]);
                         if (idfound)
-                        //console.log(ZMDataModel.getMonitorName(key) + " -> " + p[key]);
+                        //console.log(NVRDataModel.getMonitorName(key) + " -> " + p[key]);
                             $scope.weeks.push({
-                            monitor: ZMDataModel.getMonitorName(key),
+                            monitor: NVRDataModel.getMonitorName(key),
                             events: p[key],
                             mid: key
                         });
@@ -842,17 +842,17 @@ angular.module('zmApp.controllers')
 
 
         apiurl = ld.apiurl + "/events/consoleEvents/1%20month" + af + ".json";
-        ZMDataModel.zmDebug("consoleEvents API:" + apiurl);
+        NVRDataModel.debug("consoleEvents API:" + apiurl);
         $http.get(apiurl)
             .success(function (data) {
-                ZMDataModel.zmDebug(JSON.stringify(data));
+                NVRDataModel.debug(JSON.stringify(data));
                 $scope.months = [];
                 var p = data.results;
                 for (var key in data.results) {
                     if (p.hasOwnProperty(key)) {
 
                         var idfound = true;
-                        var ld = ZMDataModel.getLogin();
+                        var ld = NVRDataModel.getLogin();
                         if (ld.persistMontageOrder) {
                             idfound = false;
                             for (var ii = 0; ii < $scope.monitors.length; ii++) {
@@ -862,11 +862,11 @@ angular.module('zmApp.controllers')
                                 }
                             }
                         }
-                        //console.log(ZMDataModel.getMonitorName(key) + " -> " + p[key]);
+                        //console.log(NVRDataModel.getMonitorName(key) + " -> " + p[key]);
                         if (idfound)
-                        //console.log(ZMDataModel.getMonitorName(key) + " -> " + p[key]);
+                        //console.log(NVRDataModel.getMonitorName(key) + " -> " + p[key]);
                             $scope.months.push({
-                            monitor: ZMDataModel.getMonitorName(key),
+                            monitor: NVRDataModel.getMonitorName(key),
                             events: p[key],
                             mid: key
                         });
@@ -899,7 +899,7 @@ angular.module('zmApp.controllers')
     // called when user switches to background
     //-------------------------------------------------------------------------
     function onPause() {
-        ZMDataModel.zmDebug("EventCtrl:onpause called");
+        NVRDataModel.debug("EventCtrl:onpause called");
         if ($scope.popover) $scope.popover.remove();
 
     }
@@ -929,7 +929,7 @@ angular.module('zmApp.controllers')
     // FIXME: Are we using this?
     //-------------------------------------------------------------------------
     $scope.disableSlide = function () {
-        ZMDataModel.zmDebug("EventCtrl:DisableSlide called");
+        NVRDataModel.debug("EventCtrl:DisableSlide called");
         $ionicSlideBoxDelegate.$getByHandle("eventSlideBox").enableSlide(false);
     };
 
@@ -963,7 +963,7 @@ angular.module('zmApp.controllers')
 
         if (oldEvent && event != oldEvent) {
 
-            ZMDataModel.zmDebug("EventCtrl:Old event scrub will hide now");
+            NVRDataModel.debug("EventCtrl:Old event scrub will hide now");
             oldEvent.Event.ShowScrub = false;
             oldEvent.Event.height = zm.eventsListDetailsHeight;
             oldEvent = "";
@@ -982,7 +982,7 @@ angular.module('zmApp.controllers')
                 event.Event.height = zm.eventsListDetailsHeight + zm.eventsListScrubHeight;
                 $ionicScrollDelegate.resize();
                 var myurl = loginData.apiurl + '/events/' + event.Event.Id + ".json";
-                ZMDataModel.zmLog("API for event details" + myurl);
+                NVRDataModel.log("API for event details" + myurl);
                 $http.get(myurl)
                     .success(function (data) {
                         $scope.FrameArray = data.event.Frame;
@@ -1020,15 +1020,15 @@ angular.module('zmApp.controllers')
                         //console.log (JSON.stringify(data));
                     })
                     .error(function (err) {
-                        ZMDataModel.zmLog("Error retrieving detailed frame API " + JSON.stringify(err));
-                        ZMDataModel.displayBanner('error', ['could not retrieve frame details', 'please try again']);
+                        NVRDataModel.log("Error retrieving detailed frame API " + JSON.stringify(err));
+                        NVRDataModel.displayBanner('error', ['could not retrieve frame details', 'please try again']);
                     });
 
             } // end of groupType == alarms
             else // groupType == scrub
             {
 
-                ZMDataModel.zmDebug("EventCtrl: Scrubbing will turn on now");
+                NVRDataModel.debug("EventCtrl: Scrubbing will turn on now");
                 $scope.currentEvent = "";
                 $scope.event = event;
                 //$ionicScrollDelegate.freezeScroll(true);
@@ -1042,7 +1042,7 @@ angular.module('zmApp.controllers')
                     callback: function (value, released) {
                         //console.log("CALLBACK"+value+released);
                         $ionicScrollDelegate.freezeScroll(!released);
-                        //ZMDataModel.zmDebug("EventCtrl: freezeScroll called with " + !released);
+                        //NVRDataModel.debug("EventCtrl: freezeScroll called with " + !released);
 
 
                     },
@@ -1080,7 +1080,7 @@ angular.module('zmApp.controllers')
                 var i;
 
                 if (event.Event.imageMode == 'path') {
-                    ZMDataModel.zmDebug("EventCtrl: found " + frames + " frames to scrub");
+                    NVRDataModel.debug("EventCtrl: found " + frames + " frames to scrub");
 
 
 
@@ -1098,7 +1098,7 @@ angular.module('zmApp.controllers')
                 } else // we need fids
                 {
                     var myurl_frames = loginData.apiurl + '/events/' + event.Event.Id + ".json";
-                    ZMDataModel.zmLog("API for event details" + myurl_frames);
+                    NVRDataModel.log("API for event details" + myurl_frames);
                     $http.get(myurl_frames)
                         .success(function (data) {
                             $scope.FrameArray = data.event.Frame;
@@ -1123,8 +1123,8 @@ angular.module('zmApp.controllers')
                             //console.log (JSON.stringify(data));
                         })
                         .error(function (err) {
-                            ZMDataModel.zmLog("Error retrieving detailed frame API " + JSON.stringify(err));
-                            ZMDataModel.displayBanner('error', [$translate.instant('kErrorFrameBanner'), $translate.instant('kErrorPleaseTryAgain')]);
+                            NVRDataModel.log("Error retrieving detailed frame API " + JSON.stringify(err));
+                            NVRDataModel.displayBanner('error', [$translate.instant('kErrorFrameBanner'), $translate.instant('kErrorPleaseTryAgain')]);
                         });
 
                 }
@@ -1132,7 +1132,7 @@ angular.module('zmApp.controllers')
 
 
                 // now get event details to show alarm frames
-                loginData = ZMDataModel.getLogin();
+                loginData = NVRDataModel.getLogin();
 
                 if (typeof event.Event.DefaultVideo === 'undefined')
                     event.Event.DefaultVideo = "";
@@ -1162,7 +1162,7 @@ angular.module('zmApp.controllers')
 
 
                 var myurl2 = loginData.apiurl + '/events/' + event.Event.Id + ".json";
-                ZMDataModel.zmLog("API for event details" + myurl2);
+                NVRDataModel.log("API for event details" + myurl2);
                 $http.get(myurl2)
                     .success(function (data) {
                         $scope.FrameArray = data.event.Frame;
@@ -1187,8 +1187,8 @@ angular.module('zmApp.controllers')
                         //console.log (JSON.stringify(data));
                     })
                     .error(function (err) {
-                        ZMDataModel.zmLog("Error retrieving detailed frame API " + JSON.stringify(err));
-                        ZMDataModel.displayBanner('error', [$translate.instant('kErrorFrameBanner'), $translate.instant('kErrorPleaseTryAgain')]);
+                        NVRDataModel.log("Error retrieving detailed frame API " + JSON.stringify(err));
+                        NVRDataModel.displayBanner('error', [$translate.instant('kErrorFrameBanner'), $translate.instant('kErrorPleaseTryAgain')]);
                     });
 
 
@@ -1289,7 +1289,7 @@ angular.module('zmApp.controllers')
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
         //  console.log("**VIEW ** Events Ctrl Entered");
-        ZMDataModel.setAwake(false);
+        NVRDataModel.setAwake(false);
 
         EventServer.sendMessage('push', {
             type: 'badge',
@@ -1309,7 +1309,7 @@ angular.module('zmApp.controllers')
             $cordovaBadge.set(0).then(function () {
                 // You have permission, badge set.
             }, function (err) {
-                ZMDataModel.zmDebug("app does not have badge permissions. Please check your phone notification settings");
+                NVRDataModel.debug("app does not have badge permissions. Please check your phone notification settings");
                 // You do not have permission.
             });
 
@@ -1370,7 +1370,7 @@ angular.module('zmApp.controllers')
 
     function computeRelativePath(event) {
         var relativePath = "";
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
         var yy = moment(str).format('YY');
         var mm = moment(str).format('MM');
@@ -1395,7 +1395,7 @@ angular.module('zmApp.controllers')
 
     function computeBasePath(event) {
         var basePath = "";
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
         var yy = moment(str).format('YY');
         var mm = moment(str).format('MM');
@@ -1455,7 +1455,7 @@ angular.module('zmApp.controllers')
 
         if (m.id != 'footage')
             return;
-        ZMDataModel.zmDebug("Rebinding watchers of eventCtrl");
+        NVRDataModel.debug("Rebinding watchers of eventCtrl");
         setupWatchers();
 
         //console.log ("************** FOOTAGE CLOSED");
@@ -1472,14 +1472,14 @@ angular.module('zmApp.controllers')
 
     $scope.openModal = function (event) {
 
-        ZMDataModel.zmDebug("unbinding eventCtrl watchers as modal has its own");
+        NVRDataModel.debug("unbinding eventCtrl watchers as modal has its own");
         ionRangeWatcher();
         mycarouselWatcher();
-        //ZMDataModel.zmDebug("EventCtrl: Open Modal with Base path " + relativepath);
+        //NVRDataModel.debug("EventCtrl: Open Modal with Base path " + relativepath);
 
         $scope.event = event;
 
-        ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
+        NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
 
         $scope.currentEvent = event;
         $scope.followSameMonitor = ($stateParams.id == "0") ? "0" : "1";
@@ -1502,7 +1502,7 @@ angular.module('zmApp.controllers')
 
                 $scope.modal.show();
 
-                var ld = ZMDataModel.getLogin();
+                var ld = NVRDataModel.getLogin();
 
 
 
@@ -1515,8 +1515,8 @@ angular.module('zmApp.controllers')
     // it on open
     //--------------------------------------------------------
     $scope.closeModal = function () {
-        ZMDataModel.zmDebug(">>>EventCtrl:Close & Destroy Modal");
-        ZMDataModel.setAwake(false);
+        NVRDataModel.debug(">>>EventCtrl:Close & Destroy Modal");
+        NVRDataModel.setAwake(false);
         if ($scope.modal !== undefined) {
             $scope.modal.remove();
         }
@@ -1600,16 +1600,16 @@ angular.module('zmApp.controllers')
             loadingStr = "none";
         }
 
-        ZMDataModel.getEvents($scope.id, eventsPage, loadingStr, $rootScope.fromString, $rootScope.toString)
+        NVRDataModel.getEvents($scope.id, eventsPage, loadingStr, $rootScope.fromString, $rootScope.toString)
             .then(function (data) {
-                    var loginData = ZMDataModel.getLogin();
+                    var loginData = NVRDataModel.getLogin();
                     // console.log("Got new page of events with Page=" + eventsPage);
                     var myevents = data;
 
                     for (var i = 0; i < myevents.length; i++) {
 
                         var idfound = true;
-                        var ld = ZMDataModel.getLogin();
+                        var ld = NVRDataModel.getLogin();
 
                         if (ld.persistMontageOrder) {
                             idfound = false;
@@ -1626,12 +1626,12 @@ angular.module('zmApp.controllers')
 
                         
                         myevents[i].Event.humanizeTime = humanizeTime(myevents[i].Event.StartTime);
-                        myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId);
+                        myevents[i].Event.MonitorName = NVRDataModel.getMonitorName(myevents[i].Event.MonitorId);
                         // now construct base path
 
-                        myevents[i].Event.streamingURL = ZMDataModel.getStreamingURL(myevents[i].Event.MonitorId);
-                        myevents[i].Event.baseURL = ZMDataModel.getBaseURL(myevents[i].Event.MonitorId);
-                        myevents[i].Event.imageMode = ZMDataModel.getImageMode(myevents[i].Event.MonitorId);
+                        myevents[i].Event.streamingURL = NVRDataModel.getStreamingURL(myevents[i].Event.MonitorId);
+                        myevents[i].Event.baseURL = NVRDataModel.getBaseURL(myevents[i].Event.MonitorId);
+                        myevents[i].Event.imageMode = NVRDataModel.getImageMode(myevents[i].Event.MonitorId);
                         // console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL);
 
                         //  console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.baseURL);
@@ -1664,12 +1664,12 @@ angular.module('zmApp.controllers')
     $scope.toggleMinAlarmFrameCount = function () {
 
 
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
 
         console.log("Toggling " + ld.enableAlarmCount);
         ld.enableAlarmCount = !ld.enableAlarmCount;
-        ZMDataModel.setLogin(ld);
-        $scope.loginData = ZMDataModel.getLogin();
+        NVRDataModel.setLogin(ld);
+        $scope.loginData = NVRDataModel.getLogin();
         doRefresh();
     };
 
@@ -1698,16 +1698,16 @@ angular.module('zmApp.controllers')
     }
 
     $scope.prettifyTime = function (str) {
-        return moment(str).format(ZMDataModel.getTimeFormat());
+        return moment(str).format(NVRDataModel.getTimeFormat());
     };
 
     $scope.prettifyTimeSec = function (str) {
-        return moment(str).format(ZMDataModel.getTimeFormatSec());
+        return moment(str).format(NVRDataModel.getTimeFormatSec());
     };
 
 
     $scope.prettify = function (str) {
-        return moment(str).format(ZMDataModel.getTimeFormat() + ', MMMM Do YYYY');
+        return moment(str).format(NVRDataModel.getTimeFormat() + ', MMMM Do YYYY');
     };
     //--------------------------------------------------------
     // For consistency we are keeping the refresher list
@@ -1729,14 +1729,14 @@ angular.module('zmApp.controllers')
     function doRefresh() {
         // console.log("***Pull to Refresh");
 
-        ZMDataModel.zmDebug("Reloading monitors");
-        var refresh = ZMDataModel.getMonitors(1);
+        NVRDataModel.debug("Reloading monitors");
+        var refresh = NVRDataModel.getMonitors(1);
         refresh.then(function (data) {
 
-            var ld = ZMDataModel.getLogin();
+            var ld = NVRDataModel.getLogin();
             if (ld.persistMontageOrder) {
                 var tempMon = data;
-                $scope.monitors = ZMDataModel.applyMontageMonitorPrefs(tempMon, 2)[0];
+                $scope.monitors = NVRDataModel.applyMontageMonitorPrefs(tempMon, 2)[0];
             } else {
                 $scope.monitors = data;
             }
diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js
index 6337ea6b..ee614e52 100644
--- a/www/js/EventDateTimeFilterCtrl.js
+++ b/www/js/EventDateTimeFilterCtrl.js
@@ -5,7 +5,7 @@
 
 
 angular.module('zmApp.controllers')
-    .controller('zmApp.EventDateTimeFilterCtrl', ['$scope', '$ionicSlideBoxDelegate', '$ionicSideMenuDelegate', '$rootScope', '$ionicHistory', 'ZMDataModel', '$state', function ($scope, $ionicScrollDelegate, $ionicSideMenuDelegate, $rootScope, $ionicHistory, ZMDataModel, $state) {
+    .controller('zmApp.EventDateTimeFilterCtrl', ['$scope', '$ionicSlideBoxDelegate', '$ionicSideMenuDelegate', '$rootScope', '$ionicHistory', 'NVRDataModel', '$state', function ($scope, $ionicScrollDelegate, $ionicSideMenuDelegate, $rootScope, $ionicHistory, NVRDataModel, $state) {
 
             //----------------------------------------------------------------
             // Alarm notification handling
@@ -60,19 +60,19 @@ angular.module('zmApp.controllers')
                 if (!$rootScope.fromDate) {
                     //console.log("RESET fromDate");
                     $rootScope.fromDate = new Date();
-                    ZMDataModel.zmDebug("DateTimeFilter: resetting from date");
+                    NVRDataModel.debug("DateTimeFilter: resetting from date");
                 }
 
                 if (!$rootScope.toDate) {
                     // console.log("RESET toDate");
                     $rootScope.toDate = new Date();
-                    ZMDataModel.zmDebug("DateTimeFilter: resetting to date");
+                    NVRDataModel.debug("DateTimeFilter: resetting to date");
                 }
 
                 if (!$rootScope.fromTime) {
                     // console.log("RESET fromTime");
                     $rootScope.fromTime = new Date(99, 5, 24, 0, 0, 0, 0); //moment().format("hh:mm:ss");
-                    ZMDataModel.zmDebug("DateTimeFilter: resetting from time");
+                    NVRDataModel.debug("DateTimeFilter: resetting from time");
                 }
 
 
@@ -80,7 +80,7 @@ angular.module('zmApp.controllers')
                     //console.log("RESET toTime");
                     $rootScope.toTime = new Date(99, 5, 24, 23, 59, 59, 0);
                     //$rootScope.toTime = "01:01:02"; //moment().format("hh:mm:ss");
-                    ZMDataModel.zmDebug("DateTimeFilter: resetting to time");
+                    NVRDataModel.debug("DateTimeFilter: resetting to time");
                 }
 
 
@@ -92,7 +92,7 @@ angular.module('zmApp.controllers')
                 //console.log("CONCAT DATES " + temp);
                 //
                 // var startDate = moment(temp).format("YYYY-MM-DD hh:mm:ss");
-                ZMDataModel.zmDebug("DateTimeFilter: From/To is now: " + $rootScope.fromString + " & " + $rootScope.toString);
+                NVRDataModel.debug("DateTimeFilter: From/To is now: " + $rootScope.fromString + " & " + $rootScope.toString);
                 $ionicHistory.goBack();
             };
 
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 8ebf1f1b..6bafcf5e 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -6,14 +6,14 @@
 
 
 
-angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$rootScope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', '$translate', function ($scope, $rootScope, zm, ZMDataModel, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup, $translate) {
+angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$rootScope', 'zm', 'NVRDataModel', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', '$translate', function ($scope, $rootScope, zm, NVRDataModel, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup, $translate) {
 
 
     // from parent scope
     var currentEvent = $scope.currentEvent;
     var nphTimer;
     var eventQueryHandle;
-    $scope.loginData = ZMDataModel.getLogin();
+    $scope.loginData = NVRDataModel.getLogin();
     $scope.currentRate = '-';
     var timeFormat = 'MM/DD/YYYY HH:mm:ss';
 
@@ -39,11 +39,11 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     $scope.sliderProgress = {
         progress: 0
     };
-    ZMDataModel.getKeyConfigParams(0)
+    NVRDataModel.getKeyConfigParams(0)
         .then(function (data) {
             //console.log ("***GETKEY: " + JSON.stringify(data));
             eventImageDigits = parseInt(data);
-            ZMDataModel.zmLog("Image padding digits reported as " + eventImageDigits);
+            NVRDataModel.log("Image padding digits reported as " + eventImageDigits);
         });
 
     $scope.animationInProgress = false;
@@ -72,34 +72,34 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         maxWidth: 300,
         showDelay: 0
     });
-    var ld = ZMDataModel.getLogin();
+    var ld = NVRDataModel.getLogin();
 
 
     $scope.currentStreamMode = ld.gapless ? 'gapless' : 'single';
-    ZMDataModel.zmLog("Using stream mode " + $scope.currentStreamMode);
+    NVRDataModel.log("Using stream mode " + $scope.currentStreamMode);
 
-    ZMDataModel.zmDebug("EventModalCtrl called from " + $ionicHistory.currentStateName());
+    NVRDataModel.debug("EventModalCtrl called from " + $ionicHistory.currentStateName());
     // This is not needed for event mode
 
 
 
-    ZMDataModel.zmDebug("Setting playback to " + $scope.streamMode);
+    NVRDataModel.debug("Setting playback to " + $scope.streamMode);
 
 
     $rootScope.validMonitorId = $scope.monitors[0].Monitor.Id;
-    ZMDataModel.getAuthKey($rootScope.validMonitorId, (Math.floor((Math.random() * 999999) + 1)).toString())
+    NVRDataModel.getAuthKey($rootScope.validMonitorId, (Math.floor((Math.random() * 999999) + 1)).toString())
         .then(function (success) {
                 $ionicLoading.hide();
                 $rootScope.authSession = success;
-                ZMDataModel.zmLog("Modal: Stream authentication construction: " + $rootScope.authSession);
+                NVRDataModel.log("Modal: Stream authentication construction: " + $rootScope.authSession);
 
             },
             function (error) {
 
                 $ionicLoading.hide();
-                ZMDataModel.zmDebug("ModalCtrl: Error details of stream auth:" + error);
+                NVRDataModel.debug("ModalCtrl: Error details of stream auth:" + error);
                 //$rootScope.authSession="";
-                ZMDataModel.zmLog("Modal: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
+                NVRDataModel.log("Modal: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
             });
 
 
@@ -111,8 +111,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     $rootScope.$on("auth-success", function () {
 
-        ZMDataModel.zmDebug("EventModalCtrl: Re-login detected, resetting everything & re-generating connkey");
-        ZMDataModel.stopNetwork("Auth-Success inside EventModalCtrl");
+        NVRDataModel.debug("EventModalCtrl: Re-login detected, resetting everything & re-generating connkey");
+        NVRDataModel.stopNetwork("Auth-Success inside EventModalCtrl");
         $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
         //console.log ("********* OFFSET FROM AUTH SUCC");
         $timeout(function () {
@@ -131,7 +131,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     $scope.togglePause = function () {
         $scope.isPaused = !$scope.isPaused;
-        ZMDataModel.zmDebug("Paused is " + $scope.isPaused);
+        NVRDataModel.debug("Paused is " + $scope.isPaused);
 
 
         sendCommand($scope.isPaused ? '1' : '2', $scope.connKey);
@@ -170,7 +170,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
 
 
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         //console.log("Sending CGI command to " + loginData.url);
         var rqtoken = rq ? rq : "stream";
         var myauthtoken = $rootScope.authSession.replace("&auth=", "");
@@ -209,14 +209,14 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                 }
             })
             .then(function (resp) {
-                    ZMDataModel.zmDebug("sendCmd response:" + JSON.stringify(resp));
+                    NVRDataModel.debug("sendCmd response:" + JSON.stringify(resp));
                     d.resolve(resp);
                     return (d.promise);
 
 
                 },
                 function (resp) {
-                    ZMDataModel.zmDebug("sendCmd error:" + JSON.stringify(resp));
+                    NVRDataModel.debug("sendCmd error:" + JSON.stringify(resp));
                     d.reject(resp);
                     return (d.promise);
                 });
@@ -232,7 +232,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             return;
         }
 
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         //console.log("sending process Event command to " + loginData.url);
         var myauthtoken = $rootScope.authSession.replace("&auth=", "");
         //&auth=
@@ -266,7 +266,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         });
 
         req.success(function (resp) {
-            // ZMDataModel.zmDebug ("processEvent success:"+JSON.stringify(resp));
+            // NVRDataModel.debug ("processEvent success:"+JSON.stringify(resp));
 
             if (resp.result == "Ok") {
 
@@ -293,7 +293,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             } else // resp.result was messed up
 
             {
-                ZMDataModel.zmDebug("Hmm I found an error " + JSON.stringify(resp));
+                NVRDataModel.debug("Hmm I found an error " + JSON.stringify(resp));
                 //window.stop();
                 $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
 
@@ -301,14 +301,14 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                 $timeout(function () {
                     sendCommand('14', $scope.connKey, '&offset=' + $scope.currentProgress.progress);
                 }, 500);
-                ZMDataModel.zmDebug("so I'm regenerating Connkey to " + $scope.connKey);
+                NVRDataModel.debug("so I'm regenerating Connkey to " + $scope.connKey);
                 //eventQueryHandle  =  $timeout (function(){checkEvent();}, zm.eventPlaybackQuery);
             }
         });
 
 
         req.error(function (resp) {
-            ZMDataModel.zmDebug("processEvent error:" + JSON.stringify(resp));
+            NVRDataModel.debug("processEvent error:" + JSON.stringify(resp));
             //eventQueryHandle  =  $timeout (function(){checkEvent();}, zm.eventPlaybackQuery);
 
         });
@@ -323,13 +323,13 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
         // FIXME: Do I need to  setAwake(false) here?
         $interval.cancel(eventQueryHandle);
-        ZMDataModel.zmLog("EventModalCtrl: paused, killing timer");
+        NVRDataModel.log("EventModalCtrl: paused, killing timer");
 
     }
 
 
     function onResume() {
-        ZMDataModel.zmDebug("EventModalCtrl: Modal resume called");
+        NVRDataModel.debug("EventModalCtrl: Modal resume called");
 
 
         $rootScope.modalRand = Math.floor((Math.random() * 100000) + 1);
@@ -382,7 +382,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             noBackdrop: true,
             duration: 1000
         });
-        ZMDataModel.zmDebug("ModalCtrl:Photo saved successfuly");
+        NVRDataModel.debug("ModalCtrl:Photo saved successfuly");
     }
 
     function SaveError(e) {
@@ -391,7 +391,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             noBackdrop: true,
             duration: 2000
         });
-        ZMDataModel.zmLog("Error saving image: " + e.message);
+        NVRDataModel.log("Error saving image: " + e.message);
         //console.log("***ERROR");
     }
 
@@ -409,7 +409,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     $scope.saveEventImageToPhone = function (onlyAlarms) {
 
         if ($scope.loginData.useNphZmsForEvents) {
-            ZMDataModel.zmLog("Use ZMS stream to save to phone");
+            NVRDataModel.log("Use ZMS stream to save to phone");
             saveEventImageToPhoneZms(onlyAlarms);
 
 
@@ -441,7 +441,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                 $scope.slides = [];
 
                 var apiurl = $scope.loginData.apiurl + "/events/" + $scope.eventId + ".json";
-                ZMDataModel.zmDebug("prepared to get frame details using " + apiurl);
+                NVRDataModel.debug("prepared to get frame details using " + apiurl);
                 $http.get(apiurl)
                     .then(function (success) {
 
@@ -498,7 +498,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                         },
                         function (err) {
                             $ionicLoading.hide();
-                            ZMDataModel.zmLog("snapshot API Error: Could not get frames " + JSON.stringify(err));
+                            NVRDataModel.log("snapshot API Error: Could not get frames " + JSON.stringify(err));
 
                             $ionicLoading.show({
                                 template: $translate.instant('kErrorRetrievingFrames'),
@@ -509,7 +509,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             },
 
             function (err) {
-                ZMDataModel.zmDebug("Error pausing stream before snapshot " + JSON.stringify(err));
+                NVRDataModel.debug("Error pausing stream before snapshot " + JSON.stringify(err));
                 $ionicLoading.hide();
             }
 
@@ -526,9 +526,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         //console.log("Your index is  " + $scope.mycarousel.index);
         //console.log("Associated image is " + $scope.slides[$scope.mycarousel.index].img);
 
-        ZMDataModel.zmDebug("ModalCtrl: SaveEventImageToPhone called");
+        NVRDataModel.debug("ModalCtrl: SaveEventImageToPhone called");
         var canvas, context, imageDataUrl, imageData;
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
 
 
         // for alarms only
@@ -557,7 +557,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                     onTap: function (e) {
                         if ($scope.slideIndex > 0) $scope.slideIndex--;
                         $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&path=" + $scope.relativePath + $scope.slides[$scope.slideIndex].img;
-                        //ZMDataModel.zmLog("selected frame is " + $scope.slideIndex);
+                        //NVRDataModel.log("selected frame is " + $scope.slideIndex);
 
                         e.preventDefault();
                     }
@@ -569,7 +569,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                     onTap: function (e) {
                         if ($scope.slideIndex < $scope.slideLastIndex) $scope.slideIndex++;
                         $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&path=" + $scope.relativePath + $scope.slides[$scope.slideIndex].img;
-                        //ZMDataModel.zmLog("selected frame is " + $scope.slideIndex);
+                        //NVRDataModel.log("selected frame is " + $scope.slideIndex);
                         e.preventDefault();
                     }
                 },
@@ -584,7 +584,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                         $scope.slideIndex = tempVar;
 
                         $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&path=" + $scope.relativePath + $scope.slides[$scope.slideIndex].img;
-                        //ZMDataModel.zmLog("selected frame is " + $scope.slideIndex);
+                        //NVRDataModel.log("selected frame is " + $scope.slideIndex);
 
                         e.preventDefault();
                     }
@@ -600,7 +600,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                         $scope.slideIndex = tempVar;
                         if ($scope.slideIndex < $scope.slideLastIndex) $scope.slideIndex++;
                         $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&path=" + $scope.relativePath + $scope.slides[$scope.slideIndex].img;
-                        //ZMDataModel.zmLog("selected frame is " + $scope.slideIndex);
+                        //NVRDataModel.log("selected frame is " + $scope.slideIndex);
                         e.preventDefault();
                     }
                 },
@@ -626,7 +626,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                 duration: zm.httpTimeout
             });
             var url = $scope.selectEventUrl;
-            ZMDataModel.zmLog("saveNow: File path to grab is " + url);
+            NVRDataModel.log("saveNow: File path to grab is " + url);
 
             var img = new Image();
             img.onload = function () {
@@ -679,7 +679,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
 
     $scope.reloadView = function () {
-        ZMDataModel.zmLog("Reloading view for modal view, recomputing rand");
+        NVRDataModel.log("Reloading view for modal view, recomputing rand");
         $rootScope.modalRand = Math.floor((Math.random() * 100000) + 1);
         $scope.isModalActive = true;
     };
@@ -704,8 +704,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             return;
 
         $scope.videoIsReady = false;
-        var ld = ZMDataModel.getLogin();
-        $scope.loginData = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
+        $scope.loginData = NVRDataModel.getLogin();
 
         $scope.singleImageQuality = ld.singleImageQuality;
         $scope.blockSlider = false;
@@ -715,13 +715,13 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
 
         //$scope.commandURL = $scope.currentEvent.Event.baseURL+"/index.php";
-        // ZMDataModel.zmLog (">>>>>>>>>>>>>>>>>>ZMS url command is " + $scope.commandURL);
+        // NVRDataModel.log (">>>>>>>>>>>>>>>>>>ZMS url command is " + $scope.commandURL);
 
         currentEvent = $scope.currentEvent;
 
         //console.log("Current Event " + JSON.stringify(currentEvent));
         $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
-        ZMDataModel.zmDebug("Generated Connkey:" + $scope.connKey);
+        NVRDataModel.debug("Generated Connkey:" + $scope.connKey);
 
         $scope.currentFrame = 1;
         $scope.isPaused = false;
@@ -735,7 +735,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                 $timeout(function () {
 
                     if ($scope.modal != undefined && $scope.modal.isShown()) {
-                        ZMDataModel.zmLog(">>>Starting checkAllEvents interval...");
+                        NVRDataModel.log(">>>Starting checkAllEvents interval...");
 
                         //eventQueryHandle  = $timeout (checkEvent(), zm.eventPlaybackQuery);
 
@@ -745,7 +745,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                             //  console.log ("Refreshing Image...");
                         }.bind(this), zm.eventPlaybackQuery);
                     } else {
-                        ZMDataModel.zmLog(">>>Modal was exited, not starting checkAllEvents");
+                        NVRDataModel.log(">>>Modal was exited, not starting checkAllEvents");
                     }
 
                 }, 5000);
@@ -828,9 +828,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
         $scope.isModalActive = false;
 
-        ZMDataModel.zmDebug("Modal removed - killing connkey");
+        NVRDataModel.debug("Modal removed - killing connkey");
         sendCommand(17, $scope.connKey);
-        //$timeout (function(){ZMDataModel.stopNetwork("Modal removed inside EventModalCtrl");},400);
+        //$timeout (function(){NVRDataModel.stopNetwork("Modal removed inside EventModalCtrl");},400);
 
         // Execute action
     });
@@ -849,7 +849,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             return;
         }
 
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
 
         if (ld.useNphZmsForEvents) {
 
@@ -886,7 +886,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                     },
                     function (err) {
                         $ionicLoading.hide();
-                        ZMDataModel.zmDebug("Error in adjust speed: " + JSON.stringify(err));
+                        NVRDataModel.debug("Error in adjust speed: " + JSON.stringify(err));
                     }
                 );
 
@@ -920,7 +920,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                 default:
 
             }
-            ZMDataModel.zmDebug("Set playback speed to " + $scope.eventSpeed);
+            NVRDataModel.debug("Set playback speed to " + $scope.eventSpeed);
 
             $ionicLoading.show({
                 template: $translate.instant('kPlaybackInterval') + ': ' + $scope.eventSpeed.toFixed(3) + "ms",
@@ -940,11 +940,11 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     $scope.toggleGapless = function () {
         // console.log(">>>>>>>>>>>>>>GAPLESS TOGGLE INSIDE MODAL");
         $scope.loginData.gapless = !$scope.loginData.gapless;
-        ZMDataModel.setLogin($scope.loginData);
+        NVRDataModel.setLogin($scope.loginData);
 
-        ZMDataModel.zmDebug("EventModalCtrl: gapless has changed resetting everything & re-generating connkey");
-        ZMDataModel.stopNetwork("EventModalCtrl-toggle gapless");
-        ZMDataModel.zmDebug("Regenerating connkey as gapless has changed");
+        NVRDataModel.debug("EventModalCtrl: gapless has changed resetting everything & re-generating connkey");
+        NVRDataModel.stopNetwork("EventModalCtrl-toggle gapless");
+        NVRDataModel.debug("Regenerating connkey as gapless has changed");
         // console.log ("********* OFFSET FROM TOGGLE GAPLESS");
         $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
         $timeout(function () {
@@ -961,7 +961,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     function neighborEvents(eid) {
         var d = $q.defer();
         // now get event details to show alarm frames
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var myurl = loginData.apiurl + '/events/' + eid + ".json";
         var neighbors = {
             prev: "",
@@ -973,14 +973,14 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                 // In Timeline view, gapless should stick to the same monitor
                 if ($scope.followSameMonitor == "1") // we are viewing only one monitor
                 {
-                    ZMDataModel.zmDebug("Getting next event for same monitor Id ");
+                    NVRDataModel.debug("Getting next event for same monitor Id ");
                     neighbors.prev = data.event.Event.PrevOfMonitor ? data.event.Event.PrevOfMonitor : "";
                     neighbors.next = data.event.Event.NextOfMonitor ? data.event.Event.NextOfMonitor : "";
                 } else {
                     neighbors.prev = data.event.Event.Prev ? data.event.Event.Prev : "";
                     neighbors.next = data.event.Event.Next ? data.event.Event.Next : "";
                 }
-                ZMDataModel.zmDebug("Neighbor events of " + eid + "are Prev:" +
+                NVRDataModel.debug("Neighbor events of " + eid + "are Prev:" +
                     neighbors.prev + " and Next:" + neighbors.next);
 
 
@@ -988,7 +988,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                 return (d.promise);
             })
             .error(function (err) {
-                ZMDataModel.zmLog("Error retrieving neighbors" + JSON.stringify(err));
+                NVRDataModel.log("Error retrieving neighbors" + JSON.stringify(err));
                 d.reject(neighbors);
                 return (d.promise);
 
@@ -1002,13 +1002,13 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     $scope.zoomImage = function (val) {
         var zl = parseInt($ionicScrollDelegate.$getByHandle("imgscroll").getScrollPosition().zoom);
         if (zl == 1 && val == -1) {
-            ZMDataModel.zmDebug("Already zoomed out max");
+            NVRDataModel.debug("Already zoomed out max");
             return;
         }
 
 
         zl += val;
-        ZMDataModel.zmDebug("Zoom level is " + zl);
+        NVRDataModel.debug("Zoom level is " + zl);
         $ionicScrollDelegate.$getByHandle("imgscroll").zoomTo(zl, true);
 
     };
@@ -1020,7 +1020,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     $scope.onSwipeEvent = function (eid, dirn) {
         //console.log("HERE");
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
         if (!ld.canSwipeMonitors) return;
 
         if ($ionicScrollDelegate.$getByHandle("imgscroll").getScrollPosition().zoom != 1) {
@@ -1029,7 +1029,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         }
 
         if (ld.useNphZmsForEvents) {
-            ZMDataModel.zmLog("using zms to move ");
+            NVRDataModel.log("using zms to move ");
             jumpToEventZms($scope.connKey, dirn);
             // sendCommand ( dirn==1?'13':'12',$scope.connKey);
 
@@ -1044,9 +1044,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     $scope.jumpToEvent = function (eid, dirn) {
         // console.log("jumptoevent");
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
         if (ld.useNphZmsForEvents) {
-            ZMDataModel.zmLog("using zms to move ");
+            NVRDataModel.log("using zms to move ");
             jumpToEventZms($scope.connKey, dirn);
             // sendCommand ( dirn==1?'13':'12',$scope.connKey);
 
@@ -1057,7 +1057,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     };
 
     function jumpToEvent(eid, dirn) {
-        ZMDataModel.zmLog("Event jump called with:" + eid);
+        NVRDataModel.log("Event jump called with:" + eid);
         if (eid == "") {
             $ionicLoading.show({
                 template: $translate.instant('kNoMoreEvents'),
@@ -1084,8 +1084,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
         function outWithOld() {
 
-            ZMDataModel.zmLog("ModalCtrl:Stopping network pull...");
-            ZMDataModel.stopNetwork("EventModalCtrl-out with old");
+            NVRDataModel.log("ModalCtrl:Stopping network pull...");
+            NVRDataModel.stopNetwork("EventModalCtrl-out with old");
             $scope.animationInProgress = true;
             // give digest time for image to swap
             // 100 should be enough
@@ -1130,7 +1130,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         }
         var cmd = dirn == 1 ? '13' : '12';
         $scope.d_eventId = "...";
-        ZMDataModel.zmDebug("Sending " + cmd + " to " + connkey);
+        NVRDataModel.debug("Sending " + cmd + " to " + connkey);
 
         $ionicLoading.show({
             template: $translate.instant('kSwitchingEvents') + "...",
@@ -1147,14 +1147,14 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                 },
                 function (error) {
 
-                    ZMDataModel.zmDebug("Hmm jump  error " + JSON.stringify(error));
-                    ZMDataModel.stopNetwork("EventModalCtrl-jumptoEventZms error");
+                    NVRDataModel.debug("Hmm jump  error " + JSON.stringify(error));
+                    NVRDataModel.stopNetwork("EventModalCtrl-jumptoEventZms error");
                     $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
                     //  console.log ("********* OFFSET FROM JUMPTOEVENTZMS ERROR");
                     $timeout(function () {
                         sendCommand('14', $scope.connKey, '&offset=' + $scope.currentProgress.progress);
                     }, 500);
-                    ZMDataModel.zmDebug("so I'm regenerating Connkey to " + $scope.connKey);
+                    NVRDataModel.debug("so I'm regenerating Connkey to " + $scope.connKey);
                     //$timeout.cancel(eventQueryHandle);
                     // eventQueryHandle  =  $timeout (function(){checkEvent();}, zm.eventPlaybackQuery);
                     $ionicLoading.hide();
@@ -1200,7 +1200,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     function computeRelativePath(event) {
         var relativePath = "";
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
         var yy = moment(str).format('YY');
         var mm = moment(str).format('MM');
@@ -1225,7 +1225,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     function computeBasePath(event) {
         var basePath = "";
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
         var yy = moment(str).format('YY');
         var mm = moment(str).format('MM');
@@ -1256,7 +1256,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     function playbackFinished() {
         // currentEvent is updated with the currently playing event in prepareModalEvent()
-        ZMDataModel.zmLog("Playback of event " + currentEvent.Event.Id + " is finished");
+        NVRDataModel.log("Playback of event " + currentEvent.Event.Id + " is finished");
 
         if ($scope.loginData.gapless) {
 
@@ -1267,16 +1267,16 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                         $timeout(function () {
                             $scope.nextId = success.next;
                             $scope.prevId = success.prev;
-                            ZMDataModel.zmDebug("Gapless move to event " + $scope.nextId);
+                            NVRDataModel.debug("Gapless move to event " + $scope.nextId);
                             jumpToEvent($scope.nextId, 1);
                         }, 1000);
                     },
                     function (error) {
-                        ZMDataModel.zmDebug("Error in neighbor call " +
+                        NVRDataModel.debug("Error in neighbor call " +
                             JSON.stringify(error));
                     });
         } else {
-            ZMDataModel.zmDebug("not going to next event, gapless is off");
+            NVRDataModel.debug("not going to next event, gapless is off");
         }
     }
 
@@ -1296,9 +1296,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     function prepareModalEvent(eid) {
 
         // Lets get the detailed event API
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var myurl = loginData.apiurl + '/events/' + eid + ".json";
-        ZMDataModel.zmLog("*** Constructed API for detailed events: " + myurl);
+        NVRDataModel.log("*** Constructed API for detailed events: " + myurl);
         $scope.humanizeTime = "...";
         $scope.mName = "...";
         $http.get(myurl)
@@ -1312,10 +1312,10 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                     event.Event.BasePath = computeBasePath(event);
                     event.Event.relativePath = computeRelativePath(event);
 
-                    event.Event.streamingURL = ZMDataModel.getStreamingURL(event.Event.MonitorId);
-                    //  event.Event.baseURL = ZMDataModel.getBaseURL (event.Event.MonitorId);
+                    event.Event.streamingURL = NVRDataModel.getStreamingURL(event.Event.MonitorId);
+                    //  event.Event.baseURL = NVRDataModel.getBaseURL (event.Event.MonitorId);
                     event.Event.baseURL = loginData.url;
-                    event.Event.imageMode = ZMDataModel.getImageMode(event.Event.MonitorId);
+                    event.Event.imageMode = NVRDataModel.getImageMode(event.Event.MonitorId);
 
                     //console.log (JSON.stringify( success));
                     $scope.eventName = event.Event.Name;
@@ -1323,9 +1323,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                     $scope.d_eventId = $scope.eventId;
                     $scope.eFramesNum = event.Event.Frames;
                     $scope.eventDur = Math.round(event.Event.Length);
-                    $scope.loginData = ZMDataModel.getLogin();
+                    $scope.loginData = NVRDataModel.getLogin();
                     $scope.humanizeTime = humanizeTime(event.Event.StartTime);
-                    $scope.mName = ZMDataModel.getMonitorName(event.Event.MonitorId);
+                    $scope.mName = NVRDataModel.getMonitorName(event.Event.MonitorId);
                     //console.log (">>>>>>>>HUMANIZE " + $scope.humanizeTime);
 
                     //console.log("**** VIDEO STATE IS " + event.Event.DefaultVideo);
@@ -1369,7 +1369,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
                     //  console.log("************** VIDEO IS " + videoURL);
 
-                    ZMDataModel.zmDebug("Video url passed to player is: " + videoURL);
+                    NVRDataModel.debug("Video url passed to player is: " + videoURL);
 
                     // console.log (">>>>>>>>>>>>>"+loginData.url+"-VS-"+event.Event.baseURL);
 
@@ -1493,8 +1493,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                     }, 500);
                 },
                 function (err) {
-                    ZMDataModel.zmLog("Error retrieving detailed frame API " + JSON.stringify(err));
-                    ZMDataModel.displayBanner('error', ['could not retrieve frame details', 'please try again']);
+                    NVRDataModel.log("Error retrieving detailed frame API " + JSON.stringify(err));
+                    NVRDataModel.displayBanner('error', ['could not retrieve frame details', 'please try again']);
                 });
 
 
diff --git a/www/js/EventServer.js b/www/js/EventServer.js
index e4c4e7cb..04a3d72a 100644
--- a/www/js/EventServer.js
+++ b/www/js/EventServer.js
@@ -11,8 +11,8 @@
 
 angular.module('zmApp.controllers')
 
-.factory('EventServer', ['ZMDataModel', '$rootScope', '$websocket', '$ionicPopup', '$timeout', '$q', 'zm', '$ionicPlatform', '$cordovaMedia', '$translate', function
-    (ZMDataModel, $rootScope, $websocket, $ionicPopup, $timeout, $q, zm, $ionicPlatform, $cordovaMedia, $translate) {
+.factory('EventServer', ['NVRDataModel', '$rootScope', '$websocket', '$ionicPopup', '$timeout', '$q', 'zm', '$ionicPlatform', '$cordovaMedia', '$translate', function
+    (NVRDataModel, $rootScope, $websocket, $ionicPopup, $timeout, $q, zm, $ionicPlatform, $cordovaMedia, $translate) {
 
 
         var ws;
@@ -26,13 +26,13 @@ angular.module('zmApp.controllers')
         // called when the websocket is opened
         //--------------------------------------------------------------------------
         function openHandshake() {
-            var loginData = ZMDataModel.getLogin();
+            var loginData = NVRDataModel.getLogin();
             if (loginData.isUseEventServer == false || loginData.eventServer == "") {
-                ZMDataModel.zmLog("openHandShake: no event server");
+                NVRDataModel.log("openHandShake: no event server");
                 return;
             }
 
-            ZMDataModel.zmLog("openHandshake: Websocket open");
+            NVRDataModel.log("openHandshake: Websocket open");
             ws.$emit('auth', {
                 user: loginData.username,
                 password: loginData.password
@@ -40,12 +40,12 @@ angular.module('zmApp.controllers')
 
             if ($rootScope.apnsToken != '') {
                 var plat = $ionicPlatform.is('ios') ? 'ios' : 'android';
-                var ld = ZMDataModel.getLogin();
+                var ld = NVRDataModel.getLogin();
                 var pushstate = "enabled";
                 if (ld.disablePush == true)
                     pushstate = "disabled";
 
-                ZMDataModel.zmDebug("openHandShake: state of push is " + pushstate);
+                NVRDataModel.debug("openHandShake: state of push is " + pushstate);
                 ws.$emit('push', {
                     type: 'token',
                     platform: plat,
@@ -67,12 +67,12 @@ angular.module('zmApp.controllers')
 
             var d = $q.defer();
 
-            var loginData = ZMDataModel.getLogin();
+            var loginData = NVRDataModel.getLogin();
 
             //console.log ("INIT GOT " + JSON.stringify(loginData));
 
             if (loginData.isUseEventServer == false || !loginData.eventServer) {
-                ZMDataModel.zmLog("No Event Server present. Not initializing");
+                NVRDataModel.log("No Event Server present. Not initializing");
                 d.reject("false");
                 return d.promise;
             }
@@ -83,13 +83,13 @@ angular.module('zmApp.controllers')
 
 
             if (typeof ws !== 'undefined') {
-                ZMDataModel.zmDebug("Event server already initialized");
+                NVRDataModel.debug("Event server already initialized");
                 d.resolve("true");
                 return d.promise;
             }
 
 
-            ZMDataModel.zmLog("Initializing Websocket with URL " +
+            NVRDataModel.log("Initializing Websocket with URL " +
                 loginData.eventServer + " , will connect later...");
             ws = $websocket.$new({
                 url: loginData.eventServer,
@@ -104,23 +104,23 @@ angular.module('zmApp.controllers')
             ws.$on('$open', openHandshake);
 
             ws.$on('$close', function () {
-                ZMDataModel.zmLog("Websocket closed");
+                NVRDataModel.log("Websocket closed");
 
             });
 
             // Handles responses back from ZM ES
 
             ws.$on('$message', function (str) {
-                ZMDataModel.zmLog("Real-time event: " + JSON.stringify(str));
+                NVRDataModel.log("Real-time event: " + JSON.stringify(str));
 
 
                 // Error messages
                 if (str.status != 'Success') {
-                    ZMDataModel.zmLog("Event Error: " + JSON.stringify(str));
+                    NVRDataModel.log("Event Error: " + JSON.stringify(str));
 
                     if (str.reason == 'APNSDISABLED') {
                         ws.$close();
-                        ZMDataModel.displayBanner('error', ['Event Server: APNS disabled'], 2000, 6000);
+                        NVRDataModel.displayBanner('error', ['Event Server: APNS disabled'], 2000, 6000);
                         $rootScope.apnsToken = "";
                     }
 
@@ -129,7 +129,7 @@ angular.module('zmApp.controllers')
                 if (str.status == 'Success' && (str.event == 'auth')) {
                     if (str.version == undefined)
                         str.version = "0.1";
-                    if (ZMDataModel.versionCompare(str.version, zm.minEventServerVersion) == -1) {
+                    if (NVRDataModel.versionCompare(str.version, zm.minEventServerVersion) == -1) {
                         $rootScope.zmPopup = $ionicPopup.alert({
                             title: $translate.instant('kEventServerVersionTitle'),
                             template: $translate.instant('kEventServerVersionBody1') + " " + str.version + ". " + $translate.instant('kEventServerVersionBody2') +
@@ -162,7 +162,7 @@ angular.module('zmApp.controllers')
                         }
 
                     } else {
-                        ZMDataModel.zmDebug("received supplementary event information over websockets");
+                        NVRDataModel.debug("received supplementary event information over websockets");
                     }
                     var eventsToDisplay = [];
                     var listOfMonitors = [];
@@ -177,7 +177,7 @@ angular.module('zmApp.controllers')
                     localNotText = localNotText.substring(0, localNotText.length - 1);
 
                     // if we are in background, do a local notification, else do an in app display
-                    if (!ZMDataModel.isBackground()) {
+                    if (!NVRDataModel.isBackground()) {
 
                         //emit alarm details - this is when received over websockets
                         $rootScope.$emit('alarm', {
@@ -186,14 +186,14 @@ angular.module('zmApp.controllers')
 
                         if (str.supplementary != 'true') {
 
-                            ZMDataModel.zmDebug("App is in foreground, displaying banner");
+                            NVRDataModel.debug("App is in foreground, displaying banner");
                             if (eventsToDisplay.length > 0) {
 
                                 if (eventsToDisplay.length == 1) {
                                     //console.log("Single Display: " + eventsToDisplay[0]);
-                                    ZMDataModel.displayBanner('alarm', [eventsToDisplay[0]], 5000, 5000);
+                                    NVRDataModel.displayBanner('alarm', [eventsToDisplay[0]], 5000, 5000);
                                 } else {
-                                    ZMDataModel.displayBanner('alarm', eventsToDisplay,
+                                    NVRDataModel.displayBanner('alarm', eventsToDisplay,
                                         5000, 5000 * eventsToDisplay.length);
                                 }
 
@@ -216,7 +216,7 @@ angular.module('zmApp.controllers')
         }
 
         function disconnect() {
-            ZMDataModel.zmLog("Disconnecting and deleting Event Server socket...");
+            NVRDataModel.log("Disconnecting and deleting Event Server socket...");
 
             if (typeof ws === 'undefined')
                 return;
@@ -238,21 +238,21 @@ angular.module('zmApp.controllers')
         // let ZMES know not to send us messages
         //--------------------------------------------------------------------------
         function sendMessage(type, obj, isForce) {
-            var ld = ZMDataModel.getLogin();
+            var ld = NVRDataModel.getLogin();
             if (ld.isUseEventServer == false && isForce != 1) {
-                ZMDataModel.zmDebug("Not sending WSS message as event server is off");
+                NVRDataModel.debug("Not sending WSS message as event server is off");
                 return;
             }
 
 
             if (typeof ws === 'undefined') {
-                ZMDataModel.zmDebug("Event server not initalized, not sending message");
+                NVRDataModel.debug("Event server not initalized, not sending message");
                 return;
             }
 
 
             if (ws.$status() == ws.$CLOSED) {
-                ZMDataModel.zmLog("Websocket was closed, trying to re-open");
+                NVRDataModel.log("Websocket was closed, trying to re-open");
                 ws.$un('$open');
                 //ws.$on ('$open', openHandshake);
                 ws.$open();
@@ -284,17 +284,17 @@ angular.module('zmApp.controllers')
         // Called each time we resume 
         //--------------------------------------------------------------------------
         function refresh() {
-            var loginData = ZMDataModel.getLogin();
+            var loginData = NVRDataModel.getLogin();
 
             if ((!loginData.eventServer) || (loginData.isUseEventServer == false)) {
-                ZMDataModel.zmLog("No Event Server configured, skipping refresh");
+                NVRDataModel.log("No Event Server configured, skipping refresh");
 
                 // Let's also make sure that if the socket was open 
                 // we close it - this may happen if you disable it after using it
 
                 if (typeof ws !== 'undefined') {
                     if (ws.$status() != ws.$CLOSED) {
-                        ZMDataModel.zmDebug("Closing open websocket as event server was disabled");
+                        NVRDataModel.debug("Closing open websocket as event server was disabled");
                         ws.$close();
                     }
                 }
@@ -303,7 +303,7 @@ angular.module('zmApp.controllers')
             }
 
             if (typeof ws === 'undefined') {
-                ZMDataModel.zmDebug("Calling websocket init");
+                NVRDataModel.debug("Calling websocket init");
                 init();
             }
 
@@ -316,7 +316,7 @@ angular.module('zmApp.controllers')
 
 
             if (ws.$status() == ws.$CLOSED) {
-                ZMDataModel.zmLog("Websocket was closed, trying to re-open");
+                NVRDataModel.log("Websocket was closed, trying to re-open");
                 ws.$open();
             }
 
@@ -324,17 +324,17 @@ angular.module('zmApp.controllers')
         }
 
         function pushInit() {
-            ZMDataModel.zmLog(">>>Setting up push registration");
+            NVRDataModel.log(">>>Setting up push registration");
             var push;
             var mediasrc;
             var media;
-            var ld = ZMDataModel.getLogin();
+            var ld = NVRDataModel.getLogin();
 
             var plat = $ionicPlatform.is('ios') ? 'ios' : 'android';
 
 
             if ($rootScope.platformOS == 'desktop') {
-                ZMDataModel.zmLog("Desktop instance, not setting up push. Websockets only, I hope");
+                NVRDataModel.log("Desktop instance, not setting up push. Websockets only, I hope");
                 return;
             }
 
@@ -383,11 +383,11 @@ angular.module('zmApp.controllers')
             media = $cordovaMedia.newMedia(mediasrc);
 
             push.on('registration', function (data) {
-                ZMDataModel.zmDebug("Push Notification registration ID received: " + JSON.stringify(data));
+                NVRDataModel.debug("Push Notification registration ID received: " + JSON.stringify(data));
                 $rootScope.apnsToken = data.registrationId;
 
                 var plat = $ionicPlatform.is('ios') ? 'ios' : 'android';
-                var ld = ZMDataModel.getLogin();
+                var ld = NVRDataModel.getLogin();
                 var pushstate = "enabled";
                 if (ld.disablePush == true)
                     pushstate = "disabled";
@@ -405,11 +405,11 @@ angular.module('zmApp.controllers')
 
             push.on('notification', function (data) {
 
-                ZMDataModel.zmDebug("received push notification");
+                NVRDataModel.debug("received push notification");
 
-                var ld = ZMDataModel.getLogin();
+                var ld = NVRDataModel.getLogin();
                 if (ld.isUseEventServer == false) {
-                    ZMDataModel.zmDebug("received push notification, but event server disabled. Not acting on it");
+                    NVRDataModel.debug("received push notification, but event server disabled. Not acting on it");
                     return;
                 }
 
@@ -417,12 +417,12 @@ angular.module('zmApp.controllers')
                 if (data.additionalData.foreground == false) {
                     // This means push notification tap in background
 
-                    ZMDataModel.zmDebug("*** PUSH NOTFN.>>>>" + JSON.stringify(data));
+                    NVRDataModel.debug("*** PUSH NOTFN.>>>>" + JSON.stringify(data));
 
                     // set tappedMid to monitor 
                     //*** PUSH DATA>>>>{"sound":"blop","message":"Alarms: Basement (2854) ","additionalData":{"mid":"2","coldstart":false,"collapse_key":"do_not_collapse","foreground":false}}
 
-                    ZMDataModel.zmDebug("Notification Tapped");
+                    NVRDataModel.debug("Notification Tapped");
                     $rootScope.alarmCount = "0";
                     $rootScope.isAlarm = 0;
                     $rootScope.tappedNotification = 1;
@@ -436,16 +436,16 @@ angular.module('zmApp.controllers')
                     mid = parseInt(mid);
 
                     $rootScope.tappedMid = mid;
-                    ZMDataModel.zmLog("Push notification: Tapped Monitor taken as:" + $rootScope.tappedMid);
+                    NVRDataModel.log("Push notification: Tapped Monitor taken as:" + $rootScope.tappedMid);
 
 
 
                     if ($rootScope.platformOS == 'ios') {
 
 
-                        ZMDataModel.zmDebug("iOS only: clearing background push");
+                        NVRDataModel.debug("iOS only: clearing background push");
                         push.finish(function () {
-                            ZMDataModel.zmDebug("processing of push data is finished");
+                            NVRDataModel.debug("processing of push data is finished");
                         });
                     }
 
@@ -465,7 +465,7 @@ angular.module('zmApp.controllers')
 
 
 
-                    ZMDataModel.displayBanner('alarm', [str], 0, 5000 * eventsToDisplay.length);
+                    NVRDataModel.displayBanner('alarm', [str], 0, 5000 * eventsToDisplay.length);
 
 
                     $rootScope.isAlarm = 1;
@@ -482,7 +482,7 @@ angular.module('zmApp.controllers')
             });
 
             push.on('error', function (e) {
-                ZMDataModel.zmDebug("Push error: " + JSON.stringify(e));
+                NVRDataModel.debug("Push error: " + JSON.stringify(e));
                 // console.log("************* PUSH ERROR ******************");
             });
         }
diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js
index 4ee0b4a3..298d9aa4 100644
--- a/www/js/EventServerSettingsCtrl.js
+++ b/www/js/EventServerSettingsCtrl.js
@@ -2,7 +2,7 @@
  /* jslint browser: true*/
  /* global cordova,StatusBar,angular,console */
 
- angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl', ['$scope', '$ionicSideMenuDelegate', 'zm', '$stateParams', 'EventServer', '$ionicHistory', '$rootScope', '$state', 'message', 'ZMDataModel', '$ionicPlatform', '$ionicPopup', '$timeout', '$translate', function ($scope, $ionicSideMenuDelegate, zm, $stateParams, EventServer, $ionicHistory, $rootScope, $state, message, ZMDataModel, $ionicPlatform, $ionicPopup, $timeout, $translate) {
+ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl', ['$scope', '$ionicSideMenuDelegate', 'zm', '$stateParams', 'EventServer', '$ionicHistory', '$rootScope', '$state', 'message', 'NVRDataModel', '$ionicPlatform', '$ionicPopup', '$timeout', '$translate', function ($scope, $ionicSideMenuDelegate, zm, $stateParams, EventServer, $ionicHistory, $rootScope, $state, message, NVRDataModel, $ionicPlatform, $ionicPopup, $timeout, $translate) {
      $scope.openMenu = function () {
          $ionicSideMenuDelegate.toggleLeft();
      };
@@ -56,7 +56,7 @@
 
      $scope.$on('$ionicView.beforeEnter', function () {
 
-         $scope.loginData = ZMDataModel.getLogin();
+         $scope.loginData = NVRDataModel.getLogin();
          //console.log ("Event server - before Enter, loginData is " + JSON.stringify($scope.loginData));
          $scope.defScreen = $scope.loginData.onTapScreen;
 
@@ -96,7 +96,7 @@
 
      $scope.selectScreen = function () {
 
-         var ld = ZMDataModel.getLogin();
+         var ld = NVRDataModel.getLogin();
 
          $scope.myopt = {
              selectedState: ld.onTapScreen
@@ -128,8 +128,8 @@
                      onTap: function (e) {
 
                          ld.onTapScreen = $scope.myopt.selectedState;
-                         ZMDataModel.zmLog("Setting new onTap State:" + ld.onTapScreen);
-                         ZMDataModel.setLogin(ld);
+                         NVRDataModel.log("Setting new onTap State:" + ld.onTapScreen);
+                         NVRDataModel.setLogin(ld);
                          $scope.defScreen = $scope.myopt.selectedState;
                          $scope.loginData = ld;
 
@@ -166,7 +166,7 @@
      //----------------------------------------------------------------
 
      function saveItems() {
-         ZMDataModel.zmDebug("Saving Event Server data");
+         NVRDataModel.debug("Saving Event Server data");
          var monstring = "";
          var intervalstring = "";
          var plat = $ionicPlatform.is('ios') ? 'ios' : 'android';
@@ -194,7 +194,7 @@
 
 
          //console.log ("SAVED: " + JSON.stringify($scope.loginData));
-         ZMDataModel.setLogin($scope.loginData);
+         NVRDataModel.setLogin($scope.loginData);
 
          var pushstate = "enabled";
          if ($scope.loginData.disablePush == true || $scope.loginData.isUseEventServer == false)
@@ -204,7 +204,7 @@
              EventServer.init()
                  .then(function (data) {
                      // console.log("Sending control filter");
-                     ZMDataModel.zmDebug("Sending Control message 'filter' with monlist=" + monstring + " and interval=" + intervalstring);
+                     NVRDataModel.debug("Sending Control message 'filter' with monlist=" + monstring + " and interval=" + intervalstring);
                      EventServer.sendMessage("control", {
                          type: 'filter',
                          monlist: monstring,
@@ -217,7 +217,7 @@
 
                      {
                          // we need to disable the token
-                         ZMDataModel.zmDebug("Sending token state " + pushstate);
+                         NVRDataModel.debug("Sending token state " + pushstate);
                          EventServer.sendMessage('push', {
                              type: 'token',
                              platform: plat,
@@ -239,7 +239,7 @@
 
              {
                  // we need to disable the token
-                 ZMDataModel.zmDebug("Sending token state " + pushstate);
+                 NVRDataModel.debug("Sending token state " + pushstate);
                  EventServer.sendMessage('push', {
                      type: 'token',
                      platform: plat,
@@ -257,7 +257,7 @@
 
 
 
-         ZMDataModel.displayBanner('info', ['settings saved']);
+         NVRDataModel.displayBanner('info', ['settings saved']);
      }
 
      //----------------------------------------------------------------
diff --git a/www/js/EventsGraphsCtrl.js b/www/js/EventsGraphsCtrl.js
index cda51415..98859649 100644
--- a/www/js/EventsGraphsCtrl.js
+++ b/www/js/EventsGraphsCtrl.js
@@ -8,7 +8,7 @@
 // the main function is generateChart. I call generate chart with required parameters
 // from the template file
 
-angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$ionicHistory', '$state', function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $ionicHistory, $state) {
+angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ionicPlatform', '$scope', 'zm', 'NVRDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$ionicHistory', '$state', function ($ionicPlatform, $scope, zm, NVRDataModel, $ionicSideMenuDelegate, $rootScope, $http, $ionicHistory, $state) {
     //console.log("Inside Graphs controller");
     $scope.openMenu = function () {
         $ionicSideMenuDelegate.toggleLeft();
@@ -46,7 +46,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
         // console.log("**VIEW ** EventsGraphs Ctrl Entered");
-        ZMDataModel.setAwake(false);
+        NVRDataModel.setAwake(false);
     });
 
     $scope.$on('$ionicView.leave', function () {
@@ -145,14 +145,14 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
         if (hrs) {
             // Apply a time based filter if I am not watching all events
             var cur = moment();
-            endDate = cur.format("YYYY-MM-DD " + ZMDataModel.getTimeFormat());
-            startDate = cur.subtract(hrs, 'hours').format("YYYY-MM-DD " + ZMDataModel.getTimeFormat());
+            endDate = cur.format("YYYY-MM-DD " + NVRDataModel.getTimeFormat());
+            startDate = cur.subtract(hrs, 'hours').format("YYYY-MM-DD " + NVRDataModel.getTimeFormat());
             //console.log("Start and End " + startDate + "==" + endDate);
-            ZMDataModel.zmLog("Generating graph for " + startDate + " to " + endDate);
+            NVRDataModel.log("Generating graph for " + startDate + " to " + endDate);
 
         }
 
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         //$scope.chart.data = {};
         $scope.chart.data = {
             labels: [],
@@ -167,7 +167,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
           ]
         };
 
-        ZMDataModel.getMonitors(0).then(function (data) {
+        NVRDataModel.getMonitors(0).then(function (data) {
             monitors = data;
             var adjustedHeight = monitors.length * 30;
             if (adjustedHeight > $rootScope.devHeight) {
@@ -194,10 +194,10 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
                         "/events/index/MonitorId:" + monitors[j].Monitor.Id + dateString +
                         ".json?page=1";
                     // console.log("Monitor event URL:" + url);
-                    ZMDataModel.zmLog("EventGraph: composed url is " + url);
+                    NVRDataModel.log("EventGraph: composed url is " + url);
                     $http.get(url /*,{timeout:15000}*/ )
                         .success(function (data) {
-                            ZMDataModel.zmDebug("Event count for monitor" +
+                            NVRDataModel.debug("Event count for monitor" +
                                 monitors[j].Monitor.Id + " is " + data.pagination.count);
                             $scope.chart.data.datasets[0].data[j] = data.pagination.count;
                         })
@@ -206,7 +206,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
                             // but what I am really doing now is treating it like no events
                             // works but TBD: make this into a proper error handler
                             $scope.chart.data.datasets[0].data[j] = 0;
-                            ZMDataModel.zmLog("Error retrieving events for graph " + JSON.stringify(data), "error");
+                            NVRDataModel.log("Error retrieving events for graph " + JSON.stringify(data), "error");
                         });
                 })(i); // j
             } //for
diff --git a/www/js/EventsModalGraphCtrl.js b/www/js/EventsModalGraphCtrl.js
index 1a5f818c..fb349df0 100644
--- a/www/js/EventsModalGraphCtrl.js
+++ b/www/js/EventsModalGraphCtrl.js
@@ -6,7 +6,7 @@
 
 
 
-angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope', '$rootScope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', '$translate', function ($scope, $rootScope, zm, ZMDataModel, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup, $translate) {
+angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope', '$rootScope', 'zm', 'NVRDataModel', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', '$translate', function ($scope, $rootScope, zm, NVRDataModel, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup, $translate) {
 
 
 
@@ -111,7 +111,7 @@ angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope'
 
     $rootScope.$on("auth-success", function () {
 
-        ZMDataModel.zmDebug("EventModalCtrl: Re-login detected, resetting everything & re-generating connkey");
+        NVRDataModel.debug("EventModalCtrl: Re-login detected, resetting everything & re-generating connkey");
 
 
     });
@@ -235,7 +235,7 @@ angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope'
         if ($scope.graphWidth < $rootScope.devWidth)
             $scope.graphWidth = $rootScope.devWidth;
 
-        // ZMDataModel.zmLog ("Changing graph width to " + $scope.graphWidth);
+        // NVRDataModel.log ("Changing graph width to " + $scope.graphWidth);
 
         for (var i = 0; i < event.event.Frame.length; i++) {
 
@@ -280,7 +280,7 @@ angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope'
         cv = document.getElementById("tcchart");
         ctx = cv.getContext("2d");
 
-        if (ZMDataModel.getLogin().timelineModalGraphType == 'all') {
+        if (NVRDataModel.getLogin().timelineModalGraphType == 'all') {
             btype = 'line';
             current_data = data;
         } else {
@@ -310,14 +310,14 @@ angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope'
 
             //console.log ("You tapped " + ndx);
             $scope.alarm_images = [];
-            $scope.playbackURL = ZMDataModel.getLogin().url;
+            $scope.playbackURL = NVRDataModel.getLogin().url;
             var items = current_data.datasets[0].frames[ndx];
             $scope.alarm_images.push({
                 relativePath: items.relativePath,
                 fid: items.fid,
                 fname: items.fname,
                 score: items.score,
-                time: moment(items.x).format("MMM D," + ZMDataModel.getTimeFormatSec()),
+                time: moment(items.x).format("MMM D," + NVRDataModel.getTimeFormatSec()),
                 eid: items.eid
             });
         });
@@ -332,7 +332,7 @@ angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope'
 
     function computeRelativePath(event) {
         var relativePath = "";
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
         var yy = moment(str).format('YY');
         var mm = moment(str).format('MM');
@@ -357,7 +357,7 @@ angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope'
 
     function computeBasePath(event) {
         var basePath = "";
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
         var yy = moment(str).format('YY');
         var mm = moment(str).format('MM');
diff --git a/www/js/FirstUseCtrl.js b/www/js/FirstUseCtrl.js
index bf3f328d..f9d8b7d8 100644
--- a/www/js/FirstUseCtrl.js
+++ b/www/js/FirstUseCtrl.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console */
 
-angular.module('zmApp.controllers').controller('zmApp.FirstUseCtrl', ['$scope', '$ionicSideMenuDelegate', 'zm', '$stateParams', '$ionicHistory', '$state', 'ZMDataModel', '$rootScope', '$ionicPopup', '$translate', function ($scope, $ionicSideMenuDelegate, zm, $stateParams, $ionicHistory, $state, ZMDataModel, $rootScope, $ionicPopup, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.FirstUseCtrl', ['$scope', '$ionicSideMenuDelegate', 'zm', '$stateParams', '$ionicHistory', '$state', 'NVRDataModel', '$rootScope', '$ionicPopup', '$translate', function ($scope, $ionicSideMenuDelegate, zm, $stateParams, $ionicHistory, $state, NVRDataModel, $rootScope, $ionicPopup, $translate) {
     $scope.openMenu = function () {
         $ionicSideMenuDelegate.toggleLeft();
     };
@@ -20,7 +20,7 @@ angular.module('zmApp.controllers').controller('zmApp.FirstUseCtrl', ['$scope',
     });
 
     $scope.switchLang = function () {
-        $scope.lang = ZMDataModel.getLanguages();
+        $scope.lang = NVRDataModel.getLanguages();
         $scope.myopt = {
             lang: ""
         };
@@ -43,8 +43,8 @@ angular.module('zmApp.controllers').controller('zmApp.FirstUseCtrl', ['$scope',
                 {
                     text: $translate.instant('kButtonOk'),
                     onTap: function (e) {
-                        ZMDataModel.zmLog("Language selected:" + $scope.myopt.lang);
-                        ZMDataModel.setDefaultLanguage($scope.myopt.lang, true);
+                        NVRDataModel.log("Language selected:" + $scope.myopt.lang);
+                        NVRDataModel.setDefaultLanguage($scope.myopt.lang, true);
 
 
                         //return "OK";
diff --git a/www/js/HelpCtrl.js b/www/js/HelpCtrl.js
index 8506b2f1..53dc91b0 100644
--- a/www/js/HelpCtrl.js
+++ b/www/js/HelpCtrl.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console, Masonry */
 
-angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$rootScope', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$translate', '$q', '$templateRequest', '$sce', '$compile', function ($scope, $rootScope, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $ionicHistory, $state, $translate, $q, $templateRequest, $sce, $compile) {
+angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$rootScope', '$ionicModal', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$translate', '$q', '$templateRequest', '$sce', '$compile', function ($scope, $rootScope, $ionicModal, NVRDataModel, $ionicSideMenuDelegate, $ionicHistory, $state, $translate, $q, $templateRequest, $sce, $compile) {
     $scope.openMenu = function () {
         $ionicSideMenuDelegate.toggleLeft();
     };
@@ -33,7 +33,7 @@ angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$ro
 
     function insertHelp() {
 
-        var l = ZMDataModel.getDefaultLanguage() || 'en';
+        var l = NVRDataModel.getDefaultLanguage() || 'en';
         var lang = "lang/help/help-" + l + ".html";
         //console.log ("LANG IS " + lang);
         var templateUrl = $sce.getTrustedResourceUrl(lang);
@@ -46,14 +46,14 @@ angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$ro
                     $compile(elem.html(template).contents())($scope);
                 },
                 function (error) {
-                    ZMDataModel.zmLog("Language file " + lang + " not found, falling back");
+                    NVRDataModel.log("Language file " + lang + " not found, falling back");
                     $templateRequest(templateUrlFB)
                         .then(function (template) {
                                 var elem = angular.element(document.getElementById('insertHelp'));
                                 $compile(elem.html(template).contents())($scope);
                             },
                             function (error) {
-                                ZMDataModel.zmLog("fallback help not found");
+                                NVRDataModel.log("fallback help not found");
                             });
                 }
             );
@@ -71,8 +71,8 @@ angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$ro
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
         //console.log("**VIEW ** Help Ctrl Entered");
-        ZMDataModel.setAwake(false);
-        $scope.zmAppVersion = ZMDataModel.getAppVersion();
+        NVRDataModel.setAwake(false);
+        $scope.zmAppVersion = NVRDataModel.getAppVersion();
         insertHelp();
 
 
diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js
index c48ef060..67f2d185 100644
--- a/www/js/LogCtrl.js
+++ b/www/js/LogCtrl.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global saveAs, cordova,StatusBar,angular,console,moment */
 
-angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$rootScope', 'zm', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$fileLogger', '$cordovaEmailComposer', '$ionicPopup', '$timeout', '$ionicHistory', '$state', '$interval', '$ionicLoading', '$translate', function ($scope, $rootScope, zm, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $fileLogger, $cordovaEmailComposer, $ionicPopup, $timeout, $ionicHistory, $state, $interval, $ionicLoading, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$rootScope', 'zm', '$ionicModal', 'NVRDataModel', '$ionicSideMenuDelegate', '$fileLogger', '$cordovaEmailComposer', '$ionicPopup', '$timeout', '$ionicHistory', '$state', '$interval', '$ionicLoading', '$translate', function ($scope, $rootScope, zm, $ionicModal, NVRDataModel, $ionicSideMenuDelegate, $fileLogger, $cordovaEmailComposer, $ionicPopup, $timeout, $ionicHistory, $state, $interval, $ionicLoading, $translate) {
     $scope.openMenu = function () {
         $ionicSideMenuDelegate.toggleLeft();
     };
@@ -17,13 +17,13 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
     document.addEventListener("resume", onResume, false);
 
     function onPause() {
-        ZMDataModel.zmDebug("LogCtrl: pause called, killing log timer");
+        NVRDataModel.debug("LogCtrl: pause called, killing log timer");
         // $interval.cancel(intervalLogUpdateHandle);
     }
 
 
     function onResume() {
-        ZMDataModel.zmDebug("LogCtrl: resume called, starting log timer");
+        NVRDataModel.debug("LogCtrl: resume called, starting log timer");
         /*  intervalLogUpdateHandle = $interval(function ()
         {
             loadLogs();
@@ -46,7 +46,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
                 $fileLogger.deleteLogfile().then(function () {
                     //console.log('Logfile deleted');
                     $fileLogger.setStorageFilename(zm.logFile);
-                    $scope.zmLog.logString = "";
+                    $scope.log.logString = "";
                 });
             }
         });
@@ -97,10 +97,10 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
 
 
             // do my best to replace sensitive information
-            var loginData = ZMDataModel.getLogin();
+            var loginData = NVRDataModel.getLogin();
 
 
-            // We don't need this anymore as zmLog and zmDebug now strip passwords
+            // We don't need this anymore as log and debug now strip passwords
             /*if (loginData.password !="")
             {
                 var re1 = new RegExp(loginData.password, "g");
@@ -146,7 +146,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
 
     function callback() {
         // console.log ("EMAIL SENT");
-        ZMDataModel.zmDebug("Email sent callback called");
+        NVRDataModel.debug("Email sent callback called");
     }
 
     function loadLogs() {
@@ -161,12 +161,12 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
         $fileLogger.getLogfile().then(function (l) {
 
 
-                $scope.zmLog.logString = l.split('\n').reverse().join('\n');
+                $scope.log.logString = l.split('\n').reverse().join('\n');
                 
                 $ionicLoading.hide();
             },
             function (error) {
-                $scope.zmLog.logString = "Error getting log: " + JSON.stringify(error);
+                $scope.log.logString = "Error getting log: " + JSON.stringify(error);
                 $ionicLoading.hide();
             });
     }
@@ -180,13 +180,13 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
         //console.log("**VIEW ** Log Ctrl Entered");
-        ZMDataModel.setAwake(false);
+        NVRDataModel.setAwake(false);
 
-        $scope.zmLog = {
+        $scope.log = {
             logString: ""
         };
 
-        $scope.zmAppVersion = ZMDataModel.getAppVersion();
+        $scope.zmAppVersion = NVRDataModel.getAppVersion();
 
 
         /* intervalLogUpdateHandle = $interval(function ()
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index b71058cf..11a9699a 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console,alert,URI, localforage */
 
-angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$rootScope', 'zm', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', 'zmAutoLogin', '$cordovaPinDialog', 'EventServer', '$ionicHistory', '$state', '$ionicActionSheet', 'SecuredPopups', '$stateParams', '$translate', function ($scope, $rootScope, zm, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, zmAutoLogin, $cordovaPinDialog, EventServer, $ionicHistory, $state, $ionicActionSheet, SecuredPopups, $stateParams, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$rootScope', 'zm', '$ionicModal', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', 'zmAutoLogin', '$cordovaPinDialog', 'EventServer', '$ionicHistory', '$state', '$ionicActionSheet', 'SecuredPopups', '$stateParams', '$translate', function ($scope, $rootScope, zm, $ionicModal, NVRDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, zmAutoLogin, $cordovaPinDialog, EventServer, $ionicHistory, $state, $ionicActionSheet, SecuredPopups, $stateParams, $translate) {
     $scope.openMenu = function () {
         $ionicSideMenuDelegate.toggleLeft();
     };
@@ -11,7 +11,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
     var oldName;
     var serverbuttons = [];
     var availableServers;
-    $scope.loginData = ZMDataModel.getLogin();
+    $scope.loginData = NVRDataModel.getLogin();
 
     $scope.check = {
         isUseAuth: false,
@@ -26,12 +26,12 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
     document.addEventListener("resume", onResume, false);
 
     function onResume() {
-        ZMDataModel.zmLog("Login screen resumed");
+        NVRDataModel.log("Login screen resumed");
 
     }
 
     function onPause() {
-        ZMDataModel.zmLog("Login screen going to background, saving data");
+        NVRDataModel.log("Login screen going to background, saving data");
         localforage.setItem("settings-temp-data", $scope.loginData);
 
     }
@@ -60,7 +60,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
     //----------------------------------------------------------------
 
     $scope.selectFallback = function () {
-        var as = Object.keys(ZMDataModel.getServerGroups());
+        var as = Object.keys(NVRDataModel.getServerGroups());
         if (as.length < 2) {
             $rootScope.zmPopup = SecuredPopups.show('alert', {
                 title: $translate.instant('kError'),
@@ -72,7 +72,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
         var ab = [{
             text: $translate.instant('kClear')
         }];
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
         as.forEach(function (item) {
             if (item != ld.serverName) ab.push({
                 text: item
@@ -89,7 +89,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                     $scope.loginData.fallbackConfiguration = "";
                 else
                     $scope.loginData.fallbackConfiguration = ab[index].text;
-                ZMDataModel.setLogin($scope.loginData);
+                NVRDataModel.setLogin($scope.loginData);
                 return true;
             }
         });
@@ -116,11 +116,11 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
                 if (serverbuttons[index].text == $translate.instant('kServerAdd') + "...") {
 
-                    $scope.loginData = angular.copy(ZMDataModel.getDefaultLoginObject());
+                    $scope.loginData = angular.copy(NVRDataModel.getDefaultLoginObject());
                     return true;
                 }
 
-                var zmServers = ZMDataModel.getServerGroups();
+                var zmServers = NVRDataModel.getServerGroups();
                 $scope.loginData = zmServers[serverbuttons[index].text];
 
                 //console.log ("NEW LOGIN OBJECT IS " + JSON.stringify($scope.loginData));
@@ -129,14 +129,14 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                 $scope.check.isUseAuth = ($scope.loginData.isUseAuth) ? true : false;
                 $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == true) ? true : false;
 
-                ZMDataModel.zmDebug("Retrieved state for this profile:" + JSON.stringify($scope.loginData));
+                NVRDataModel.debug("Retrieved state for this profile:" + JSON.stringify($scope.loginData));
 
                 // lets make sure Event Server is loaded 
                 // correctly
 
                 // FIXME: But what happens if you don't save?
                 // loginData gets written but auth is not done
-                ZMDataModel.setLogin($scope.loginData);
+                NVRDataModel.setLogin($scope.loginData);
 
                 return true;
             },
@@ -145,26 +145,26 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
 
                 if (!$scope.loginData.serverName) {
-                    ZMDataModel.zmDebug("cannot delete empty entry");
+                    NVRDataModel.debug("cannot delete empty entry");
                     return true;
 
 
                 }
-                var zmServers = ZMDataModel.getServerGroups();
+                var zmServers = NVRDataModel.getServerGroups();
                 //console.log ("YOU WANT TO DELETE " + $scope.loginData.serverName);
                 //console.log ("LENGTH OF SERVERS IS " + Object.keys(zmServers).length);
                 if (Object.keys(zmServers).length > 1) {
 
-                    ZMDataModel.zmLog("Deleting " + $scope.loginData.serverName);
+                    NVRDataModel.log("Deleting " + $scope.loginData.serverName);
                     delete zmServers[$scope.loginData.serverName];
-                    ZMDataModel.setServerGroups(zmServers);
+                    NVRDataModel.setServerGroups(zmServers);
                     // point to first element
                     // better than nothing
                     // note this is actually unordered
                     $scope.loginData = zmServers[Object.keys(zmServers)[0]];
-                    ZMDataModel.setLogin($scope.loginData);
+                    NVRDataModel.setLogin($scope.loginData);
 
-                    availableServers = Object.keys(ZMDataModel.getServerGroups());
+                    availableServers = Object.keys(NVRDataModel.getServerGroups());
                     serverbuttons = [{
                         text: $translate.instant('kServerAdd') + "..."
                     }];
@@ -177,7 +177,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                     //console.log (">>>>>>>delete: server buttons " + JSON.stringify(serverbuttons));
 
                 } else {
-                    ZMDataModel.displayBanner('error', [$translate.instant('kBannerCannotDeleteNeedOne')]);
+                    NVRDataModel.displayBanner('error', [$translate.instant('kBannerCannotDeleteNeedOne')]);
                 }
                 return true;
             }
@@ -192,9 +192,9 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
     //----------------------------------------------------------------
 
     $scope.eventServerSettings = function () {
-        ZMDataModel.zmDebug("Saving settings before going to Event Server settings");
+        NVRDataModel.debug("Saving settings before going to Event Server settings");
         //console.log ( "My loginData saved " + JSON.stringify($scope.loginData));
-        ZMDataModel.setLogin($scope.loginData);
+        NVRDataModel.setLogin($scope.loginData);
         $state.go("eventserversettings");
 
     };
@@ -210,11 +210,11 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
         //console.log("**VIEW ** LoginCtrl  Entered");
-        ZMDataModel.setAwake(false);
-        var ld = ZMDataModel.getLogin();
+        NVRDataModel.setAwake(false);
+        var ld = NVRDataModel.getLogin();
         oldName = ld.serverName;
 
-        availableServers = Object.keys(ZMDataModel.getServerGroups());
+        availableServers = Object.keys(NVRDataModel.getServerGroups());
         serverbuttons = [{
             text: $translate.instant('kServerAdd') + "..."
         }];
@@ -229,11 +229,11 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
 
 
-        ZMDataModel.zmDebug("Does login need to hear the wizard? " + $stateParams.wizard);
+        NVRDataModel.debug("Does login need to hear the wizard? " + $stateParams.wizard);
 
         if ($stateParams.wizard == "true") {
-            ZMDataModel.zmLog("Creating new login entry for wizard");
-            $scope.loginData = angular.copy(ZMDataModel.getDefaultLoginObject());
+            NVRDataModel.log("Creating new login entry for wizard");
+            $scope.loginData = angular.copy(NVRDataModel.getDefaultLoginObject());
             $scope.loginData.serverName = $rootScope.wizard.serverName;
             $scope.loginData.url = $rootScope.wizard.loginURL;
             $scope.loginData.apiurl = $rootScope.wizard.apiURL;
@@ -255,13 +255,13 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
             localforage.getItem("settings-temp-data").then(function (value) {
                 savedData = value;
                 //= zmStorageService.getObject ("settings-temp-data");
-                if (!ZMDataModel.isEmpty(savedData)) {
+                if (!NVRDataModel.isEmpty(savedData)) {
                     $scope.loginData = savedData;
-                    ZMDataModel.zmLog("retrieved pre-stored loginData on past pause: " + JSON.stringify($scope.loginData));
+                    NVRDataModel.log("retrieved pre-stored loginData on past pause: " + JSON.stringify($scope.loginData));
                     localforage.removeItem("settings-temp-data");
                     //zmStorageService.setObject("settings-temp-data", {});
                 } else {
-                    ZMDataModel.zmLog("Not recovering login data as its empty");
+                    NVRDataModel.log("Not recovering login data as its empty");
                 }
             });
         }
@@ -290,8 +290,8 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
     // credit: http://stackoverflow.com/questions/33385610/ionic-prevent-navigation-on-leave
     $scope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
-        ZMDataModel.setAwake(false);
-        var ld = ZMDataModel.getLogin();
+        NVRDataModel.setAwake(false);
+        var ld = NVRDataModel.getLogin();
 
         if (ld.serverName != oldName) {
             event.preventDefault();
@@ -320,7 +320,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
     // FIXME: Get rid of cordovaPinDialog. It's really not needed 
     //--------------------------------------------------------------------------
     $scope.pinPrompt = function (evt) {
-        ZMDataModel.zmLog("Password prompt");
+        NVRDataModel.log("Password prompt");
         if ($scope.loginData.usePin) {
             $scope.loginData.pinCode = "";
             $cordovaPinDialog.prompt($translate.instant('kEnterPin'), $translate.instant('kPinProtect')).then(
@@ -331,12 +331,12 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                         $cordovaPinDialog.prompt($translate.instant('kReconfirmPin'), $translate.instant('kPinProtect'))
                             .then(function (result2) {
                                     if (result1.input1 == result2.input1) {
-                                        ZMDataModel.zmLog("Pin code match");
+                                        NVRDataModel.log("Pin code match");
                                         $scope.loginData.pinCode = result1.input1;
                                     } else {
-                                        ZMDataModel.zmLog("Pin code mismatch");
+                                        NVRDataModel.log("Pin code mismatch");
                                         $scope.loginData.usePin = false;
-                                        ZMDataModel.displayBanner('error', [$translate.instant('kBannerPinMismatch')]);
+                                        NVRDataModel.displayBanner('error', [$translate.instant('kBannerPinMismatch')]);
                                     }
                                 },
                                 function (error) {
@@ -355,7 +355,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
 
         } else {
-            ZMDataModel.zmDebug("Password disabled");
+            NVRDataModel.debug("Password disabled");
         }
     };
 
@@ -416,7 +416,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
         //console.log ("*********** SAVE ITEMS CALLED ");
         //console.log('Saving login');
-        ZMDataModel.setFirstUse(false);
+        NVRDataModel.setFirstUse(false);
 
         // lets so some basic sanitization of the data
         // I am already adding "/" so lets remove spurious ones
@@ -497,7 +497,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
         if ($scope.check.isUseAuth) {
             if (!$scope.loginData.username) $scope.loginData.username = "x";
             if (!$scope.loginData.password) $scope.loginData.password = "x";
-            //ZMDataModel.zmLog("Authentication is disabled, setting dummy user & pass");
+            //NVRDataModel.log("Authentication is disabled, setting dummy user & pass");
         }
 
         if (parseInt($scope.loginData.maxMontage) <= 0) {
@@ -510,7 +510,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
         if (!$scope.check.isUseEventServer) {
             $rootScope.isAlarm = 0;
             if ($rootScope.apnsToken) {
-                ZMDataModel.zmLog("Making sure we don't get push notifications");
+                NVRDataModel.log("Making sure we don't get push notifications");
                 EventServer.sendMessage('push', {
                     type: 'token',
                     platform: $rootScope.platformOS,
@@ -520,13 +520,13 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
             }
         }
 
-        ZMDataModel.setLogin($scope.loginData);
+        NVRDataModel.setLogin($scope.loginData);
         oldName = $scope.loginData.serverName;
 
         if ($scope.check.isUseEventServer) {
             EventServer.init();
             if ($rootScope.apnsToken && $scope.loginData.disablePush != true) {
-                ZMDataModel.zmLog("Making sure we get push notifications");
+                NVRDataModel.log("Making sure we get push notifications");
                 EventServer.sendMessage('push', {
                     type: 'token',
                     platform: $rootScope.platformOS,
@@ -544,7 +544,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
 
         // lets logout
-        ZMDataModel.zmDebug("Logging out of current session...");
+        NVRDataModel.debug("Logging out of current session...");
         $rootScope.authSession = "undefined";
         $http({
                 method: 'POST',
@@ -582,17 +582,17 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
                     // note that due to reachability, it might have switched to another server
 
-                    if ($scope.loginData.serverName != ZMDataModel.getLogin().serverName) {
-                        ZMDataModel.zmDebug(">>> Server information has changed, likely a fallback took over!");
-                        $scope.loginData = ZMDataModel.getLogin();
+                    if ($scope.loginData.serverName != NVRDataModel.getLogin().serverName) {
+                        NVRDataModel.debug(">>> Server information has changed, likely a fallback took over!");
+                        $scope.loginData = NVRDataModel.getLogin();
                         apiurl = $scope.loginData.apiurl + '/host/getVersion.json';
                         portalurl = $scope.loginData.url + '/index.php';
                     }
 
                     // possible image digits changed between servers
-                    ZMDataModel.getKeyConfigParams(0);
+                    NVRDataModel.getKeyConfigParams(0);
 
-                    ZMDataModel.zmLog("Validating APIs at " + apiurl);
+                    NVRDataModel.log("Validating APIs at " + apiurl);
                     $http.get(apiurl)
                         .success(function (data) {
 
@@ -602,29 +602,29 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
 
                             // now grab and report PATH_ZMS
-                            ZMDataModel.getPathZms()
+                            NVRDataModel.getPathZms()
                                 .then(function (data) {
-                                    var ld = ZMDataModel.getLogin();
+                                    var ld = NVRDataModel.getLogin();
                                     var zm_cgi = data.toLowerCase();
 
                                     var user_cgi = (ld.streamingurl).toLowerCase();
-                                    ZMDataModel.zmLog("ZM relative cgi-path: " + zm_cgi + ", you entered: " + user_cgi);
+                                    NVRDataModel.log("ZM relative cgi-path: " + zm_cgi + ", you entered: " + user_cgi);
 
                                     $http.get(ld.streamingurl + "/zms")
                                         .success(function (data) {
-                                            ZMDataModel.zmDebug("Urk! cgi-path returned  success, but it should not have come here");
+                                            NVRDataModel.debug("Urk! cgi-path returned  success, but it should not have come here");
                                             loginStatus = $translate.instant('kLoginStatusNoCgi');
 
-                                            ZMDataModel.zmDebug("refreshing API version...");
-                                            ZMDataModel.getAPIversion()
+                                            NVRDataModel.debug("refreshing API version...");
+                                            NVRDataModel.getAPIversion()
                                                 .then(function (data) {
-                                                        var refresh = ZMDataModel.getMonitors(1);
+                                                        var refresh = NVRDataModel.getMonitors(1);
                                                         $rootScope.apiVersion = data;
                                                     },
                                                     function (error) {
-                                                        var refresh = ZMDataModel.getMonitors(1);
+                                                        var refresh = NVRDataModel.getMonitors(1);
                                                         $rootScope.apiVersion = "0.0.0";
-                                                        ZMDataModel.zmDebug("Error, failed API version, setting to " + $rootScope.apiVersion);
+                                                        NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion);
                                                     });
 
                                             if (showalert) {
@@ -634,7 +634,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                                                 }).then(function (res) {
 
                                                     $ionicSideMenuDelegate.toggleLeft();
-                                                    ZMDataModel.zmDebug("Force reloading monitors...");
+                                                    NVRDataModel.debug("Force reloading monitors...");
 
                                                 });
                                             }
@@ -654,20 +654,20 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                                                 }).then(function (res) {
 
                                                     $ionicSideMenuDelegate.toggleLeft();
-                                                    ZMDataModel.zmDebug("Force reloading monitors...");
+                                                    NVRDataModel.debug("Force reloading monitors...");
 
                                                 });
                                             }
-                                            ZMDataModel.zmDebug("refreshing API version...");
-                                            ZMDataModel.getAPIversion()
+                                            NVRDataModel.debug("refreshing API version...");
+                                            NVRDataModel.getAPIversion()
                                                 .then(function (data) {
-                                                        var refresh = ZMDataModel.getMonitors(1);
+                                                        var refresh = NVRDataModel.getMonitors(1);
                                                         $rootScope.apiVersion = data;
                                                     },
                                                     function (error) {
-                                                        var refresh = ZMDataModel.getMonitors(1);
+                                                        var refresh = NVRDataModel.getMonitors(1);
                                                         $rootScope.apiVersion = "0.0.0";
-                                                        ZMDataModel.zmDebug("Error, failed API version, setting to " + $rootScope.apiVersion);
+                                                        NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion);
                                                     });
 
                                         });
@@ -677,8 +677,8 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
                         })
                         .error(function (error) {
-                            ZMDataModel.displayBanner('error', [$translate.instant('kBannerAPICheckFailed'), $translate.instant('kBannerPleaseCheck')]);
-                            ZMDataModel.zmLog("API login error " + JSON.stringify(error));
+                            NVRDataModel.displayBanner('error', [$translate.instant('kBannerAPICheckFailed'), $translate.instant('kBannerPleaseCheck')]);
+                            NVRDataModel.log("API login error " + JSON.stringify(error));
 
                             $rootScope.zmPopup = SecuredPopups.show('alert', {
                                 title: $translate.instant('kLoginValidAPIFailedTitle'),
@@ -709,7 +709,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
                 });
         } else {
             saveItems(true);
-            availableServers = Object.keys(ZMDataModel.getServerGroups());
+            availableServers = Object.keys(NVRDataModel.getServerGroups());
             serverbuttons = [{
                 text: $translate.instant('kServerAdd') + "..."
             }];
diff --git a/www/js/MenuController.js b/www/js/MenuController.js
index 9eca0051..61db0b90 100644
--- a/www/js/MenuController.js
+++ b/www/js/MenuController.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console */
 
-angular.module('zmApp.controllers').controller('MenuController', ['$scope','$ionicSideMenuDelegate', 'zm', '$stateParams', '$ionicHistory','$state', 'ZMDataModel', '$rootScope', '$ionicPopup', '$translate', function ($scope,$ionicSideMenuDelegate,zm, $stateParams, $ionicHistory, $state, ZMDataModel, $rootScope, $ionicPopup, $translate) {
+angular.module('zmApp.controllers').controller('MenuController', ['$scope','$ionicSideMenuDelegate', 'zm', '$stateParams', '$ionicHistory','$state', 'NVRDataModel', '$rootScope', '$ionicPopup', '$translate', function ($scope,$ionicSideMenuDelegate,zm, $stateParams, $ionicHistory, $state, NVRDataModel, $rootScope, $ionicPopup, $translate) {
 $scope.openMenu = function () {
     $ionicSideMenuDelegate.toggleLeft();
   };
@@ -13,7 +13,7 @@ $scope.openMenu = function () {
 //----------------------------------------------------------------
     $scope.switchLang = function()
     {
-        $scope.lang = ZMDataModel.getLanguages();
+        $scope.lang = NVRDataModel.getLanguages();
         $scope.myopt = {lang:""};
         
         $rootScope.zmPopup = $ionicPopup.show({
@@ -34,8 +34,8 @@ $scope.openMenu = function () {
                 {
                     text: $translate.instant('kButtonOk'),
                     onTap: function (e) {
-                        ZMDataModel.zmLog("Language selected:"+$scope.myopt.lang);
-                        ZMDataModel.setDefaultLanguage($scope.myopt.lang, true);
+                        NVRDataModel.log("Language selected:"+$scope.myopt.lang);
+                        NVRDataModel.setDefaultLanguage($scope.myopt.lang, true);
                         
                         //return "OK";
 
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index 33229b85..d47c1bfb 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -6,8 +6,8 @@
 // refer to comments in EventCtrl for the modal stuff. They are almost the same
 
 angular.module('zmApp.controllers')
-    .controller('zmApp.MonitorCtrl', ['$ionicPopup', 'zm', '$scope', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$ionicLoading', '$ionicModal', '$state', '$http', '$rootScope', '$timeout', '$ionicHistory', '$ionicPlatform', '$translate', '$q',
-                               function ($ionicPopup, zm, $scope, ZMDataModel, message, $ionicSideMenuDelegate, $ionicLoading, $ionicModal, $state, $http, $rootScope, $timeout, $ionicHistory, $ionicPlatform, $translate, $q) {
+    .controller('zmApp.MonitorCtrl', ['$ionicPopup', 'zm', '$scope', 'NVRDataModel', 'message', '$ionicSideMenuDelegate', '$ionicLoading', '$ionicModal', '$state', '$http', '$rootScope', '$timeout', '$ionicHistory', '$ionicPlatform', '$translate', '$q',
+                               function ($ionicPopup, zm, $scope, NVRDataModel, message, $ionicSideMenuDelegate, $ionicLoading, $ionicModal, $state, $http, $rootScope, $timeout, $ionicHistory, $ionicPlatform, $translate, $q) {
 
 
             //-----------------------------------------------------------------------
@@ -33,11 +33,11 @@ angular.module('zmApp.controllers')
                 e.preventDefault();
                 if ($scope.modal != undefined && $scope.modal.isShown()) {
                     // switch off awake, as liveview is finished
-                    ZMDataModel.zmDebug("Modal is open, closing it");
-                    ZMDataModel.setAwake(false);
+                    NVRDataModel.debug("Modal is open, closing it");
+                    NVRDataModel.setAwake(false);
                     $scope.modal.remove();
                 } else {
-                    ZMDataModel.zmDebug("Modal is closed, so toggling or exiting");
+                    NVRDataModel.debug("Modal is closed, so toggling or exiting");
                     if (!$ionicSideMenuDelegate.isOpenLeft()) {
                         $ionicSideMenuDelegate.toggleLeft();
 
@@ -152,13 +152,13 @@ angular.module('zmApp.controllers')
                             text: $translate.instant('kButtonSave'),
                             onTap: function (e) {
                                 $scope.monfunc.mymonitorsIds.forEach(function (item, index) {
-                                    ZMDataModel.zmDebug("MonitorCtrl:changeConfig selection:" + $scope.monfunc.myenabled +
+                                    NVRDataModel.debug("MonitorCtrl:changeConfig selection:" + $scope.monfunc.myenabled +
                                         $scope.monfunc.myfunc);
-                                    var loginData = ZMDataModel.getLogin();
+                                    var loginData = NVRDataModel.getLogin();
                                     var apiRestart = loginData.apiurl + "/states/change/restart.json";
                                     var apiMon = loginData.apiurl + "/monitors/" + item + ".json";
 
-                                    ZMDataModel.zmDebug("MonitorCtrl: URLs for changeConfig save:" + apiMon);
+                                    NVRDataModel.debug("MonitorCtrl: URLs for changeConfig save:" + apiMon);
 
                                     var isEnabled = "";
                                     isEnabled = ($scope.monfunc.myenabled == true) ? '1' : '0';
@@ -183,7 +183,7 @@ angular.module('zmApp.controllers')
                                                         encodeURIComponent(obj[p]));
                                                 var foo = str.join("&");
                                                 // console.log("****RETURNING " + foo);
-                                                ZMDataModel.zmDebug("MonitorCtrl: parmeters constructed: " + foo);
+                                                NVRDataModel.debug("MonitorCtrl: parmeters constructed: " + foo);
                                                 return foo;
                                             },
                                             data: {
@@ -193,10 +193,10 @@ angular.module('zmApp.controllers')
 
                                         })
                                         .success(function () {
-                                            ZMDataModel.zmDebug("MonitorCtrl: Not restarting ZM - Make sure you have the patch installed in MonitorsController.php or this won't work");
+                                            NVRDataModel.debug("MonitorCtrl: Not restarting ZM - Make sure you have the patch installed in MonitorsController.php or this won't work");
                                         })
                                         .error(function (data, status, headers, config) {
-                                            ZMDataModel.zmDebug("MonitorCtrl: Error changing monitor " + JSON.stringify(data));
+                                            NVRDataModel.debug("MonitorCtrl: Error changing monitor " + JSON.stringify(data));
                                             $scope.monfunc.myfailedIds.push(item);
                                         });
 
@@ -214,7 +214,7 @@ angular.module('zmApp.controllers')
                                         });
                                     } else {
                                         // I am not restarting ZM after monitor change
-                                        /* ZMDataModel.zmDebug ("MonitorCtrl: Restarting ZM");
+                                        /* NVRDataModel.debug ("MonitorCtrl: Restarting ZM");
                                         $ionicLoading.show({
                                             template: "Successfully changed Monitor. Please wait, restarting ZoneMinder...",
                                             noBackdrop: true,
@@ -223,7 +223,7 @@ angular.module('zmApp.controllers')
                                         $http.post(apiRestart)
                                             .then(function (success) {
                                                 $ionicLoading.hide();
-                                                var refresh = ZMDataModel.getMonitors(1);
+                                                var refresh = NVRDataModel.getMonitors(1);
                                                 refresh.then(function (data) {
                                                     $scope.monitors = data;
                                                     $scope.$broadcast('scroll.refreshComplete');
@@ -273,7 +273,7 @@ angular.module('zmApp.controllers')
             //------------------------------------------------------------------------
             $scope.$on('$ionicView.enter', function () {
                 // console.log("**VIEW ** Monitor Ctrl Entered");
-                ZMDataModel.setAwake(false);
+                NVRDataModel.setAwake(false);
                 $ionicSideMenuDelegate.canDragContent(true);
                 $scope.areImagesLoading = true;
             });
@@ -301,15 +301,15 @@ angular.module('zmApp.controllers')
                     return;
                 }
 
-                loginData = ZMDataModel.getLogin();
+                loginData = NVRDataModel.getLogin();
                 monitorStateCheck();
-                //console.log("Setting Awake to " + ZMDataModel.getKeepAwake());
-                ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
+                //console.log("Setting Awake to " + NVRDataModel.getKeepAwake());
+                NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
                 // Now lets see if we need to load live screen
 
                 // $rootScope.tappedMid = 1;
                 if ($rootScope.tappedMid != 0) {
-                    ZMDataModel.zmLog("Notification tapped, we need to go to monitor " + $rootScope.tappedMid);
+                    NVRDataModel.log("Notification tapped, we need to go to monitor " + $rootScope.tappedMid);
 
                     var tm = $rootScope.tappedMid;
                     $rootScope.tappedMid = 0;
@@ -346,28 +346,28 @@ angular.module('zmApp.controllers')
             };
 
             function openModal(mid, controllable, controlid, connKey, monitor) {
-                ZMDataModel.zmDebug("MonitorCtrl:Open Monitor Modal with monitor Id=" + mid +
+                NVRDataModel.debug("MonitorCtrl:Open Monitor Modal with monitor Id=" + mid +
                     " and Controllable:" + controllable + " with control ID:" + controlid);
 
 
                 $scope.monitor = monitor;
                 //console.log (">>>>>>>>>>>> MONITOR CRL " + $scope.monitor.
                 $scope.monitorId = mid;
-                $scope.monitorName = ZMDataModel.getMonitorName(mid);
-                $scope.LoginData = ZMDataModel.getLogin();
+                $scope.monitorName = NVRDataModel.getMonitorName(mid);
+                $scope.LoginData = NVRDataModel.getLogin();
                 $scope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
                 $scope.refMonitor = monitor;
-                ZMDataModel.zmLog("Monitor Orientation is: " + $scope.orientation);
+                NVRDataModel.log("Monitor Orientation is: " + $scope.orientation);
                 $rootScope.rand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
 
 
 
                 $scope.showPTZ = false;
                 $scope.monitorId = mid;
-                $scope.monitorName = ZMDataModel.getMonitorName(mid);
+                $scope.monitorName = NVRDataModel.getMonitorName(mid);
                 $scope.controlid = controlid;
 
-                $scope.LoginData = ZMDataModel.getLogin();
+                $scope.LoginData = NVRDataModel.getLogin();
                 $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
 
 
@@ -387,7 +387,7 @@ angular.module('zmApp.controllers')
 
                 // This is a modal to show the monitor footage
                 // We need to switch to always awake if set so the feed doesn't get interrupted
-                ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
+                NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
 
 
 
@@ -415,11 +415,11 @@ angular.module('zmApp.controllers')
                 // stop networking -nph-zms keeps sucking data
 
                 // switch off awake, as liveview is finished
-                ZMDataModel.setAwake(false);
+                NVRDataModel.setAwake(false);
                 $scope.modal.remove();
                 $timeout(function () {
-                    ZMDataModel.zmLog("MonitorCtrl:Stopping network pull...");
-                    if (ZMDataModel.isForceNetworkStop()) ZMDataModel.stopNetwork("MonitorCtrl-closeModal");
+                    NVRDataModel.log("MonitorCtrl:Stopping network pull...");
+                    if (NVRDataModel.isForceNetworkStop()) NVRDataModel.stopNetwork("MonitorCtrl-closeModal");
                 }, 300);
 
 
@@ -459,11 +459,11 @@ angular.module('zmApp.controllers')
                         // in multiserver replace apiurl with baseurl
 
 
-                        ZMDataModel.zmDebug("MonitorCtrl:monitorStateCheck: " + apiMonCheck);
+                        NVRDataModel.debug("MonitorCtrl:monitorStateCheck: " + apiMonCheck);
                         //console.log("**** ZMC CHECK " + apiMonCheck);
                         $http.get(apiMonCheck)
                             .success(function (data) {
-                                ZMDataModel.zmDebug("MonitorCtrl: monitor check state returned: " + JSON.stringify(data));
+                                NVRDataModel.debug("MonitorCtrl: monitor check state returned: " + JSON.stringify(data));
                                 if (data.statustext.indexOf("not running") > -1) {
                                     $scope.monitors[j].Monitor.isRunning = "false";
                                     $scope.monitors[j].Monitor.color = zm.monitorNotRunningColor;
@@ -484,9 +484,9 @@ angular.module('zmApp.controllers')
                                 $scope.monitors[j].Monitor.isRunningText = data.statustext;
                             })
                             .error(function (data) {
-                                ZMDataModel.zmDebug("MonitorCtrl: Error->monitor check state returned: " +
+                                NVRDataModel.debug("MonitorCtrl: Error->monitor check state returned: " +
                                     JSON.stringify(data));
-                                ZMDataModel.displayBanner('error', [$translate.instant('kErrorRetrievingState'), $translate.instant('kPleaseTryAgain')]);
+                                NVRDataModel.displayBanner('error', [$translate.instant('kErrorRetrievingState'), $translate.instant('kPleaseTryAgain')]);
                                 $scope.monitors[j].Monitor.isRunning = "error";
                                 $scope.monitors[j].Monitor.color = zm.monitorErrorColor;
                                 $scope.monitors[j].Monitor.char = "ion-help-circled";
@@ -501,7 +501,7 @@ angular.module('zmApp.controllers')
             function doRefresh() {
                 $scope.monitors = [];
 
-                var refresh = ZMDataModel.getMonitors(1);
+                var refresh = NVRDataModel.getMonitors(1);
 
                 refresh.then(function (data) {
                     $scope.monitors = data;
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index 9d84e2a3..e99ce25c 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -5,7 +5,7 @@
 
 
 
-angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$rootScope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', 'SecuredPopups', '$translate', function ($scope, $rootScope, zm, ZMDataModel, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup, SecuredPopups, $translate) {
+angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$rootScope', 'zm', 'NVRDataModel', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', 'SecuredPopups', '$translate', function ($scope, $rootScope, zm, NVRDataModel, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup, SecuredPopups, $translate) {
 
 
 
@@ -16,7 +16,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     $scope.isModalActive = true;
     var intervalModalHandle;
     var nphTimer;
-    var ld = ZMDataModel.getLogin();
+    var ld = NVRDataModel.getLogin();
 
     $rootScope.authSession = "undefined";
 
@@ -31,24 +31,24 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
 
     $scope.currentStreamMode = 'single';
-    ZMDataModel.zmLog("Using stream mode " + $scope.currentStreamMode);
+    NVRDataModel.log("Using stream mode " + $scope.currentStreamMode);
 
-    ZMDataModel.zmDebug("MonitorModalCtrl called from " + $ionicHistory.currentStateName());
+    NVRDataModel.debug("MonitorModalCtrl called from " + $ionicHistory.currentStateName());
 
     $rootScope.validMonitorId = $scope.monitors[0].Monitor.Id;
-    ZMDataModel.getAuthKey($rootScope.validMonitorId, $scope.monitors[0].Monitor.connKey)
+    NVRDataModel.getAuthKey($rootScope.validMonitorId, $scope.monitors[0].Monitor.connKey)
         .then(function (success) {
                 $ionicLoading.hide();
                 $rootScope.authSession = success;
-                ZMDataModel.zmLog("Modal: Stream authentication construction: " + $rootScope.authSession);
+                NVRDataModel.log("Modal: Stream authentication construction: " + $rootScope.authSession);
 
             },
             function (error) {
 
                 $ionicLoading.hide();
-                ZMDataModel.zmDebug("ModalCtrl: Error details of stream auth:" + error);
+                NVRDataModel.debug("ModalCtrl: Error details of stream auth:" + error);
                 //$rootScope.authSession="";
-                ZMDataModel.zmLog("Modal: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
+                NVRDataModel.log("Modal: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
             });
 
 
@@ -64,7 +64,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     $timeout.cancel(nphTimer);
     nphTimer = $timeout(function () {
         $scope.currentStreamMode = 'jpeg';
-        ZMDataModel.zmLog("Switching playback via nphzms");
+        NVRDataModel.log("Switching playback via nphzms");
     }, zm.nphSwitchTimer);
 
     // This is the PTZ menu
@@ -185,8 +185,8 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
     $rootScope.$on("auth-success", function () {
 
-        ZMDataModel.zmDebug("MonitorModalCtrl: Re-login detected, resetting everything & re-generating connkey");
-        ZMDataModel.stopNetwork("MonitorModal-auth success");
+        NVRDataModel.debug("MonitorModalCtrl: Re-login detected, resetting everything & re-generating connkey");
+        NVRDataModel.stopNetwork("MonitorModal-auth success");
         $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
 
 
@@ -214,7 +214,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
                     //var url = mon.Monitor.streamingURL+"/nph-zms?mode=jpeg&monitor="+mid+$rootScope.authSession+"&rand="+$rootScope.modalRand;
 
-                    var ld = ZMDataModel.getLogin();
+                    var ld = NVRDataModel.getLogin();
                     var url = mon.Monitor.streamingURL + "/nph-zms?mode=jpeg&monitor=" + mid + "&user=" + ld.username + "&pass=" + ld.password + "&rand=" + $rootScope.modalRand;
 
                     //console.log ("URL: " + url);
@@ -280,7 +280,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     //-------------------------------------------------------------
 
     function onPause() {
-        ZMDataModel.zmDebug("ModalCtrl: onpause called");
+        NVRDataModel.debug("ModalCtrl: onpause called");
         $interval.cancel(intervalModalHandle);
         // $interval.cancel(modalIntervalHandle);
 
@@ -289,13 +289,13 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
 
     function onResume() {
-        ZMDataModel.zmDebug("ModalCtrl: Modal resume called");
+        NVRDataModel.debug("ModalCtrl: Modal resume called");
         if ($scope.isModalActive) {
-            ZMDataModel.zmLog("ModalCtrl: Restarting Modal timer on resume");
+            NVRDataModel.log("ModalCtrl: Restarting Modal timer on resume");
 
             $interval.cancel(intervalModalHandle);
 
-            var ld = ZMDataModel.getLogin();
+            var ld = NVRDataModel.getLogin();
 
             intervalModalHandle = $interval(function () {
                 loadModalNotifications();
@@ -313,7 +313,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     //-------------------------------------------------------------
     function loadModalNotifications() {
 
-        if (ZMDataModel.versionCompare($rootScope.apiVersion, "1.30") == -1) {
+        if (NVRDataModel.versionCompare($rootScope.apiVersion, "1.30") == -1) {
 
             return;
         }
@@ -325,14 +325,14 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                       $translate.instant('kMonRecord')
                      ];
         //console.log ("Inside Modal timer...");
-        var apiurl = ZMDataModel.getLogin().apiurl;
+        var apiurl = NVRDataModel.getLogin().apiurl;
         var alarmurl = apiurl + "/monitors/alarm/id:" + $scope.monitorId + "/command:status.json";
-        ZMDataModel.zmLog("Invoking " + alarmurl);
+        NVRDataModel.log("Invoking " + alarmurl);
 
 
         $http.get(alarmurl)
             .then(function (data) {
-                    //  ZMDataModel.zmDebug ("Success in monitor alarmed status " + JSON.stringify(data));
+                    //  NVRDataModel.debug ("Success in monitor alarmed status " + JSON.stringify(data));
 
                     $scope.monStatus = status[parseInt(data.data.status)];
 
@@ -341,7 +341,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
 
                     $scope.monStatus = "";
-                    ZMDataModel.zmDebug("Error in monitor alarmed status ");
+                    NVRDataModel.debug("Error in monitor alarmed status ");
                 });
 
 
@@ -386,8 +386,8 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
     $scope.isBackground = function () {
         // console.log ("Is background called from ModalCtrl and returned " +    
-        // ZMDataModel.isBackground());
-        return ZMDataModel.isBackground();
+        // NVRDataModel.isBackground());
+        return NVRDataModel.isBackground();
     };
 
 
@@ -423,7 +423,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
         var ptzData = "";
         if (cmd.lastIndexOf("preset", 0) === 0) {
-            ZMDataModel.zmDebug("PTZ command is a preset, so skipping xge/lge");
+            NVRDataModel.debug("PTZ command is a preset, so skipping xge/lge");
             ptzData = {
                 view: "request",
                 request: "control",
@@ -454,7 +454,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
             duration: zm.loadingTimeout,
         });
 
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         $ionicLoading.hide();
         $ionicLoading.show({
             template: $translate.instant('kSendingPTZ') + "...",
@@ -493,7 +493,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
         req.error(function (resp) {
             $ionicLoading.hide();
             //console.log("ERROR: " + JSON.stringify(resp));
-            ZMDataModel.zmLog("Error sending PTZ:" + JSON.stringify(resp), "error");
+            NVRDataModel.log("Error sending PTZ:" + JSON.stringify(resp), "error");
         });
     }
 
@@ -513,7 +513,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
 
     $scope.onSwipe = function (m, d) {
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
         if (!ld.canSwipeMonitors) return;
 
         if ($ionicScrollDelegate.$getByHandle("imgscroll").getScrollPosition().zoom != 1) {
@@ -531,14 +531,14 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
         var curstate = $ionicHistory.currentStateName();
         var found = 0;
         var mid;
-        mid = ZMDataModel.getNextMonitor(m, d);
+        mid = NVRDataModel.getNextMonitor(m, d);
 
         $scope.showPTZ = false;
 
         // FIXME: clean this up - in a situation where
         // no monitors are enabled, will it loop for ever?
         do {
-            mid = ZMDataModel.getNextMonitor(m, d);
+            mid = NVRDataModel.getNextMonitor(m, d);
             m = mid;
             //console.log("Next Monitor is " + m);
 
@@ -552,10 +552,10 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                     $scope.monitors[i].Monitor.Enabled != '0') {
                     found = 1;
                     //console.log(mid + "is part of the monitor list");
-                    ZMDataModel.zmDebug("ModalCtrl: swipe detected, moving to " + mid);
+                    NVRDataModel.debug("ModalCtrl: swipe detected, moving to " + mid);
                     break;
                 } else {
-                    ZMDataModel.zmDebug("skipping " + $scope.monitors[i].Monitor.Id +
+                    NVRDataModel.debug("skipping " + $scope.monitors[i].Monitor.Id +
                         " listDisplay=" + $scope.monitors[i].Monitor.listDisplay +
                         " Function=" + $scope.monitors[i].Monitor.Function +
                         " Enabled=" + $scope.monitors[i].Monitor.Enabled);
@@ -586,8 +586,8 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
         function outWithOld() {
 
-            ZMDataModel.zmLog("ModalCtrl:Stopping network pull...");
-            ZMDataModel.stopNetwork("MonitorModal-outwithOld");
+            NVRDataModel.log("ModalCtrl:Stopping network pull...");
+            NVRDataModel.stopNetwork("MonitorModal-outwithOld");
             $scope.rand = Math.floor((Math.random() * 100000) + 1);
             $scope.animationInProgress = true;
 
@@ -596,8 +596,8 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                 element.addClass(slidein)
                     .one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', inWithNew);
                 $scope.monitorId = mid;
-                $scope.monitorName = ZMDataModel.getMonitorName(mid);
-                $scope.monitor = ZMDataModel.getMonitorObject(mid);
+                $scope.monitorName = NVRDataModel.getMonitorName(mid);
+                $scope.monitor = NVRDataModel.getMonitorObject(mid);
                 configurePTZ($scope.monitorId);
             }, 200);
         }
@@ -607,19 +607,19 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
             element.removeClass(slidein);
             $scope.animationInProgress = false;
 
-            ZMDataModel.zmLog("New image loaded in");
-            var ld = ZMDataModel.getLogin();
+            NVRDataModel.log("New image loaded in");
+            var ld = NVRDataModel.getLogin();
             carouselUtils.setStop(false);
             if (ld.useNphZms == true) {
                 $scope.currentStreamMode = 'single';
-                ZMDataModel.zmLog("Setting timer to play nph-zms mode");
+                NVRDataModel.log("Setting timer to play nph-zms mode");
                 // first 5 seconds, load a snapshot, then switch to real FPS display
                 // this is to avoid initial image load delay
                 // FIXME: 5 seconds fair?
                 $timeout.cancel(nphTimer);
                 nphTimer = $timeout(function () {
                     $scope.currentStreamMode = 'jpeg';
-                    ZMDataModel.zmLog("Switching playback via nphzms");
+                    NVRDataModel.log("Switching playback via nphzms");
                 }, zm.nphSwitchTimer);
             }
 
@@ -644,7 +644,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
             noBackdrop: true,
             duration: 1000
         });
-        ZMDataModel.zmDebug("ModalCtrl:Photo saved successfuly");
+        NVRDataModel.debug("ModalCtrl:Photo saved successfuly");
     }
 
     function SaveError(e) {
@@ -653,7 +653,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
             noBackdrop: true,
             duration: 2000
         });
-        ZMDataModel.zmLog("Error saving image: " + e.message);
+        NVRDataModel.log("Error saving image: " + e.message);
         //console.log("***ERROR");
     }
 
@@ -688,10 +688,10 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
             enableAlarm(mid, mode);
 
         function enableAlarm(mid, mode) {
-            var apiurl = ZMDataModel.getLogin().apiurl;
+            var apiurl = NVRDataModel.getLogin().apiurl;
             var c = mode ? "on" : "off";
             var alarmurl = apiurl + "/monitors/alarm/id:" + mid + "/command:" + c + ".json";
-            ZMDataModel.zmLog("Invoking " + alarmurl);
+            NVRDataModel.log("Invoking " + alarmurl);
 
             var status = mode ? $translate.instant('kForcingAlarm') : $translate.instant('kCancellingAlarm');
             $ionicLoading.show({
@@ -715,7 +715,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                             noBackdrop: true,
                             duration: 3000,
                         });
-                        ZMDataModel.zmDebug("Error in enableAlarm " + JSON.stringify(error));
+                        NVRDataModel.debug("Error in enableAlarm " + JSON.stringify(error));
                     });
         }
 
@@ -773,13 +773,13 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
             duration: zm.httpTimeout
         });
 
-        ZMDataModel.zmDebug("ModalCtrl: SaveImageToPhone called");
+        NVRDataModel.debug("ModalCtrl: SaveImageToPhone called");
         var canvas, context, imageDataUrl, imageData;
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var url = loginData.streamingurl +
             '/zms?mode=single&monitor=' + mid +
             $rootScope.authSession;
-        ZMDataModel.zmLog("SavetoPhone:Trying to save image from " + url);
+        NVRDataModel.log("SavetoPhone:Trying to save image from " + url);
 
         var img = new Image();
         img.onload = function () {
@@ -836,7 +836,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
 
     $scope.reloadView = function () {
-        ZMDataModel.zmLog("Reloading view for modal view, recomputing rand");
+        NVRDataModel.log("Reloading view for modal view, recomputing rand");
         $rootScope.modalRand = Math.floor((Math.random() * 100000) + 1);
         $scope.isModalActive = true;
     };
@@ -850,7 +850,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     $scope.$on('$ionicView.enter', function () {
 
 
-
+        //https://server/zm/api/zones/forMonitor/X.json
 
     });
 
@@ -863,12 +863,12 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
     $scope.$on('$ionicView.beforeLeave', function () {
 
-        ZMDataModel.zmLog("Nullifying the streams...");
+        NVRDataModel.log("Nullifying the streams...");
 
 
         var element = document.getElementById("singlemonitor");
         if (element) {
-            ZMDataModel.zmDebug("Nullifying  " + element.src);
+            NVRDataModel.debug("Nullifying  " + element.src);
             element.src = "";
         }
 
@@ -888,7 +888,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
         //console.log("**MODAL REMOVED: Stopping modal timer");
         $interval.cancel(intervalModalHandle);
 
-        ZMDataModel.zmDebug("Modal removed - killing connkey");
+        NVRDataModel.debug("Modal removed - killing connkey");
         controlStream(17, "", $scope.connKey, -1);
 
 
@@ -914,7 +914,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                 duration: zm.loadingTimeout,
             });
         }
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
 
         /*
         var CMD_NONE = 0;
@@ -968,7 +968,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
         req.success(function (resp) {
 
             if (resp.result == "Ok" && ndx != -1) {
-                var ld = ZMDataModel.getLogin();
+                var ld = NVRDataModel.getLogin();
                 var apiurl = ld.apiurl + "/events/" + resp.status.event + ".json";
                 //console.log ("API " + apiurl);
                 $http.get(apiurl)
@@ -997,7 +997,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
         req.error(function (resp) {
             //console.log("ERROR: " + JSON.stringify(resp));
-            ZMDataModel.zmLog("Error sending event command " + JSON.stringify(resp), "error");
+            NVRDataModel.log("Error sending event command " + JSON.stringify(resp), "error");
         });
     }
 
@@ -1008,13 +1008,13 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     $scope.zoomImage = function (val) {
         var zl = parseInt($ionicScrollDelegate.$getByHandle("imgscroll").getScrollPosition().zoom);
         if (zl == 1 && val == -1) {
-            ZMDataModel.zmDebug("Already zoomed out max");
+            NVRDataModel.debug("Already zoomed out max");
             return;
         }
 
 
         zl += val;
-        ZMDataModel.zmDebug("Zoom level is " + zl);
+        NVRDataModel.debug("Zoom level is " + zl);
         $ionicScrollDelegate.$getByHandle("imgscroll").zoomTo(zl, true);
 
     };
@@ -1044,8 +1044,8 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
         $scope.presetOn = true;
         $scope.controlToggle = "hide buttons";
 
-        ZMDataModel.zmDebug("configurePTZ: called with mid=" + mid);
-        var ld = ZMDataModel.getLogin();
+        NVRDataModel.debug("configurePTZ: called with mid=" + mid);
+        var ld = NVRDataModel.getLogin();
         var url = ld.apiurl + "/monitors/" + mid + ".json";
         $http.get(url)
             .success(function (data) {
@@ -1059,9 +1059,9 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                 if ($scope.isControllable == '1') {
 
 
-                    var apiurl = ZMDataModel.getLogin().apiurl;
+                    var apiurl = NVRDataModel.getLogin().apiurl;
                     var myurl = apiurl + "/controls/" + $scope.controlid + ".json";
-                    ZMDataModel.zmDebug("configurePTZ : getting controllable data " + myurl);
+                    NVRDataModel.debug("configurePTZ : getting controllable data " + myurl);
 
                     $http.get(myurl)
                         .success(function (data) {
@@ -1096,7 +1096,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                             }
 
 
-                            ZMDataModel.zmDebug("configurePTZ: control data returned " + JSON.stringify(data));
+                            NVRDataModel.debug("configurePTZ: control data returned " + JSON.stringify(data));
 
                             if (data.control.Control.CanMoveRel == '1') {
 
@@ -1116,7 +1116,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
 
                             // presets
-                            ZMDataModel.zmDebug("ConfigurePTZ Preset value is " + data.control.Control.HasPresets);
+                            NVRDataModel.debug("ConfigurePTZ Preset value is " + data.control.Control.HasPresets);
                             $scope.ptzPresets = [];
 
                             if (data.control.Control.HasPresets == '1') {
@@ -1124,7 +1124,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
 
                                 $scope.ptzPresetCount = parseInt(data.control.Control.NumPresets);
 
-                                ZMDataModel.zmDebug("ConfigurePTZ Number of presets is " + $scope.ptzPresetCount);
+                                NVRDataModel.debug("ConfigurePTZ Number of presets is " + $scope.ptzPresetCount);
 
 
                                 for (var p = 0; p < $scope.ptzPresetCount; p++) {
@@ -1195,20 +1195,20 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                             }
 
 
-                            ZMDataModel.zmLog("ConfigurePTZ Modal: ControlDB reports PTZ command to be " + $scope.ptzMoveCommand);
+                            NVRDataModel.log("ConfigurePTZ Modal: ControlDB reports PTZ command to be " + $scope.ptzMoveCommand);
                         })
                         .error(function (data) {
                             //  console.log("** Error retrieving move PTZ command");
-                            ZMDataModel.zmLog("ConfigurePTZ : Error retrieving PTZ command  " + JSON.stringify(data), "error");
+                            NVRDataModel.log("ConfigurePTZ : Error retrieving PTZ command  " + JSON.stringify(data), "error");
                         });
 
                 } else {
-                    ZMDataModel.zmLog("configurePTZ " + mid + " is not PTZ controllable");
+                    NVRDataModel.log("configurePTZ " + mid + " is not PTZ controllable");
                 }
             })
             .error(function (data) {
                 //  console.log("** Error retrieving move PTZ command");
-                ZMDataModel.zmLog("configurePTZ : Error retrieving PTZ command  " + JSON.stringify(data), "error");
+                NVRDataModel.log("configurePTZ : Error retrieving PTZ command  " + JSON.stringify(data), "error");
             });
 
 
@@ -1222,7 +1222,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
         document.addEventListener("pause", onPause, false);
         document.addEventListener("resume", onResume, false);
 
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
         //currentEvent = $scope.currentEvent;
         $scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
         //console.log ("************* GENERATED CONNKEY " + $scope.connKey);
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 9e18c3f9..3dfac5dc 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -4,7 +4,7 @@
 /* global cordova,StatusBar,angular,console,ionic,Packery, Draggabilly, imagesLoaded, ConnectSDK */
 
 
-angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '$rootScope', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', 'imageLoadingDataShare', '$window', '$localstorage', '$translate', function ($scope, $rootScope, ZMDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm, $ionicPopover, $controller, imageLoadingDataShare, $window, $localstorage, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '$rootScope', 'NVRDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', 'imageLoadingDataShare', '$window', '$localstorage', '$translate', function ($scope, $rootScope, NVRDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm, $ionicPopover, $controller, imageLoadingDataShare, $window, $localstorage, $translate) {
 
     //---------------------------------------------------------------------
     // Controller main
@@ -34,12 +34,12 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         e.preventDefault();
         if ($scope.modal != undefined && $scope.modal.isShown()) {
             // switch off awake, as liveview is finished
-            ZMDataModel.zmDebug("Modal is open, closing it");
-            ZMDataModel.setAwake(false);
+            NVRDataModel.debug("Modal is open, closing it");
+            NVRDataModel.setAwake(false);
             $scope.isModalActive = false;
             cleanupOnClose();
         } else {
-            ZMDataModel.zmDebug("Modal is closed, so toggling or exiting");
+            NVRDataModel.debug("Modal is closed, so toggling or exiting");
             if (!$ionicSideMenuDelegate.isOpenLeft()) {
                 $ionicSideMenuDelegate.toggleLeft();
 
@@ -79,20 +79,20 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         var progressCalled = false;
         draggies = [];
         var layouttype = true;
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
 
 
         var positionsStr = ld.packeryPositions;
         var positions = {};
 
         if (positionsStr == '') {
-            ZMDataModel.zmLog("Did NOT find a packery layout");
+            NVRDataModel.log("Did NOT find a packery layout");
             layouttype = true;
         } else {
 
             //console.log ("POSITION STR IS " + positionsStr);
             positions = JSON.parse(positionsStr);
-            ZMDataModel.zmLog("found a packery layout");
+            NVRDataModel.log("found a packery layout");
             layouttype = false;
         }
 
@@ -103,16 +103,16 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
                 cnt++;
         });
 
-        ZMDataModel.zmLog("Monitors that are active and not DOM hidden: " + cnt + " while grid has " + positions.length);
+        NVRDataModel.log("Monitors that are active and not DOM hidden: " + cnt + " while grid has " + positions.length);
 
-        if (cnt > ZMDataModel.getLogin().maxMontage) {
-            cnt = ZMDataModel.getLogin().maxMontage;
-            ZMDataModel.zmLog("restricting monitor count to " + cnt + " due to max-montage setting");
+        if (cnt > NVRDataModel.getLogin().maxMontage) {
+            cnt = NVRDataModel.getLogin().maxMontage;
+            NVRDataModel.log("restricting monitor count to " + cnt + " due to max-montage setting");
         }
 
         if (cnt != positions.length) {
 
-            ZMDataModel.zmLog("Whoops!! Monitors have changed. I'm resetting layouts, sorry!");
+            NVRDataModel.log("Whoops!! Monitors have changed. I'm resetting layouts, sorry!");
             layouttype = true;
             positions = {};
         }
@@ -130,7 +130,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
         imagesLoaded(elem).on('always', function () {
             //console.log ("******** ALL IMAGES LOADED");
-            ZMDataModel.zmDebug("All images loaded");
+            NVRDataModel.debug("All images loaded");
             $scope.allImagesLoaded = true;
 
             $ionicLoading.hide();
@@ -144,7 +144,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
             });
             if (!progressCalled) {
-                ZMDataModel.zmLog("*** BUG PROGRESS WAS NOT CALLED");
+                NVRDataModel.log("*** BUG PROGRESS WAS NOT CALLED");
                 pckry.reloadItems();
 
             }
@@ -164,27 +164,27 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
 
                 if (!isEmpty(positions)) {
-                    ZMDataModel.zmLog("Arranging as per packery grid");
+                    NVRDataModel.log("Arranging as per packery grid");
 
                     for (var i = 0; i < $scope.MontageMonitors.length; i++) {
                         for (var j = 0; j < positions.length; j++) {
                             if ($scope.MontageMonitors[i].Monitor.Id == positions[j].attr) {
                                 $scope.MontageMonitors[i].Monitor.gridScale = positions[j].size;
                                 $scope.MontageMonitors[i].Monitor.listDisplay = positions[j].display;
-                                ZMDataModel.zmDebug("Setting monitor ID: " + $scope.MontageMonitors[i].Monitor.Id + " to size: " + positions[j].size + " and display:" + positions[j].display);
+                                NVRDataModel.debug("Setting monitor ID: " + $scope.MontageMonitors[i].Monitor.Id + " to size: " + positions[j].size + " and display:" + positions[j].display);
                             }
                             //console.log ("Index:"+positions[j].attr+ " with size: " + positions[j].size);
                         }
                     }
 
 
-                    ZMDataModel.zmDebug("All images loaded, doing image layout");
+                    NVRDataModel.debug("All images loaded, doing image layout");
                     $timeout(function () {
                         pckry.initShiftLayout(positions, 'data-item-id');
                     }, 0);
                 }
                 $timeout(function () {
-                    ZMDataModel.zmLog("Force calling resize");
+                    NVRDataModel.log("Force calling resize");
                     pckry.shiftLayout();
                 }, zm.packeryTimer); // don't ask
 
@@ -195,7 +195,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         });
 
         function itemDragged(item) {
-            ZMDataModel.zmDebug("drag complete");
+            NVRDataModel.debug("drag complete");
 
             //pckry.getItemElements().forEach(function (itemElem) {
 
@@ -204,9 +204,9 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
             var positions = pckry.getShiftPositions('data-item-id');
             //console.log ("POSITIONS MAP " + JSON.stringify(positions));
-            var ld = ZMDataModel.getLogin();
+            var ld = NVRDataModel.getLogin();
             ld.packeryPositions = JSON.stringify(positions);
-            ZMDataModel.setLogin(ld);
+            NVRDataModel.setLogin(ld);
         }
 
 
@@ -257,7 +257,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
     function loadAlarmStatus() {
 
-        if (ZMDataModel.versionCompare($rootScope.apiVersion, "1.30") == -1) {
+        if (NVRDataModel.versionCompare($rootScope.apiVersion, "1.30") == -1) {
 
             return;
         }
@@ -278,7 +278,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     // get alarm status over HTTP for a single monitor
     //-----------------------------------------------------------------------
     function getAlarmStatus(monitor) {
-        var apiurl = ZMDataModel.getLogin().apiurl;
+        var apiurl = NVRDataModel.getLogin().apiurl;
         //console.log ("ALARM CALLED WITH " +JSON.stringify(monitor));
 
         var alarmurl = apiurl + "/monitors/alarm/id:" + monitor.Monitor.Id + "/command:status.json";
@@ -287,7 +287,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
         $http.get(alarmurl)
             .then(function (data) {
-                    //  ZMDataModel.zmDebug ("Success in monitor alarmed status " + JSON.stringify(data));
+                    //  NVRDataModel.debug ("Success in monitor alarmed status " + JSON.stringify(data));
 
                     var sid = parseInt(data.data.status);
                     switch (sid) {
@@ -314,7 +314,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
 
                     monitor.Monitor.alarmState = 'color:rgba(0,0,0,0);';
-                    ZMDataModel.zmDebug("Error in monitor alarmed status ");
+                    NVRDataModel.debug("Error in monitor alarmed status ");
                 });
     }
 
@@ -326,7 +326,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     function loadNotifications() {
 
         if (!$scope.allImagesLoaded) {
-            ZMDataModel.zmDebug("skipping image refresh, packery is still loading");
+            NVRDataModel.debug("skipping image refresh, packery is still loading");
             return;
         }
 
@@ -341,7 +341,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     };
 
     $scope.saveReorder = function () {
-        ZMDataModel.zmDebug("Saving monitor hide/unhide and sizes");
+        NVRDataModel.debug("Saving monitor hide/unhide and sizes");
 
 
 
@@ -363,10 +363,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
                 //console.log('Saving packery order now, layout rendered');
                 $timeout(function () {
                     var positions = pckry.getShiftPositions('data-item-id');
-                    ZMDataModel.zmDebug("POSITIONS MAP " + JSON.stringify(positions));
-                    var ld = ZMDataModel.getLogin();
+                    NVRDataModel.debug("POSITIONS MAP " + JSON.stringify(positions));
+                    var ld = NVRDataModel.getLogin();
                     ld.packeryPositions = JSON.stringify(positions);
-                    ZMDataModel.setLogin(ld);
+                    NVRDataModel.setLogin(ld);
                 });
             });
 
@@ -392,7 +392,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         else
             $scope.copyMontage[i].Monitor.listDisplay = 'show';
 
-        ZMDataModel.zmDebug("index " + i + " is now " + $scope.copyMontage[i].Monitor.listDisplay);
+        NVRDataModel.debug("index " + i + " is now " + $scope.copyMontage[i].Monitor.listDisplay);
     };
 
     $scope.hideUnhide = function () {
@@ -434,7 +434,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
             for (var j = 0; j < $scope.MontageMonitors.length; j++) {
                 if ($scope.MontageMonitors[j].Monitor.Id == alarmMonitors[i]) {
-                    ZMDataModel.zmDebug("Enabling alarm for Monitor:" + $scope.monitors[j].Monitor.Id);
+                    NVRDataModel.debug("Enabling alarm for Monitor:" + $scope.monitors[j].Monitor.Id);
                     $scope.MontageMonitors[j].Monitor.isAlarmed = true;
                     scheduleRemoveFlash(j);
                 }
@@ -446,10 +446,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     });
 
     function scheduleRemoveFlash(id) {
-        ZMDataModel.zmDebug("Scheduled a " + zm.alarmFlashTimer + "ms timer for dis-alarming monitor ID:" + $scope.MontageMonitors[id].Monitor.Id);
+        NVRDataModel.debug("Scheduled a " + zm.alarmFlashTimer + "ms timer for dis-alarming monitor ID:" + $scope.MontageMonitors[id].Monitor.Id);
         $timeout(function () {
             $scope.MontageMonitors[id].Monitor.isAlarmed = false;
-            ZMDataModel.zmDebug("dis-alarming monitor ID:" + $scope.MontageMonitors[id].Monitor.Id);
+            NVRDataModel.debug("dis-alarming monitor ID:" + $scope.MontageMonitors[id].Monitor.Id);
         }, zm.alarmFlashTimer);
     }
 
@@ -475,7 +475,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         $rootScope.isAlarm = !$rootScope.isAlarm;
 
         $scope.minimal = !$scope.minimal;
-        ZMDataModel.zmDebug("MontageCtrl: switch minimal is " + $scope.minimal);
+        NVRDataModel.debug("MontageCtrl: switch minimal is " + $scope.minimal);
         ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
         //console.log ("alarms:Cancelling timer");
         $interval.cancel(intervalHandleMontage);
@@ -503,8 +503,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
     $scope.isBackground = function () {
         //console.log ("Is background called from Montage and returned " +    
-        //ZMDataModel.isBackground());
-        return ZMDataModel.isBackground();
+        //NVRDataModel.isBackground());
+        return NVRDataModel.isBackground();
     };
 
 
@@ -513,7 +513,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     //---------------------------------------------------------------------
     $scope.switchMinimal = function () {
         $scope.minimal = !$scope.minimal;
-        ZMDataModel.zmDebug("MontageCtrl: switch minimal is " + $scope.minimal);
+        NVRDataModel.debug("MontageCtrl: switch minimal is " + $scope.minimal);
         // console.log("Hide Statusbar");
         ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
         //console.log ("minimal switch:Cancelling timer");
@@ -566,12 +566,12 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         $ionicSideMenuDelegate.canDragContent($scope.isDragabillyOn ? false : true);
 
         //$timeout(function(){pckry.reloadItems();},10);
-        ZMDataModel.zmDebug("setting dragabilly to " + $scope.isDragabillyOn);
+        NVRDataModel.debug("setting dragabilly to " + $scope.isDragabillyOn);
         if ($scope.isDragabillyOn) {
             $scope.showSizeButtons = true;
 
             $scope.dragBorder = "dragborder";
-            ZMDataModel.zmDebug("Enabling drag for " + draggies.length + " items");
+            NVRDataModel.debug("Enabling drag for " + draggies.length + " items");
             for (i = 0; i < draggies.length; i++) {
                 draggies[i].enable();
                 draggies[i].bindHandles();
@@ -581,7 +581,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
             //  $timeout(function(){pckry.reloadItems();$timeout(function(){pckry.layout();},300);},100);
         } else {
             $scope.dragBorder = "";
-            ZMDataModel.zmDebug("Disabling drag for " + draggies.length + " items");
+            NVRDataModel.debug("Disabling drag for " + draggies.length + " items");
             for (i = 0; i < draggies.length; i++) {
                 draggies[i].disable();
                 draggies[i].unbindHandles();
@@ -594,9 +594,9 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
                 $timeout(function () {
                     var positions = pckry.getShiftPositions('data-item-id');
                     //console.log ("POSITIONS MAP " + JSON.stringify(positions));
-                    var ld = ZMDataModel.getLogin();
+                    var ld = NVRDataModel.getLogin();
                     ld.packeryPositions = JSON.stringify(positions);
-                    ZMDataModel.setLogin(ld);
+                    NVRDataModel.setLogin(ld);
                 }, 300);
             }, 100);
 
@@ -614,13 +614,13 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     };
 
     function openModal(mid, controllable, controlid, connKey, monitor) {
-        ZMDataModel.zmDebug("MontageCtrl: Open Monitor Modal with monitor Id=" + mid + " and Controllable:" + controllable + " with control ID:" + controlid);
+        NVRDataModel.debug("MontageCtrl: Open Monitor Modal with monitor Id=" + mid + " and Controllable:" + controllable + " with control ID:" + controlid);
         // $scope.isModalActive = true;
         // Note: no need to setAwake(true) as its already awake
         // in montage view
 
-        ZMDataModel.zmLog("Cancelling montage timer, opening Modal");
-        // ZMDataModel.zmLog("Starting Modal timer");
+        NVRDataModel.log("Cancelling montage timer, opening Modal");
+        // NVRDataModel.log("Starting Modal timer");
         //console.log ("openModal:Cancelling timer");
         $interval.cancel(intervalHandleMontage);
         $interval.cancel(intervalHandleAlarmStatus);
@@ -628,10 +628,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         $scope.monitor = monitor;
         $scope.showPTZ = false;
         $scope.monitorId = mid;
-        $scope.monitorName = ZMDataModel.getMonitorName(mid);
+        $scope.monitorName = NVRDataModel.getMonitorName(mid);
         $scope.controlid = controlid;
 
-        $scope.LoginData = ZMDataModel.getLogin();
+        $scope.LoginData = NVRDataModel.getLogin();
         $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
 
 
@@ -652,7 +652,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
         // This is a modal to show the monitor footage
         // We need to switch to always awake if set so the feed doesn't get interrupted
-        ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
+        NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
 
 
 
@@ -689,15 +689,15 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     function cleanupOnClose() {
         $scope.modal.remove();
         $timeout(function () {
-            ZMDataModel.zmLog("MontageCtrl:Stopping network pull...");
-            if (ZMDataModel.isForceNetworkStop()) ZMDataModel.stopNetwork();
+            NVRDataModel.log("MontageCtrl:Stopping network pull...");
+            if (NVRDataModel.isForceNetworkStop()) NVRDataModel.stopNetwork();
         }, 50);
 
         $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
         $scope.isModalActive = false;
 
-        ZMDataModel.zmLog("Restarting montage timer, closing Modal...");
-        var ld = ZMDataModel.getLogin();
+        NVRDataModel.log("Restarting montage timer, closing Modal...");
+        var ld = NVRDataModel.getLogin();
         // console.log ("closeModal: Cancelling timer");
         $interval.cancel(intervalHandleMontage);
         $interval.cancel(intervalHandleAlarmStatus);
@@ -718,7 +718,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     }
 
     $scope.closeModal = function () {
-        ZMDataModel.zmDebug("MontageCtrl: Close & Destroy Monitor Modal");
+        NVRDataModel.debug("MontageCtrl: Close & Destroy Monitor Modal");
         cleanupOnClose();
         // $scope.isModalActive = false;
         // Note: no need to setAwake(false) as needs to be awake
@@ -739,7 +739,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     //---------------------------------------------------------------------
 
     function onPause() {
-        ZMDataModel.zmDebug("MontageCtrl: onpause called");
+        NVRDataModel.debug("MontageCtrl: onpause called");
         $interval.cancel(intervalHandleMontage);
         $interval.cancel(intervalHandleAlarmStatus);
         // $interval.cancel(modalIntervalHandle);
@@ -780,7 +780,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
 
     function orientationChanged() {
-        ZMDataModel.zmDebug("Detected orientation change, redoing packery resize");
+        NVRDataModel.debug("Detected orientation change, redoing packery resize");
         $timeout(function () {
             pckry.onresize();
         });
@@ -790,7 +790,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
         $scope.showSizeButtons = !$scope.showSizeButtons;
         
-        ZMDataModel.zmDebug("toggling size buttons:" + $scope.showSizeButtons);
+        NVRDataModel.debug("toggling size buttons:" + $scope.showSizeButtons);
         if ($scope.showSizeButtons) $ionicScrollDelegate.$getByHandle("montage-delegate").scrollTop();
     };
 
@@ -807,12 +807,12 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
 
     $scope.$on('$ionicView.afterEnter', function () {
-        ZMDataModel.zmDebug("Setting image mode to snapshot, will change to image when packery is all done");
+        NVRDataModel.debug("Setting image mode to snapshot, will change to image when packery is all done");
         $scope.allImagesLoaded = false;
         $scope.isDragabillyOn = false;
         $scope.allImagesLoaded = false;
         $scope.gridScale = "grid-item-50";
-        $scope.LoginData = ZMDataModel.getLogin();
+        $scope.LoginData = NVRDataModel.getLogin();
         $scope.monLimit = $scope.LoginData.maxMontage;
         $scope.showSizeButtons = false;
 
@@ -820,7 +820,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         $scope.monitors = message;
         $scope.MontageMonitors = angular.copy(message);
         $scope.sliderChanging = false;
-        loginData = ZMDataModel.getLogin();
+        loginData = NVRDataModel.getLogin();
 
         $scope.isRefresh = $stateParams.isRefresh;
         sizeInProgress = false;
@@ -833,9 +833,9 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
 
         //$scope.areImagesLoading = true;
-        var ld = ZMDataModel.getLogin();
-        //console.log("Setting Awake to " + ZMDataModel.getKeepAwake());
-        ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
+        var ld = NVRDataModel.getLogin();
+        //console.log("Setting Awake to " + NVRDataModel.getKeepAwake());
+        NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
 
         $interval.cancel(intervalHandleMontage);
         $interval.cancel(intervalHandleAlarmStatus);
@@ -867,7 +867,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
             return;
         }
 
-        ld = ZMDataModel.getLogin();
+        ld = NVRDataModel.getLogin();
 
         $rootScope.authSession = "undefined";
         $ionicLoading.show({
@@ -880,7 +880,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         });
 
 
-        ZMDataModel.zmLog("Inside Montage Ctrl:We found " + $scope.monitors.length + " monitors");
+        NVRDataModel.log("Inside Montage Ctrl:We found " + $scope.monitors.length + " monitors");
 
         // set them all at 50% for packery
         for (var i = 0; i < $scope.MontageMonitors.length; i++) {
@@ -891,21 +891,21 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         }
 
         $rootScope.validMonitorId = $scope.monitors[0].Monitor.Id;
-        ZMDataModel.getAuthKey($rootScope.validMonitorId, (Math.floor((Math.random() * 999999) + 1)).toString())
+        NVRDataModel.getAuthKey($rootScope.validMonitorId, (Math.floor((Math.random() * 999999) + 1)).toString())
             .then(function (success) {
                     $ionicLoading.hide();
                     //console.log(success);
                     $rootScope.authSession = success;
-                    ZMDataModel.zmLog("Stream authentication construction: " +
+                    NVRDataModel.log("Stream authentication construction: " +
                         $rootScope.authSession);
 
                 },
                 function (error) {
 
                     $ionicLoading.hide();
-                    ZMDataModel.zmDebug("MontageCtrl: Error in authkey retrieval " + error);
+                    NVRDataModel.debug("MontageCtrl: Error in authkey retrieval " + error);
                     //$rootScope.authSession="";
-                    ZMDataModel.zmLog("MontageCtrl: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
+                    NVRDataModel.log("MontageCtrl: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
                 });
 
         //console.log("**VIEW ** Montage Ctrl AFTER ENTER");
@@ -934,9 +934,9 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
         // make sure this is applied in scope digest to stop network pull
         // thats why we are doing it beforeLeave
 
-        if (ZMDataModel.isForceNetworkStop()) {
-            ZMDataModel.zmLog("MontageCtrl:Stopping network pull...");
-            ZMDataModel.stopNetwork();
+        if (NVRDataModel.isForceNetworkStop()) {
+            NVRDataModel.log("MontageCtrl:Stopping network pull...");
+            NVRDataModel.stopNetwork();
 
         }
 
@@ -977,9 +977,9 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
                 //console.log ("Layout complete");
                 var positions = pckry.getShiftPositions('data-item-id');
                 //console.log ("POSITIONS MAP " + JSON.stringify(positions));
-                var ld = ZMDataModel.getLogin();
+                var ld = NVRDataModel.getLogin();
                 ld.packeryPositions = JSON.stringify(positions);
-                ZMDataModel.setLogin(ld);
+                NVRDataModel.setLogin(ld);
                 // $scope.slider.monsize = 2;
             });
             //layout(pckry);
@@ -1059,9 +1059,9 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
             $timeout(function () {
                 var positions = pckry.getShiftPositions('data-item-id');
                 //console.log ("POSITIONS MAP " + JSON.stringify(positions));
-                var ld = ZMDataModel.getLogin();
+                var ld = NVRDataModel.getLogin();
                 ld.packeryPositions = JSON.stringify(positions);
-                ZMDataModel.setLogin(ld);
+                NVRDataModel.setLogin(ld);
                 $ionicLoading.hide();
                 $scope.sliderChanging = false;
             }, zm.packeryTimer);
@@ -1098,19 +1098,19 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
 
     $scope.reloadView = function () {
         $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
-        ZMDataModel.zmLog("User action: image reload " + $rootScope.rand);
+        NVRDataModel.log("User action: image reload " + $rootScope.rand);
     };
 
     $scope.doRefresh = function () {
 
 
         // console.log("***Pull to Refresh, recomputing Rand");
-        ZMDataModel.zmLog("Reloading view for montage view, recomputing rand");
+        NVRDataModel.log("Reloading view for montage view, recomputing rand");
         $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
         $scope.monitors = [];
         imageLoadingDataShare.set(0);
 
-        var refresh = ZMDataModel.getMonitors(1);
+        var refresh = NVRDataModel.getMonitors(1);
 
         refresh.then(function (data) {
             $scope.monitors = data;
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 71a37c63..8b049143 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -6,7 +6,7 @@
 
 // FIXME: This is a copy of montageCtrl - needs a lot of code cleanup
 
-angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$scope', '$rootScope', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', 'imageLoadingDataShare', '$window', '$translate', function ($scope, $rootScope, ZMDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm, $ionicPopover, $controller, imageLoadingDataShare, $window, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$scope', '$rootScope', 'NVRDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', 'imageLoadingDataShare', '$window', '$translate', function ($scope, $rootScope, NVRDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm, $ionicPopover, $controller, imageLoadingDataShare, $window, $translate) {
 
 
     //--------------------------------------
@@ -14,7 +14,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     //---------------------------------------
 
     $scope.prettifyDate = function (str) {
-        return moment(str).format('MMM Do, YYYY ' + ZMDataModel.getTimeFormat());
+        return moment(str).format('MMM Do, YYYY ' + NVRDataModel.getTimeFormat());
     };
 
     function prettifyDate(str) {
@@ -28,7 +28,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
 
     $scope.prettify = function (str) {
-        return moment(str).format(ZMDataModel.getTimeFormat() + ' on MMMM Do YYYY');
+        return moment(str).format(NVRDataModel.getTimeFormat() + ' on MMMM Do YYYY');
     };
 
 
@@ -51,7 +51,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
             var cmd = $scope.MontageMonitors[m].Monitor.isPaused ? 1 : 2;
 
-            ZMDataModel.zmDebug("Sending CMD:" + cmd + " for monitor " + $scope.MontageMonitors[m].Monitor.Name);
+            NVRDataModel.debug("Sending CMD:" + cmd + " for monitor " + $scope.MontageMonitors[m].Monitor.Name);
             controlEventStream(cmd, "", $scope.MontageMonitors[m].Monitor.connKey, -1);
         }
     };
@@ -81,17 +81,17 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     function footerCollapse() {
         // console.log ("**************** COLLAPSE CALLED ***************");
         if (readyToRun == false) {
-            ZMDataModel.zmDebug("fake call to footerCollapse - ignoring");
+            NVRDataModel.debug("fake call to footerCollapse - ignoring");
             return;
         }
 
         $ionicSideMenuDelegate.canDragContent(true);
 
-        ZMDataModel.stopNetwork("MontageHistory-footerCollapse");
-        var ld = ZMDataModel.getLogin();
+        NVRDataModel.stopNetwork("MontageHistory-footerCollapse");
+        var ld = NVRDataModel.getLogin();
 
         $scope.sliderVal.realRate = $scope.sliderVal.rate * 100;
-        //ZMDataModel.zmDebug ("Playback rate is:"  + $scope.sliderVal.realRate);
+        //NVRDataModel.debug ("Playback rate is:"  + $scope.sliderVal.realRate);
 
         var TimeObjectFrom = moment($scope.datetimeValueFrom.value).format("YYYY-MM-DD HH:mm");
         var TimeObjectTo = moment($scope.datetimeValueTo.value).format('YYYY-MM-DD HH:mm');
@@ -106,7 +106,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         for (var i = 0; i < $scope.MontageMonitors.length; i++) {
             // generate new connKeys if timeline changes
             if ($scope.MontageMonitors[i].Monitor.eventUrl != 'img/noevent.png') {
-                ZMDataModel.zmLog("footerCollapse: Calling kill with " + $scope.MontageMonitors[i].Monitor.connKey + " because url is " + $scope.MontageMonitors[i].Monitor.eventUrl);
+                NVRDataModel.log("footerCollapse: Calling kill with " + $scope.MontageMonitors[i].Monitor.connKey + " because url is " + $scope.MontageMonitors[i].Monitor.eventUrl);
                 var tmpCK = angular.copy($scope.MontageMonitors[i].Monitor.connKey);
                 timedControlEventStream(2500, 17, "", tmpCK, -1);
                 $scope.MontageMonitors[i].Monitor.eventUrl = "img/noevent.png";
@@ -124,13 +124,13 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         // this should only bring up events that span that time
         apiurl = ld.apiurl + "/events/index/StartTime >=:" + TimeObjectFrom + "/EndTime <=:" + TimeObjectTo + ".json";
 
-        ZMDataModel.zmLog("Event timeline API is " + apiurl);
+        NVRDataModel.log("Event timeline API is " + apiurl);
 
         $http.get(apiurl)
             .success(function (data) {
 
-                var ld = ZMDataModel.getLogin();
-                ZMDataModel.zmDebug("Got " + data.events.length + "new history events...");
+                var ld = NVRDataModel.getLogin();
+                NVRDataModel.debug("Got " + data.events.length + "new history events...");
                 var eid, mid, stime;
                 for (i = 0; i < data.events.length; i++) {
                     mid = data.events[i].Event.MonitorId;
@@ -161,14 +161,14 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                 // make sure we do our best to get that duration for all monitors
                 // in the above call, is possible some did not make the cut in the first page
 
-                ZMDataModel.zmLog("Making sure all monitors have a fair chance...");
+                NVRDataModel.log("Making sure all monitors have a fair chance...");
                 for (i = 0; i < $scope.MontageMonitors.length; i++) {
                     if ($scope.MontageMonitors[i].Monitor.eventUrl == 'img/noevent.png') {
 
 
                         var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/StartTime >=:" + TimeObjectFrom + "/EndTime <=:" + TimeObjectTo + ".json";
 
-                        ZMDataModel.zmDebug("Monitor " + $scope.MontageMonitors[i].Monitor.Id + ":" + $scope.MontageMonitors[i].Monitor.Name + " does not have events, trying " + indivGrab);
+                        NVRDataModel.debug("Monitor " + $scope.MontageMonitors[i].Monitor.Id + ":" + $scope.MontageMonitors[i].Monitor.Name + " does not have events, trying " + indivGrab);
 
                         getExpandedEvents(i, indivGrab);
 
@@ -180,20 +180,20 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
             })
             .error(function (data) {
-                ZMDataModel.zmDebug("history  ERROR:" + JSON.stringify(data));
+                NVRDataModel.debug("history  ERROR:" + JSON.stringify(data));
 
             });
 
 
         function getExpandedEvents(i, indivGrab) {
-            var ld = ZMDataModel.getLogin();
+            var ld = NVRDataModel.getLogin();
             // console.log ("EXPANDED EVENT " + i + " " + indivGrab);
             $http.get(indivGrab)
                 .success(function (data) {
                     // console.log ("EXPANDED DATA FOR MONITOR " + i + JSON.stringify(data));
                     if (data.events.length > 0) {
 
-                        if (!ZMDataModel.isBackground()) {
+                        if (!NVRDataModel.isBackground()) {
 
                             $scope.MontageMonitors[i].Monitor.eventUrl = ld.streamingurl + "/nph-zms?source=event&mode=jpeg&event=" + data.events[0].Event.Id + "&frame=1&replay=gapless&rate=" + $scope.sliderVal.realRate + "&connkey=" + $scope.MontageMonitors[i].Monitor.connKey + "&scale=" + ld.montageHistoryQuality + "&rand=" + $rootScope.rand;
 
@@ -203,11 +203,11 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
                             $scope.MontageMonitors[i].Monitor.eventUrlTime = data.events[0].Event.StartTime;
 
-                            ZMDataModel.zmLog("Found expanded event " + data.events[0].Event.Id + " for monitor " + $scope.MontageMonitors[i].Monitor.Id);
+                            NVRDataModel.log("Found expanded event " + data.events[0].Event.Id + " for monitor " + $scope.MontageMonitors[i].Monitor.Id);
                         } else {
                             // $scope.MontageMonitors[i].eventUrl="img/noevent.png";
                             //    $scope.MontageMonitors[i].eventUrlTime = "";
-                            //    ZMDataModel.zmLog ("Setting img src to null as data received in background");
+                            //    NVRDataModel.log ("Setting img src to null as data received in background");
                         }
                     }
 
@@ -235,7 +235,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                 $scope.MontageMonitors[i].Monitor.Function != 'None' &&
                 $scope.MontageMonitors[i].Monitor.listDisplay != 'noshow' &&
                 $scope.MontageMonitors[i].Monitor.Enabled != '0') {
-                ZMDataModel.zmDebug("Checking event status for " + $scope.MontageMonitors[i].Monitor.Name + ":" + $scope.MontageMonitors[i].Monitor.eventUrl + ":" + $scope.MontageMonitors[i].Monitor.Function + ":" + $scope.MontageMonitors[i].Monitor.listDisplay);
+                NVRDataModel.debug("Checking event status for " + $scope.MontageMonitors[i].Monitor.Name + ":" + $scope.MontageMonitors[i].Monitor.eventUrl + ":" + $scope.MontageMonitors[i].Monitor.Function + ":" + $scope.MontageMonitors[i].Monitor.listDisplay);
                 controlEventStream('99', '', $scope.MontageMonitors[i].Monitor.connKey, i);
 
             }
@@ -261,7 +261,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
     function timedControlEventStream(mTime, cmd, disp, connkey, ndx) {
         var mMtime = mTime || 2000;
-        ZMDataModel.zmDebug("Deferring control " + cmd + " by " + mMtime);
+        NVRDataModel.debug("Deferring control " + cmd + " by " + mMtime);
         $timeout(function () {
             subControlStream(cmd, connkey);
 
@@ -269,7 +269,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     }
 
     function subControlStream(cmd, connkey) {
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var myauthtoken = $rootScope.authSession.replace("&auth=", "");
         //&auth=
         var req = $http({
@@ -302,12 +302,12 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         });
 
         req.success(function (resp) {
-            ZMDataModel.zmDebug("subControl success:" + JSON.stringify(resp));
+            NVRDataModel.debug("subControl success:" + JSON.stringify(resp));
         });
 
 
         req.error(function (resp) {
-            ZMDataModel.zmDebug("subControl error:" + JSON.stringify(resp));
+            NVRDataModel.debug("subControl error:" + JSON.stringify(resp));
         });
     }
 
@@ -323,7 +323,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                 duration: zm.loadingTimeout,
             });
         }
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
 
         /*
         var CMD_NONE = 0;
@@ -390,17 +390,17 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
             // console.log("SUCCESS FOR: " + JSON.stringify(resp));
 
             if (resp.result == "Ok" && ndx != -1) {
-                var ld = ZMDataModel.getLogin();
+                var ld = NVRDataModel.getLogin();
                 var apiurl = ld.apiurl + "/events/" + resp.status.event + ".json";
                 //console.log ("API " + apiurl);
                 $http.get(apiurl)
                     .success(function (data) {
                         var currentEventTime = moment(data.event.Event.StartTime);
                         var maxTime = moment($scope.datetimeValueTo.value);
-                        //ZMDataModel.zmDebug ("Monitor: " + $scope.MontageMonitors[ndx].Monitor.Id + " max time="+maxTime + "("+$scope.datetimeValueTo.value+")"+ " current="+currentEventTime + "("+data.event.Event.StartTime+")");
+                        //NVRDataModel.debug ("Monitor: " + $scope.MontageMonitors[ndx].Monitor.Id + " max time="+maxTime + "("+$scope.datetimeValueTo.value+")"+ " current="+currentEventTime + "("+data.event.Event.StartTime+")");
                         if ($scope.MontageMonitors[ndx].Monitor.eventUrlTime != data.event.Event.StartTime && currentEventTime.diff(maxTime) <= 0) {
 
-                            var ld = ZMDataModel.getLogin();
+                            var ld = NVRDataModel.getLogin();
                             var element = angular.element(document.getElementById($scope.MontageMonitors[ndx].Monitor.Id + "-timeline"));
                             element.removeClass('animated flipInX');
                             element.addClass('animated flipOutX');
@@ -413,7 +413,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                             }, 700);
 
                         } else if (currentEventTime.diff(maxTime) > 0) {
-                            ZMDataModel.zmDebug(">>>>>>>>Monitor " + $scope.MontageMonitors[ndx].Monitor.Id + " event time of " + data.event.Event.StartTime + " exceeds " + $scope.datetimeValueTo.value + " stopping...");
+                            NVRDataModel.debug(">>>>>>>>Monitor " + $scope.MontageMonitors[ndx].Monitor.Id + " event time of " + data.event.Event.StartTime + " exceeds " + $scope.datetimeValueTo.value + " stopping...");
                             subControlStream(17, connkey);
 
 
@@ -429,7 +429,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
         req.error(function (resp) {
             //console.log("ERROR: " + JSON.stringify(resp));
-            ZMDataModel.zmLog("Error sending event command " + JSON.stringify(resp), "error");
+            NVRDataModel.log("Error sending event command " + JSON.stringify(resp), "error");
         });
     }
 
@@ -440,10 +440,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     document.addEventListener("pause", onPause, false);
     document.addEventListener("resume", onResume, false);
 
-    $scope.timeFormat = "yyyy-MM-dd " + ZMDataModel.getTimeFormat();
+    $scope.timeFormat = "yyyy-MM-dd " + NVRDataModel.getTimeFormat();
     $scope.displayDateTimeSliders = true;
     $scope.showtimers = true;
-    $scope.loginData = ZMDataModel.getLogin();
+    $scope.loginData = NVRDataModel.getLogin();
 
 
 
@@ -540,8 +540,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
     $scope.slider = {};
 
-    //console.log ("************ HISTORY " + ZMDataModel.getMontageSize());
-    $scope.slider.monsize = ZMDataModel.getMontageSize();
+    //console.log ("************ HISTORY " + NVRDataModel.getMontageSize());
+    $scope.slider.monsize = NVRDataModel.getMontageSize();
     $scope.revMonSize = 11 - parseInt($scope.slider.monsize);
 
     // The difference between old and original is this:
@@ -572,22 +572,22 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     }
 
     // console.log ("TEMP MONITORS IS " + JSON.stringify(tempMonitors));
-    var tempResponse = ZMDataModel.applyMontageMonitorPrefs(message, 0);
+    var tempResponse = NVRDataModel.applyMontageMonitorPrefs(message, 0);
     $scope.monitors = tempResponse[0];
     montageOrder = tempResponse[1];
     hiddenOrder = tempResponse[2];
 
-    ZMDataModel.zmLog("Inside MontageHistoryCtrl:We found " + $scope.monitors.length + " monitors");
+    NVRDataModel.log("Inside MontageHistoryCtrl:We found " + $scope.monitors.length + " monitors");
 
-    $scope.MontageMonitors = ZMDataModel.applyMontageMonitorPrefs(message, 1)[0];
+    $scope.MontageMonitors = NVRDataModel.applyMontageMonitorPrefs(message, 1)[0];
 
-    var loginData = ZMDataModel.getLogin();
+    var loginData = NVRDataModel.getLogin();
 
     $scope.packMontage = loginData.packMontage;
 
 
     // init monitors
-    ZMDataModel.zmDebug(">>Initializing connkeys and images...");
+    NVRDataModel.debug(">>Initializing connkeys and images...");
     for (i = 0; i < $scope.MontageMonitors.length; i++) {
         //$scope.MontageMonitors[i].Monitor.connKey='';
 
@@ -613,12 +613,12 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         e.preventDefault();
         if ($scope.modal && $scope.modal.isShown()) {
             // switch off awake, as liveview is finished
-            ZMDataModel.zmDebug("Modal is open, closing it");
-            ZMDataModel.setAwake(false);
+            NVRDataModel.debug("Modal is open, closing it");
+            NVRDataModel.setAwake(false);
             $scope.modal.remove();
             $scope.isModalActive = false;
         } else {
-            ZMDataModel.zmDebug("Modal is closed, so toggling or exiting");
+            NVRDataModel.debug("Modal is closed, so toggling or exiting");
             if (!$ionicSideMenuDelegate.isOpenLeft()) {
                 $ionicSideMenuDelegate.toggleLeft();
 
@@ -658,7 +658,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     if (loginData.montageArraySize == '0') {
 
         for (i = 0; i < $scope.monitors.length; i++) {
-            $scope.monitorSize.push(ZMDataModel.getMontageSize());
+            $scope.monitorSize.push(NVRDataModel.getMontageSize());
             $scope.scaleDirection.push(1);
         }
     } else // recover previous settings
@@ -680,11 +680,11 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     // $scope.monitorSize = monitorSize;
     // $scope.scaleDirection = scaleDirection;
 
-    $scope.LoginData = ZMDataModel.getLogin();
+    $scope.LoginData = NVRDataModel.getLogin();
     $scope.monLimit = $scope.LoginData.maxMontage;
 
     if ($rootScope.platformOS != 'ios') {
-        ZMDataModel.zmLog("Limiting montage to 5, thanks to Chrome's stupid connection limit");
+        NVRDataModel.log("Limiting montage to 5, thanks to Chrome's stupid connection limit");
         $scope.monLimit = 5;
     }
 
@@ -702,25 +702,25 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     });
 
 
-    var ld = ZMDataModel.getLogin();
+    var ld = NVRDataModel.getLogin();
 
     //console.log ("MONITORS " + JSON.stringify($scope.monitors));
     $rootScope.validMonitorId = $scope.monitors[0].Monitor.Id;
-    ZMDataModel.getAuthKey($rootScope.validMonitorId)
+    NVRDataModel.getAuthKey($rootScope.validMonitorId)
         .then(function (success) {
                 $ionicLoading.hide();
                 //console.log(success);
                 $rootScope.authSession = success;
-                ZMDataModel.zmLog("Stream authentication construction: " +
+                NVRDataModel.log("Stream authentication construction: " +
                     $rootScope.authSession);
 
             },
             function (error) {
 
                 $ionicLoading.hide();
-                ZMDataModel.zmDebug("MontageHistoryCtrl: Error in authkey retrieval " + error);
+                NVRDataModel.debug("MontageHistoryCtrl: Error in authkey retrieval " + error);
                 //$rootScope.authSession="";
-                ZMDataModel.zmLog("MontageHistoryCtrl: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
+                NVRDataModel.log("MontageHistoryCtrl: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
             });
 
 
@@ -750,14 +750,14 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     $scope.closeReorderModal = function () {
         //console.log("Close & Destroy Monitor Modal");
         // switch off awake, as liveview is finished
-        //ZMDataModel.setAwake(false);
+        //NVRDataModel.setAwake(false);
         $scope.modal.remove();
 
     };
 
 
     $scope.isBackground = function () {
-        return ZMDataModel.isBackground();
+        return NVRDataModel.isBackground();
     };
 
 
@@ -783,7 +783,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         $rootScope.isAlarm = !$rootScope.isAlarm;
 
         $scope.minimal = !$scope.minimal;
-        ZMDataModel.zmDebug("MontageHistoryCtrl: switch minimal is " + $scope.minimal);
+        NVRDataModel.debug("MontageHistoryCtrl: switch minimal is " + $scope.minimal);
         ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
         $interval.cancel(intervalHandle);
         $interval.cancel($rootScope.eventQueryInterval);
@@ -810,8 +810,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
     $scope.isBackground = function () {
         //console.log ("Is background called from Montage and returned " +    
-        //ZMDataModel.isBackground());
-        return ZMDataModel.isBackground();
+        //NVRDataModel.isBackground());
+        return NVRDataModel.isBackground();
     };
 
     //-------------------------------------------------------------
@@ -831,7 +831,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     };
 
     $scope.reloadReorder = function () {
-        var refresh = ZMDataModel.getMonitors(1);
+        var refresh = NVRDataModel.getMonitors(1);
 
         refresh.then(function (data) {
             $scope.monitors = data;
@@ -846,10 +846,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
             loginData.montageOrder = montageOrder.toString();
             loginData.montageHiddenOrder = hiddenOrder.toString();
-            ZMDataModel.setLogin(loginData);
+            NVRDataModel.setLogin(loginData);
             //window.localStorage.setItem("montageOrder", montageOrder.toString());
             //window.localStorage.setItem("montageHiddenOrder", hiddenOrder.toString());
-            ZMDataModel.zmLog("Montage order saved on refresh: " + montageOrder.toString() + " and hidden order: " + hiddenOrder.toString());
+            NVRDataModel.log("Montage order saved on refresh: " + montageOrder.toString() + " and hidden order: " + hiddenOrder.toString());
 
         });
     };
@@ -857,12 +857,12 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     $scope.saveReorder = function () {
         loginData.montageOrder = montageOrder.toString();
         loginData.montageHiddenOrder = hiddenOrder.toString();
-        ZMDataModel.setLogin(loginData);
+        NVRDataModel.setLogin(loginData);
         //window.localStorage.setItem("montageOrder", montageOrder.toString());
         // window.localStorage.setItem("montageHiddenOrder",
         //    hiddenOrder.toString());
         //console.log("Saved " + montageOrder.toString());
-        ZMDataModel.zmLog("User press OK. Saved Monitor Order as: " +
+        NVRDataModel.log("User press OK. Saved Monitor Order as: " +
             montageOrder.toString() +
             " and hidden order as " + hiddenOrder.toString());
         $scope.modal.remove();
@@ -878,7 +878,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                 hiddenOrder[i] = 0;
             }
             //console.log("Order string is " + montageOrder.toString());
-            ZMDataModel.zmLog("User press Cancel. Reset Monitor Order to: " + montageOrder.toString());
+            NVRDataModel.log("User press Cancel. Reset Monitor Order to: " + montageOrder.toString());
         } else // montageOrder exists
         {
             var myorder = loginData.montageOrder;
@@ -901,7 +901,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
             }
 
             $scope.MontageMonitors = oldMonitors;
-            ZMDataModel.zmLog("User press Cancel. Restored Monitor Order as: " + montageOrder.toString() + " and hidden order as: " + hiddenOrder.toString());
+            NVRDataModel.log("User press Cancel. Restored Monitor Order as: " + montageOrder.toString() + " and hidden order as: " + hiddenOrder.toString());
 
         }
         $scope.modal.remove();
@@ -920,11 +920,11 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
             $scope.monitors[i].Monitor.listDisplay="show";
         }*/
 
-        ld = ZMDataModel.getLogin();
+        ld = NVRDataModel.getLogin();
         if (ld.enableDebug) {
             // Lets show the re-order list
             for (i = 0; i < $scope.MontageMonitors.length; i++) {
-                ZMDataModel.zmDebug("Montage reorder list: " + $scope.MontageMonitors[i].Monitor.Name +
+                NVRDataModel.debug("Montage reorder list: " + $scope.MontageMonitors[i].Monitor.Name +
                     ":listdisplay->" + $scope.MontageMonitors[i].Monitor.listDisplay);
 
             }
@@ -976,7 +976,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         //window.localStorage.setItem("montageOrder", montageOrder.toString());
         //console.log("DELETE: Order Array now is " + montageOrder.toString());
         //console.log("DELETE: Hidden Array now is " + hiddenOrder.toString());
-        ZMDataModel.zmLog("Marked monitor " + findindex + " as " + $scope.MontageMonitors[index].Monitor.listDisplay + " in montage");
+        NVRDataModel.log("Marked monitor " + findindex + " as " + $scope.MontageMonitors[index].Monitor.listDisplay + " in montage");
 
     };
 
@@ -987,7 +987,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
     function reorderItem(item, from, to, reorderHidden) {
 
-        ZMDataModel.zmDebug("MontageHistoryCtrl: Reorder from " + from + " to " + to);
+        NVRDataModel.debug("MontageHistoryCtrl: Reorder from " + from + " to " + to);
         $scope.MontageMonitors.splice(from, 1);
         $scope.MontageMonitors.splice(to, 0, item);
 
@@ -1003,7 +1003,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                 }
             }
         }
-        ZMDataModel.zmLog("New Montage Order is: " + montageOrder.toString());
+        NVRDataModel.log("New Montage Order is: " + montageOrder.toString());
 
     }
 
@@ -1018,7 +1018,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     //---------------------------------------------------------------------
     $scope.switchMinimal = function () {
         $scope.minimal = !$scope.minimal;
-        ZMDataModel.zmDebug("MontageHistoryCtrl: switch minimal is " + $scope.minimal);
+        NVRDataModel.debug("MontageHistoryCtrl: switch minimal is " + $scope.minimal);
         //console.log("Hide Statusbar");
         ionic.Platform.fullScreen($scope.minimal, !$scope.minimal);
         $interval.cancel(intervalHandle); //we will renew on reload
@@ -1063,7 +1063,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     $scope.toggleMontageDisplayOrder = function () {
         $scope.packMontage = !$scope.packMontage;
         loginData.packMontage = $scope.packMontage;
-        ZMDataModel.setLogin(loginData);
+        NVRDataModel.setLogin(loginData);
         //console.log ("Switching orientation");
     };
 
@@ -1076,7 +1076,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     //---------------------------------------------------------------------
 
     function onPause() {
-        ZMDataModel.zmDebug("MontageHistoryCtrl: onpause called");
+        NVRDataModel.debug("MontageHistoryCtrl: onpause called");
         $interval.cancel($rootScope.eventQueryInterval);
         $interval.cancel(intervalHandle);
 
@@ -1091,11 +1091,11 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         // FIXME: Do we need to resume timers? when you resume, you go to portal and then here
         /*
           if (!$scope.isModalActive) {
-              var ld = ZMDataModel.getLogin();
+              var ld = NVRDataModel.getLogin();
               
               
-              ZMDataModel.zmDebug("MontageHistoryCtrl: onresume called");
-              ZMDataModel.zmLog("Restarting eventQuery timer on resume");
+              NVRDataModel.debug("MontageHistoryCtrl: onresume called");
+              NVRDataModel.log("Restarting eventQuery timer on resume");
               
               console.log ("************** TIMER STARTED INSIDE RESUME ***************");
               
@@ -1124,7 +1124,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     };
 
     $scope.$on('$destroy', function () {
-        ZMDataModel.zmDebug("Cancelling eventQueryInterval");
+        NVRDataModel.debug("Cancelling eventQueryInterval");
         $interval.cancel($rootScope.eventQueryInterval);
 
 
@@ -1138,10 +1138,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     });
 
     $scope.$on('$ionicView.enter', function () {
-        ZMDataModel.zmDebug("**VIEW ** MontageHistory Ctrl Entered, Starting loadNotifications");
-        var ld = ZMDataModel.getLogin();
-        //console.log("Setting Awake to " + ZMDataModel.getKeepAwake());
-        ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
+        NVRDataModel.debug("**VIEW ** MontageHistory Ctrl Entered, Starting loadNotifications");
+        var ld = NVRDataModel.getLogin();
+        //console.log("Setting Awake to " + NVRDataModel.getKeepAwake());
+        NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
 
         $interval.cancel($rootScope.eventQueryInterval);
         //console.log ("****************** TIMER STARTED INSIDE ENTER");
@@ -1164,7 +1164,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
     $scope.$on('$ionicView.beforeEnter', function () {
 
-        //  ZMDataModel.zmLog ("Before Enter History: initing connkeys");
+        //  NVRDataModel.log ("Before Enter History: initing connkeys");
 
 
 
@@ -1177,13 +1177,13 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         if ($scope.modal) $scope.modal.remove();
 
 
-        ZMDataModel.zmLog("BeforeLeave: Nullifying the streams...");
+        NVRDataModel.log("BeforeLeave: Nullifying the streams...");
 
         for (i = 0; i < $scope.MontageMonitors.length; i++) {
             var element = document.getElementById("img-" + i);
             /*if (element)
             {
-                ZMDataModel.zmDebug("BeforeLeave: Nullifying  " + element.src);
+                NVRDataModel.debug("BeforeLeave: Nullifying  " + element.src);
                 element.src="";
                 //element.removeAttribute('src');
                 
@@ -1195,10 +1195,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
 
 
-        ZMDataModel.zmLog("Cancelling event query timer");
+        NVRDataModel.log("Cancelling event query timer");
         $interval.cancel($rootScope.eventQueryInterval);
 
-        ZMDataModel.zmLog("MontageHistory:Stopping network pull...");
+        NVRDataModel.log("MontageHistory:Stopping network pull...");
         // make sure this is applied in scope digest to stop network pull
         // thats why we are doing it beforeLeave
 
@@ -1208,14 +1208,14 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
                 $scope.MontageMonitors[i].Monitor.Function != 'None' &&
                 $scope.MontageMonitors[i].Monitor.lisDisplay != 'noshow' &&
                 $scope.MontageMonitors[i].Monitor.Enabled != '0') {
-                ZMDataModel.zmLog("Before leave: Calling kill with " + $scope.MontageMonitors[i].Monitor.connKey);
+                NVRDataModel.log("Before leave: Calling kill with " + $scope.MontageMonitors[i].Monitor.connKey);
                 var tmpCK = angular.copy($scope.MontageMonitors[i].Monitor.connKey);
                 timedControlEventStream(2500, 17, "", tmpCK, -1);
             }
         }
 
-        ZMDataModel.zmLog("Forcing a window.stop() here");
-        ZMDataModel.stopNetwork("MontageHistory-beforeLeave");
+        NVRDataModel.log("Forcing a window.stop() here");
+        NVRDataModel.stopNetwork("MontageHistory-beforeLeave");
 
 
 
@@ -1236,15 +1236,15 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
         sizeInProgress = true;
         //console.log('Size has changed');
-        ZMDataModel.setMontageSize(val);
-        //console.log("ZMData Montage is " + ZMDataModel.getMontageSize() +
+        NVRDataModel.setMontageSize(val);
+        //console.log("ZMData Montage is " + NVRDataModel.getMontageSize() +
         //   " and slider montage is " + $scope.slider.monsize);
         // Now go ahead and reset sizes of entire monitor array
         var monsizestring = "";
         var i;
         for (i = 0; i < $scope.monitors.length; i++) {
 
-            $scope.monitorSize[i] = parseInt(ZMDataModel.getMontageSize());
+            $scope.monitorSize[i] = parseInt(NVRDataModel.getMontageSize());
             //console.log("Resetting Monitor " + i + " size to " + $scope.monitorSize[i]);
             $scope.scaleDirection[i] = 1;
             monsizestring = monsizestring + $scope.monitorSize[i] + ':';
@@ -1252,7 +1252,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         monsizestring = monsizestring.slice(0, -1); // kill last :
         //console.log("Setting monsize string:" + monsizestring);
         loginData.montageArraySize = monsizestring;
-        ZMDataModel.setLogin(loginData);
+        NVRDataModel.setLogin(loginData);
         //window.localStorage.setItem("montageArraySize", monsizestring);
         sizeInProgress = false;
     }
@@ -1270,7 +1270,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
     $scope.reloadView = function () {
         $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
-        ZMDataModel.zmLog("User action: image reload " + $rootScope.rand);
+        NVRDataModel.log("User action: image reload " + $rootScope.rand);
     };
 
     $scope.doRefresh = function () {
@@ -1278,12 +1278,12 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
 
 
         //console.log("***Pull to Refresh, recomputing Rand");
-        ZMDataModel.zmLog("Reloading view for montage view, recomputing rand");
+        NVRDataModel.log("Reloading view for montage view, recomputing rand");
         $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
         $scope.monitors = [];
         imageLoadingDataShare.set(0);
 
-        var refresh = ZMDataModel.getMonitors(1);
+        var refresh = NVRDataModel.getMonitors(1);
 
         refresh.then(function (data) {
             $scope.monitors = data;
diff --git a/www/js/NewsCtrl.js b/www/js/NewsCtrl.js
index 294f0a98..c8bf78b4 100644
--- a/www/js/NewsCtrl.js
+++ b/www/js/NewsCtrl.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console,moment*/
 
-angular.module('zmApp.controllers').controller('zmApp.NewsCtrl', ['$scope', '$rootScope', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$http', 'zm', function ($scope, $rootScope, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $ionicHistory, $state, $http, zm) {
+angular.module('zmApp.controllers').controller('zmApp.NewsCtrl', ['$scope', '$rootScope', '$ionicModal', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$http', 'zm', function ($scope, $rootScope, $ionicModal, NVRDataModel, $ionicSideMenuDelegate, $ionicHistory, $state, $http, zm) {
     $scope.openMenu = function () {
         $ionicSideMenuDelegate.toggleLeft();
     };
@@ -36,13 +36,13 @@ angular.module('zmApp.controllers').controller('zmApp.NewsCtrl', ['$scope', '$ro
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
         // console.log("**VIEW ** News Ctrl Entered");
-        ZMDataModel.setAwake(false);
+        NVRDataModel.setAwake(false);
 
 
     });
 
     $scope.isUnread = function (itemdate) {
-        var lastDate = ZMDataModel.getLatestBlogPostChecked();
+        var lastDate = NVRDataModel.getLatestBlogPostChecked();
         //get("latestBlogPostChecked");
         if (!lastDate) return true;
         var mLastDate = moment(lastDate);
@@ -56,23 +56,23 @@ angular.module('zmApp.controllers').controller('zmApp.NewsCtrl', ['$scope', '$ro
 
     $scope.loadPost = function (item, itemdate) {
         var lastDate =
-            ZMDataModel.getLatestBlogPostChecked(); //zmStorageService.get("latestBlogPostChecked");
+            NVRDataModel.getLatestBlogPostChecked(); //zmStorageService.get("latestBlogPostChecked");
 
 
         if (!lastDate) {
-            ZMDataModel.zmDebug("First time checking blog posts, I see");
-            ZMDataModel.setLatestBlogPostChecked(itemdate);
+            NVRDataModel.debug("First time checking blog posts, I see");
+            NVRDataModel.setLatestBlogPostChecked(itemdate);
             //zmStorageService.set("latestBlogPostChecked", itemdate);
         } else {
-            ZMDataModel.zmDebug("last  post checked is " + lastDate);
-            ZMDataModel.zmDebug("current post dated is " + itemdate);
+            NVRDataModel.debug("last  post checked is " + lastDate);
+            NVRDataModel.debug("current post dated is " + itemdate);
 
             var mLastDate = moment(lastDate);
             var mItemDate = moment(itemdate);
             if (mItemDate.diff(mLastDate) > 0) {
-                ZMDataModel.zmDebug("Updating lastDate to this post");
+                NVRDataModel.debug("Updating lastDate to this post");
 
-                ZMDataModel.setLatestBlogPostChecked(itemdate); //zmStorageService.set("latestBlogPostChecked", itemdate);
+                NVRDataModel.setLatestBlogPostChecked(itemdate); //zmStorageService.set("latestBlogPostChecked", itemdate);
 
                 if (itemdate == $scope.newsItems[0].date) {
                     // we are reading the latest post
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index c8e92be6..ec9d345a 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -3,14 +3,14 @@
 /*This is for the loop closure I am using in line 143 */
 /* jslint browser: true*/
 /* global vis,cordova,StatusBar,angular,console,moment */
-angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', 'zmAutoLogin', '$ionicHistory', '$cordovaTouchID', 'EventServer', '$translate', function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, zmAutoLogin, $ionicHistory, $cordovaTouchID, EventServer, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionicPlatform', '$scope', 'zm', 'NVRDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', 'zmAutoLogin', '$ionicHistory', '$cordovaTouchID', 'EventServer', '$translate', function ($ionicPlatform, $scope, zm, NVRDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, zmAutoLogin, $ionicHistory, $cordovaTouchID, EventServer, $translate) {
 
 
     $scope.$on('$ionicView.enter',
         function () {
 
-            ZMDataModel.zmDebug("Inside Portal login Enter handler");
-            loginData = ZMDataModel.getLogin();
+            NVRDataModel.debug("Inside Portal login Enter handler");
+            loginData = NVRDataModel.getLogin();
 
             $ionicHistory.nextViewOptions({
                 disableBack: true
@@ -20,14 +20,14 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
             $scope.pindata = {};
             if ($ionicSideMenuDelegate.isOpen()) {
                 $ionicSideMenuDelegate.toggleLeft();
-                ZMDataModel.zmDebug("Sliding menu close");
+                NVRDataModel.debug("Sliding menu close");
             }
 
 
             $scope.pinPrompt = false; // if true, then PIN is displayed else skip 
 
-            if (ZMDataModel.isLoggedIn()) {
-                ZMDataModel.zmLog("User credentials are provided");
+            if (NVRDataModel.isLoggedIn()) {
+                NVRDataModel.log("User credentials are provided");
 
 
 
@@ -38,20 +38,20 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                             // success, TouchID supported
                             $cordovaTouchID.authenticate("")
                                 .then(function () {
-                                        ZMDataModel.zmLog("Touch Success");
+                                        NVRDataModel.log("Touch Success");
                                         // Don't assign pin as it may be alphanum
                                         unlock(true);
 
                                     },
                                     function () {
-                                        ZMDataModel.zmLog("Touch Failed");
+                                        NVRDataModel.log("Touch Failed");
                                     });
                         }, function (error) {
-                            ZMDataModel.zmLog("TouchID not supported");
+                            NVRDataModel.log("TouchID not supported");
                         });
                 } else // touch was not used
                 {
-                    ZMDataModel.zmLog("not checking for touchID");
+                    NVRDataModel.log("not checking for touchID");
                 }
 
                 if (loginData.usePin) {
@@ -67,9 +67,9 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
 
             } else // login creds are not present
             {
-                ZMDataModel.zmDebug("PortalLogin: Not logged in, so going to login");
-                if (ZMDataModel.isFirstUse()) {
-                    ZMDataModel.zmDebug("First use, showing warm and fuzzy...");
+                NVRDataModel.debug("PortalLogin: Not logged in, so going to login");
+                if (NVRDataModel.isFirstUse()) {
+                    NVRDataModel.debug("First use, showing warm and fuzzy...");
                     $ionicHistory.nextViewOptions({
                         disableAnimate: true,
                         disableBack: true
@@ -122,21 +122,21 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
         zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i>&nbsp;" + $translate.instant('kAuthenticating') + "...</button>")
             .then(function (data) // success
                 {
-                    ZMDataModel.zmDebug("2nd auth login worked");
-                    ZMDataModel.getAPIversion()
+                    NVRDataModel.debug("2nd auth login worked");
+                    NVRDataModel.getAPIversion()
                         .then(function (data) {
-                                ZMDataModel.getKeyConfigParams(1);
-                                ZMDataModel.zmLog("2nd auth:Got API version: " + data);
+                                NVRDataModel.getKeyConfigParams(1);
+                                NVRDataModel.log("2nd auth:Got API version: " + data);
                                 $rootScope.apiVersion = data;
-                                var ld = ZMDataModel.getLogin();
-                                if (ZMDataModel.versionCompare(data, zm.minAppVersion) == -1 && data != "0.0.0") {
+                                var ld = NVRDataModel.getLogin();
+                                if (NVRDataModel.versionCompare(data, zm.minAppVersion) == -1 && data != "0.0.0") {
 
                                     $state.go('lowversion', {
                                         "ver": data
                                     });
                                 }
 
-                                if (ZMDataModel.versionCompare(data, zm.recommendedAppVersion) == -1 && data != "0.0.0") {
+                                if (NVRDataModel.versionCompare(data, zm.recommendedAppVersion) == -1 && data != "0.0.0") {
 
                                     $state.go('importantmessage', {
                                         "ver": data
@@ -145,8 +145,8 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
 
                                 if (data == "0.0.0") {
 
-                                    ZMDataModel.zmLog("2nd Auth:API getVersion succeeded but returned 0.0.0 " + JSON.stringify(data));
-                                    ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
+                                    NVRDataModel.log("2nd Auth:API getVersion succeeded but returned 0.0.0 " + JSON.stringify(data));
+                                    NVRDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
                                     $state.go("login", {
                                         "wizard": false
                                     });
@@ -155,14 +155,14 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                 // coming here means continue
                                 EventServer.refresh();
                                 var statetoGo = $rootScope.lastState ? $rootScope.lastState : 'montage';
-                                //ZMDataModel.zmDebug ("logging state transition");
-                                ZMDataModel.zmDebug("2nd Auth: Transitioning state to: " +
+                                //NVRDataModel.debug ("logging state transition");
+                                NVRDataModel.debug("2nd Auth: Transitioning state to: " +
                                     statetoGo + " with param " + JSON.stringify($rootScope.lastStateParam));
                                 $state.go(statetoGo, $rootScope.lastStateParam);
 
                             },
                             function (error) {
-                                ZMDataModel.zmDebug("2nd auth API failed, going to login");
+                                NVRDataModel.debug("2nd auth API failed, going to login");
                                 d.reject("failed 2nd auth");
                                 return (d.promise);
 
@@ -171,7 +171,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
 
                 },
                 function (error) {
-                    ZMDataModel.zmDebug("2nd auth hack failed, going to login");
+                    NVRDataModel.debug("2nd auth hack failed, going to login");
                     d.reject("failed 2nd auth");
                     return (d.promise);
                 });
@@ -185,9 +185,9 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                    == false means check PIN
         */
 
-        ZMDataModel.zmDebug("unlock called with check PIN=" + idVerified);
+        NVRDataModel.debug("unlock called with check PIN=" + idVerified);
         if (idVerified || ($scope.pindata.pin == loginData.pinCode)) {
-            ZMDataModel.zmDebug("PIN code entered is correct, or there is no PIN set");
+            NVRDataModel.debug("PIN code entered is correct, or there is no PIN set");
             $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
             zmAutoLogin.stop(); //safety
             zmAutoLogin.start();
@@ -196,23 +196,23 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
             zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i>&nbsp;" + $translate.instant('kAuthenticating') + "...</button>")
                 .then(function (data) // success
                     {
-                        ZMDataModel.zmDebug("PortalLogin: auth success");
-                        ZMDataModel.getKeyConfigParams(1);
+                        NVRDataModel.debug("PortalLogin: auth success");
+                        NVRDataModel.getKeyConfigParams(1);
                         // $state.go("login" ,{"wizard": false});
                         //login was ok, so get API details
-                        ZMDataModel.getAPIversion()
+                        NVRDataModel.getAPIversion()
                             .then(function (data) {
-                                    ZMDataModel.zmLog("Got API version: " + data);
+                                    NVRDataModel.log("Got API version: " + data);
                                     $rootScope.apiVersion = data;
-                                    var ld = ZMDataModel.getLogin();
-                                    if (ZMDataModel.versionCompare(data, zm.minAppVersion) == -1 && data != "0.0.0") {
+                                    var ld = NVRDataModel.getLogin();
+                                    if (NVRDataModel.versionCompare(data, zm.minAppVersion) == -1 && data != "0.0.0") {
 
                                         $state.go('lowversion', {
                                             "ver": data
                                         });
                                     }
 
-                                    if (ZMDataModel.versionCompare(data, zm.recommendedAppVersion) == -1 && data != "0.0.0") {
+                                    if (NVRDataModel.versionCompare(data, zm.recommendedAppVersion) == -1 && data != "0.0.0") {
 
                                         $state.go('importantmessage', {
                                             "ver": data
@@ -221,8 +221,8 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
 
                                     if (data == "0.0.0") {
 
-                                        ZMDataModel.zmLog("API getVersion succeeded but returned 0.0.0 " + JSON.stringify(data));
-                                        ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
+                                        NVRDataModel.log("API getVersion succeeded but returned 0.0.0 " + JSON.stringify(data));
+                                        NVRDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
                                         $state.go("login", {
                                             "wizard": false
                                         });
@@ -231,21 +231,21 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                     // coming here means continue
                                     EventServer.refresh();
                                     var statetoGo = $rootScope.lastState ? $rootScope.lastState : 'montage';
-                                    ZMDataModel.zmDebug("logging state transition");
-                                    ZMDataModel.zmDebug("Transitioning state to: " +
+                                    NVRDataModel.debug("logging state transition");
+                                    NVRDataModel.debug("Transitioning state to: " +
                                         statetoGo + " with param " + JSON.stringify($rootScope.lastStateParam));
                                     $state.go(statetoGo, $rootScope.lastStateParam);
 
                                 },
                                 function (error) { // API Error
-                                    ZMDataModel.zmLog("API Error handler: going to login getAPI returned error: " + JSON.stringify(error));
-                                    //ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
+                                    NVRDataModel.log("API Error handler: going to login getAPI returned error: " + JSON.stringify(error));
+                                    //NVRDataModel.displayBanner('error', ['ZoneMinder authentication failed']);
 
-                                    ZMDataModel.zmDebug("Doing the Aaron Hack after 1 sec....");
+                                    NVRDataModel.debug("Doing the Aaron Hack after 1 sec....");
                                     $timeout(function () {
                                         tryLoggingSecondTimeHack()
                                             .then(function success(s) {
-                                                    ZMDataModel.zmLog("2nd time login hack worked!, nothing to do");
+                                                    NVRDataModel.log("2nd time login hack worked!, nothing to do");
                                                 },
                                                 function error(e) {
                                                     $state.go("login", {
@@ -261,8 +261,8 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                         if ($rootScope.tappedNotification) {
 
 
-                            var ld = ZMDataModel.getLogin();
-                            ZMDataModel.zmLog("Came via push tap. onTapScreen=" + ld.onTapScreen);
+                            var ld = NVRDataModel.getLogin();
+                            NVRDataModel.log("Came via push tap. onTapScreen=" + ld.onTapScreen);
                             //console.log ("***** NOTIFICATION TAPPED  ");
                             $rootScope.tappedNotification = 0;
                             $ionicHistory.nextViewOptions({
@@ -270,14 +270,14 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                             });
 
                             if (ld.onTapScreen == $translate.instant('kTapMontage')) {
-                                ZMDataModel.zmDebug("Going to montage");
+                                NVRDataModel.debug("Going to montage");
                                 $state.go("montage", {}, {
                                     reload: true
                                 });
 
                                 return;
                             } else if (ld.onTapScreen == $translate.instant('kTapEvents')) {
-                                ZMDataModel.zmDebug("Going to events");
+                                NVRDataModel.debug("Going to events");
                                 $state.go("events", {
                                     "id": 0
                                 }, {
@@ -286,7 +286,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                 return;
                             } else // we go to live
                             {
-                                ZMDataModel.zmDebug("Going to live view ");
+                                NVRDataModel.debug("Going to live view ");
                                 $state.go("monitors", {}, {
                                     reload: true
                                 });
@@ -299,10 +299,10 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                     // coming here means auth error
                     // so go back to login
                     function (error) {
-                        ZMDataModel.zmDebug("PortalLogin: error authenticating " +
+                        NVRDataModel.debug("PortalLogin: error authenticating " +
                             JSON.stringify(error));
                         if (!$rootScope.userCancelledAuth) {
-                            ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed', 'Please check API settings']);
+                            NVRDataModel.displayBanner('error', ['ZoneMinder authentication failed', 'Please check API settings']);
                             $ionicHistory.nextViewOptions({
                                 disableAnimate: true,
                                 disableBack: true
@@ -336,7 +336,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
     // Controller Main
     //-------------------------------------------------------------------------------
     // console.log("************* ENTERING PORTAL MAIN ");
-    ZMDataModel.zmLog("Entering Portal Main");
+    NVRDataModel.log("Entering Portal Main");
     var loginData;
     $ionicSideMenuDelegate.canDragContent(true);
 
diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js
index 27a7fcc8..76c11543 100644
--- a/www/js/StateCtrl.js
+++ b/www/js/StateCtrl.js
@@ -4,8 +4,8 @@
 
 // controller for State View
 
-angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicLoading', '$ionicModal', '$state', '$http', '$rootScope', '$timeout', '$ionicHistory', '$translate', function (
-    $ionicPopup, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $ionicLoading, $ionicModal, $state, $http, $rootScope, $timeout, $ionicHistory, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup', '$scope', 'zm', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicLoading', '$ionicModal', '$state', '$http', '$rootScope', '$timeout', '$ionicHistory', '$translate', function (
+    $ionicPopup, $scope, zm, NVRDataModel, $ionicSideMenuDelegate, $ionicLoading, $ionicModal, $state, $http, $rootScope, $timeout, $ionicHistory, $translate) {
 
     //----------------------------------------------------------------------
     // Controller main
@@ -24,7 +24,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
 
 
 
-    var loginData = ZMDataModel.getLogin();
+    var loginData = NVRDataModel.getLogin();
 
     var apiRun = loginData.apiurl + "/host/daemonCheck.json";
     var apiLoad = loginData.apiurl + "/host/getLoad.json";
@@ -40,18 +40,18 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
     // This may also help if your Apache is not configured to let multiple connections through
 
     $timeout(function () {
-        ZMDataModel.zmDebug("invoking LoadStatus...");
+        NVRDataModel.debug("invoking LoadStatus...");
         getLoadStatus();
     }, 2000);
 
     $timeout(function () {
-        ZMDataModel.zmDebug("invoking CurrentState...");
+        NVRDataModel.debug("invoking CurrentState...");
         getCurrentState();
     }, 4000);
 
     /*
     $timeout(function () {
-            ZMDataModel.zmDebug("invoking DiskStatus...");
+            NVRDataModel.debug("invoking DiskStatus...");
             getDiskStatus();
         }, 6000);
     */
@@ -64,7 +64,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
     //------------------------------------------------------------------------
     $scope.$on('$ionicView.enter', function () {
         // console.log("**VIEW ** Montage Ctrl Entered");
-        ZMDataModel.setAwake(false);
+        NVRDataModel.setAwake(false);
     });
 
     //---------------------------------------------------------
@@ -72,11 +72,11 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
     // if applicable
     //---------------------------------------------------------
     function getCurrentState() {
-        ZMDataModel.zmDebug("StateCtrl: getting state using " + apiCurrentState);
+        NVRDataModel.debug("StateCtrl: getting state using " + apiCurrentState);
         $http.get(apiCurrentState)
             .then(
                 function (success) {
-                    ZMDataModel.zmDebug("State results: " + JSON.stringify(success));
+                    NVRDataModel.debug("State results: " + JSON.stringify(success));
                     var customStateArray = success.data.states;
                     var i = 0;
                     var found = false;
@@ -92,7 +92,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
 
                 },
                 function (error) {
-                    ZMDataModel.zmDebug("StateCtrl: Error retrieving state list " + JSON.stringify(error));
+                    NVRDataModel.debug("StateCtrl: Error retrieving state list " + JSON.stringify(error));
                     $scope.customState = "";
 
                 }
@@ -127,7 +127,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
             selectedState: ""
         };
         //console.log(JSON.stringify($scope.allStateNames));
-        ZMDataModel.zmLog("List of custom states: " + JSON.stringify($scope.allStateNames));
+        NVRDataModel.log("List of custom states: " + JSON.stringify($scope.allStateNames));
         $rootScope.zmPopup = $ionicPopup.show({
             scope: $scope,
             template: '<ion-radio-fix ng-repeat="item in allStateNames" ng-value="item" ng-model="myopt.selectedState"> {{item}} </ion-radio-fix>',
@@ -169,25 +169,25 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
     // returns disk space in gigs taken up by events
     //----------------------------------------------------------------------
     function getDiskStatus() {
-        ZMDataModel.zmDebug("StateCtrl/getDiskStatus: " + apiDisk);
+        NVRDataModel.debug("StateCtrl/getDiskStatus: " + apiDisk);
         $http.get(apiDisk)
             .then(
                 function (success) {
-                    ZMDataModel.zmDebug("StateCtrl/getDiskStatus: success");
-                    ZMDataModel.zmDebug("Disk results: " + JSON.stringify(success));
+                    NVRDataModel.debug("StateCtrl/getDiskStatus: success");
+                    NVRDataModel.debug("Disk results: " + JSON.stringify(success));
                     var obj = success.data.usage;
                     if (obj.Total.space != undefined) {
                         $scope.zmDisk = parseFloat(obj.Total.space).toFixed(1).toString() + "G";
                     } else {
                         $scope.zmDisk = "unknown";
-                        ZMDataModel.zmLog("Error retrieving disk space, API returned null for obj.Total.space");
+                        NVRDataModel.log("Error retrieving disk space, API returned null for obj.Total.space");
                     }
 
                 },
                 function (error) {
                     $scope.zmDisk = "unknown";
                     // console.log("ERROR:" + JSON.stringify(error));
-                    ZMDataModel.zmLog("Error retrieving DiskStatus: " + JSON.stringify(error), "error");
+                    NVRDataModel.log("Error retrieving DiskStatus: " + JSON.stringify(error), "error");
                 }
             );
     }
@@ -196,12 +196,12 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
     // returns ZM running status
     //----------------------------------------------------------------------
     function getRunStatus() {
-        ZMDataModel.zmDebug("StateCtrl/getRunStatus: " + apiRun);
+        NVRDataModel.debug("StateCtrl/getRunStatus: " + apiRun);
         $http.get(apiRun)
             .then(
                 function (success) {
-                    ZMDataModel.zmDebug("StateCtrl/getRunStatus: success");
-                    ZMDataModel.zmDebug("Run results: " + JSON.stringify(success));
+                    NVRDataModel.debug("StateCtrl/getRunStatus: success");
+                    NVRDataModel.debug("Run results: " + JSON.stringify(success));
                     switch (success.data.result) {
                         case 1:
                             $scope.zmRun = $translate.instant('kZMRunning');
@@ -223,7 +223,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
                 },
                 function (error) {
                     //console.log("ERROR in getRun: " + JSON.stringify(error));
-                    ZMDataModel.zmLog("Error getting RunStatus " + JSON.stringify(error), "error");
+                    NVRDataModel.log("Error getting RunStatus " + JSON.stringify(error), "error");
                     $scope.color = 'color:red;';
                     $scope.zmRun = $translate.instant('kZMUndetermined');
                 }
@@ -236,14 +236,14 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
     // gets ZM load - max[0], avg[1], min[2]
     //----------------------------------------------------------------------
     function getLoadStatus() {
-        ZMDataModel.zmDebug("StateCtrl/getLoadStatus: " + apiLoad);
+        NVRDataModel.debug("StateCtrl/getLoadStatus: " + apiLoad);
         $http.get(apiLoad)
             .then(
                 function (success) {
-                    ZMDataModel.zmDebug("Load results: " + JSON.stringify(success));
+                    NVRDataModel.debug("Load results: " + JSON.stringify(success));
                     //console.log(JSON.stringify(success));
                     // load returns 3 params - one in the middle is avg.
-                    ZMDataModel.zmDebug("StateCtrl/getLoadStatus: success");
+                    NVRDataModel.debug("StateCtrl/getLoadStatus: success");
                     $scope.zmLoad = success.data.load[1];
 
 
@@ -251,7 +251,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
                 },
                 function (error) {
                     //console.log("ERROR in getLoad: " + JSON.stringify(error));
-                    ZMDataModel.zmLog("Error retrieving loadStatus " + JSON.stringify(error), "error");
+                    NVRDataModel.log("Error retrieving loadStatus " + JSON.stringify(error), "error");
                     $scope.zmLoad = 'undetermined';
                 }
             );
@@ -265,18 +265,18 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
     function performZMoperation(str) {
 
 
-        ZMDataModel.zmDebug("inside performZMoperation with " + str);
+        NVRDataModel.debug("inside performZMoperation with " + str);
 
 
         $scope.zmRun = "...";
         $scope.color = 'color:orange;';
         $scope.customState = "";
-        ZMDataModel.zmDebug("StateCtrl/controlZM: POST Control command is " + apiExec + str + ".json");
+        NVRDataModel.debug("StateCtrl/controlZM: POST Control command is " + apiExec + str + ".json");
         inProgress = 1;
         $http.post(apiExec + str + ".json")
             .then(
                 function (success) {
-                    ZMDataModel.zmDebug("StateCtrl/controlZM: returned success");
+                    NVRDataModel.debug("StateCtrl/controlZM: returned success");
                     inProgress = 0;
                     switch (str) {
                         case "stop":
@@ -296,8 +296,8 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
                     //if (error.status) // it seems to return error with status 0 if ok
                     // {
                     //console.log("ERROR in Change State:" + JSON.stringify(error));
-                    ZMDataModel.zmDebug("StateCtrl/controlZM: returned error");
-                    ZMDataModel.zmLog("Error in change run state:" + JSON.stringify(error), "error");
+                    NVRDataModel.debug("StateCtrl/controlZM: returned error");
+                    NVRDataModel.log("Error in change run state:" + JSON.stringify(error), "error");
                     $scope.zmRun = $translate.instant('kZMUndetermined');
                     $scope.color = 'color:orange;';
                     inProgress = 0;
@@ -308,7 +308,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
 
     function controlZM(str) {
         if (inProgress) {
-            ZMDataModel.zmDebug("StateCtrl/controlZM: operation in progress");
+            NVRDataModel.debug("StateCtrl/controlZM: operation in progress");
             $ionicPopup.alert({
                 title: $translate.instant('kOperationInProgressTitle'),
                 template: $translate.instant('kOperationInProgressBody') + '...'
@@ -366,7 +366,7 @@ angular.module('zmApp.controllers').controller('zmApp.StateCtrl', ['$ionicPopup'
 
     $scope.doRefresh = function () {
         console.log("***Pull to Refresh");
-        ZMDataModel.zmDebug("StateCtrl/refresh: calling getRun/Load/Disk/CurrentState");
+        NVRDataModel.debug("StateCtrl/refresh: calling getRun/Load/Disk/CurrentState");
         getRunStatus();
         $timeout(getLoadStatus, 2000);
         $timeout(getCurrentState, 4000);
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index 9362a7d1..b7624c1b 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -13,7 +13,7 @@
 // FIXME: too much redundant code between EventCtrl and Timeline 
 // Move to ModalCtrl and see if it works
 
-angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', 'message', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', '$ionicContentBanner', '$ionicHistory', '$sce', '$stateParams', '$translate', function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, message, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, $ionicContentBanner, $ionicHistory, $sce, $stateParams, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPlatform', '$scope', 'zm', 'NVRDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', 'message', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', '$ionicContentBanner', '$ionicHistory', '$sce', '$stateParams', '$translate', function ($ionicPlatform, $scope, zm, NVRDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, message, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, $ionicContentBanner, $ionicHistory, $sce, $stateParams, $translate) {
 
     //console.log("Inside Timeline controller");
     $scope.openMenu = function () {
@@ -49,7 +49,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     // Used to display date range for timeline
     //-----------------------------------------------------------
     $scope.prettify = function (str) {
-        return moment(str).format('MMMM Do YYYY, ' + ZMDataModel.getTimeFormat());
+        return moment(str).format('MMMM Do YYYY, ' + NVRDataModel.getTimeFormat());
     };
 
     //-----------------------------------------------------------
@@ -68,10 +68,10 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     $scope.toggleMinAlarmFrameCount = function () {
         // console.log("Toggling");
 
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
         ld.enableAlarmCount = !ld.enableAlarmCount;
 
-        ZMDataModel.setLogin(ld);
+        NVRDataModel.setLogin(ld);
 
 
         drawGraph(curFromDate, curToDate, curCount);
@@ -131,7 +131,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         $scope.fromDate = fromDate;
         $scope.toDate = toDate;
         $rootScope.customTimelineRange = false;
-        ZMDataModel.zmLog("moving by " + d + " day to " + fromDate + " upto " + toDate);
+        NVRDataModel.log("moving by " + d + " day to " + fromDate + " upto " + toDate);
         drawGraph(fromDate, toDate, maxItems);
 
     };
@@ -167,11 +167,11 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         if ($scope.modalFromTimelineIsOpen == true) {
             // don't know why but some conflict from angular to timeline lib
             // results in double modals at times
-            ZMDataModel.zmLog(">>-- duplicate modal detected, preventing");
+            NVRDataModel.log(">>-- duplicate modal detected, preventing");
         }
 
         $scope.modalFromTimelineIsOpen = true;
-        ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
+        NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
 
         // pass this event to ModalCtrl
         $scope.currentEvent = event;
@@ -199,7 +199,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
                 $scope.modal.show();
 
-                var ld = ZMDataModel.getLogin();
+                var ld = NVRDataModel.getLogin();
 
 
 
@@ -215,9 +215,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         $scope.modalFromTimelineIsOpen = false;
         // $interval.cancel(eventsInterval);
         //$interval.cancel(segmentHandle);
-        ZMDataModel.zmDebug("TimelineCtrl:Close & Destroy Modal");
-        ZMDataModel.stopNetwork("TimelineCtrl: closeModal");
-        ZMDataModel.setAwake(false);
+        NVRDataModel.debug("TimelineCtrl:Close & Destroy Modal");
+        NVRDataModel.stopNetwork("TimelineCtrl: closeModal");
+        NVRDataModel.setAwake(false);
         if ($scope.modal !== undefined) {
             $scope.modal.remove();
         }
@@ -228,7 +228,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
           {
               console.log ("GAPLESS TOGGLE");
               $scope.loginData.gapless = !$scope.loginData.gapless;
-              ZMDataModel.setLogin($scope.loginData);
+              NVRDataModel.setLogin($scope.loginData);
               
           };*/
 
@@ -237,7 +237,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     // called when user switches to background
     //-------------------------------------------------------------------------
     function onPause() {
-        ZMDataModel.zmDebug("TimelineCtrl:onpause called");
+        NVRDataModel.debug("TimelineCtrl:onpause called");
         // console.log("*** Moving to Background ***"); // Handle the pause event
 
         if ($scope.popover) $scope.popover.remove();
@@ -282,17 +282,17 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         // Make sure sliding for menu is disabled so it
         // does not interfere with graph panning
         $ionicSideMenuDelegate.canDragContent(false);
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
         maxItemsConf = ($rootScope.platformOS == 'desktop') ? zm.graphDesktopItemMax : zm.graphItemMax;
         maxItems = ld.graphSize || maxItemsConf;
-        ZMDataModel.zmLog("Graph items to draw is " + maxItems);
+        NVRDataModel.log("Graph items to draw is " + maxItems);
         $scope.maxItems = maxItems;
         $scope.translationData = {
             maxItemsVal: maxItems
         };
 
         $scope.graphLoaded = false;
-        ZMDataModel.zmDebug("TimelineCtrl/drawGraph: graphLoaded is " + $scope.graphLoaded);
+        NVRDataModel.debug("TimelineCtrl/drawGraph: graphLoaded is " + $scope.graphLoaded);
     });
 
     //-------------------------------------------------
@@ -311,11 +311,11 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         var tempMon = message;
 
         //console.log ("TIMELINE MONITORS: " + JSON.stringify(message));
-        var ld = ZMDataModel.getLogin();
-        $scope.loginData = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
+        $scope.loginData = NVRDataModel.getLogin();
 
         if (ld.persistMontageOrder) {
-            var iMon = ZMDataModel.applyMontageMonitorPrefs(tempMon, 2);
+            var iMon = NVRDataModel.applyMontageMonitorPrefs(tempMon, 2);
             $scope.monitors = iMon[0];
         } else
             $scope.monitors = message;
@@ -352,11 +352,11 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
             e.preventDefault();
             if ($scope.modal != undefined && $scope.modal.isShown()) {
                 // switch off awake, as liveview is finished
-                ZMDataModel.zmDebug("Modal is open, closing it");
-                ZMDataModel.setAwake(false);
+                NVRDataModel.debug("Modal is open, closing it");
+                NVRDataModel.setAwake(false);
                 $scope.modal.remove();
             } else {
-                ZMDataModel.zmDebug("Modal is closed, so toggling or exiting");
+                NVRDataModel.debug("Modal is closed, so toggling or exiting");
                 if (!$ionicSideMenuDelegate.isOpenLeft()) {
                     $ionicSideMenuDelegate.toggleLeft();
 
@@ -388,7 +388,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     document.addEventListener("pause", onPause, false);
 
     // FIXME: Timeline awake to avoid graph redrawing
-    ZMDataModel.setAwake(ZMDataModel.getKeepAwake());
+    NVRDataModel.setAwake(NVRDataModel.getKeepAwake());
 
 
 
@@ -409,7 +409,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     // maxItems will be ignored during timeline draw if its desktop
     var maxItemsConf;
 
-    var ld = ZMDataModel.getLogin();
+    var ld = NVRDataModel.getLogin();
     var maxItems;
 
 
@@ -477,7 +477,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         //console.log (index);
         if (index == 0) //month
         {
-            ZMDataModel.zmLog("Month view");
+            NVRDataModel.log("Month view");
             $rootScope.customTimelineRange = false;
 
             toDate = moment().format("YYYY-MM-DD HH:mm:ss");
@@ -488,7 +488,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         } else if (index == 1) //week
         {
             $rootScope.customTimelineRange = false;
-            ZMDataModel.zmLog("Week  view");
+            NVRDataModel.log("Week  view");
             toDate = moment().format("YYYY-MM-DD HH:mm:ss");
             fromDate = moment().subtract(1, 'week').startOf('day').format("YYYY-MM-DD HH:mm:ss");
             $scope.fromDate = fromDate;
@@ -497,7 +497,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         } else if (index == 2) //day
         {
             $rootScope.customTimelineRange = false;
-            ZMDataModel.zmLog("Day view");
+            NVRDataModel.log("Day view");
             toDate = moment().format("YYYY-MM-DD HH:mm:ss");
             fromDate = moment().subtract(1, 'day').startOf('day').format("YYYY-MM-DD HH:mm:ss");
             $scope.fromDate = fromDate;
@@ -537,12 +537,12 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
             duration: zm.loadingTimeout, //specifically for Android - http seems to get stuck at times
         });
 
-        ZMDataModel.zmLog("TimelineCtrl/drawgraph: from->" + fromDate + " to->" + toDate + " count:" + count);
+        NVRDataModel.log("TimelineCtrl/drawgraph: from->" + fromDate + " to->" + toDate + " count:" + count);
         $scope.graphLoaded = false;
-        ZMDataModel.zmDebug("TimelineCtrl/drawgraph: graphLoaded:" + $scope.graphLoaded);
+        NVRDataModel.debug("TimelineCtrl/drawgraph: graphLoaded:" + $scope.graphLoaded);
 
         if (timeline) {
-            ZMDataModel.zmDebug("TimelineCtrl/drawgraph: destroying timeline as it exists");
+            NVRDataModel.debug("TimelineCtrl/drawgraph: destroying timeline as it exists");
             timeline.destroy();
         }
 
@@ -568,12 +568,12 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
             stack: false,
             format: {
                 minorLabels: {
-                    minute: ZMDataModel.getTimeFormat(),
-                    hour: ZMDataModel.getTimeFormat(),
+                    minute: NVRDataModel.getTimeFormat(),
+                    hour: NVRDataModel.getTimeFormat(),
                     second: 's',
                 },
                 majorLabels: {
-                    second: "D MMM " + ZMDataModel.getTimeFormat(),
+                    second: "D MMM " + NVRDataModel.getTimeFormat(),
                 }
             },
 
@@ -581,7 +581,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
         var graphIndex = 1; // will be used for graph ID
 
-        ZMDataModel.getEventsPages(0, fromDate, toDate)
+        NVRDataModel.getEventsPages(0, fromDate, toDate)
             .then(function (data) {
                 var pages = parseInt(data.pageCount);
                 var itemsPerPage = parseInt(data.limit);
@@ -589,15 +589,15 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
                 // So iterCount is the # of HTTP calls I need to make
                 iterCount = Math.max(Math.round(count / itemsPerPage), 1);
-                ZMDataModel.zmDebug("TimelineCtrl/drawGraph: pages of data: " + pages + " items per page: " + itemsPerPage);
-                ZMDataModel.zmDebug("TimelineCtrl/drawGraph: I will make " + iterCount + " HTTP Requests to get all graph data");
+                NVRDataModel.debug("TimelineCtrl/drawGraph: pages of data: " + pages + " items per page: " + itemsPerPage);
+                NVRDataModel.debug("TimelineCtrl/drawGraph: I will make " + iterCount + " HTTP Requests to get all graph data");
 
                 // I've restructured this part. I was initially using vis DataSets
                 // for dynamic binding which was easier, but due to performance reasons
                 // I am waiting for the full data to load before I draw
                 var promises = [];
                 while ((pages > 0) && (iterCount > 0)) {
-                    var promise = ZMDataModel.getEvents(0, pages, "none", fromDate, toDate);
+                    var promise = NVRDataModel.getEvents(0, pages, "none", fromDate, toDate);
                     promises.push(promise);
                     pages--;
                     iterCount--;
@@ -606,19 +606,19 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
                 $q.all(promises)
                     .then(function (data) {
-                            ZMDataModel.zmDebug("TimelineCtrl/drawgraph: all pages of graph data received");
+                            NVRDataModel.debug("TimelineCtrl/drawgraph: all pages of graph data received");
                             graphIndex = 0;
-                            ZMDataModel.zmLog("Creating " + $scope.monitors.length + " groups for the graph");
+                            NVRDataModel.log("Creating " + $scope.monitors.length + " groups for the graph");
                             // create groups
                             for (var g = 0; g < $scope.monitors.length; g++) {
                                 groups.add({
                                     id: $scope.monitors[g].Monitor.Id,
                                     //mid: $scope.monitors[g].Monitor.Id,
-                                    content: ZMDataModel.getMonitorName($scope.monitors[g].Monitor.Id),
+                                    content: NVRDataModel.getMonitorName($scope.monitors[g].Monitor.Id),
                                     order: $scope.monitors[g].Monitor.Sequence
                                 });
-                                ZMDataModel.zmDebug("TimelineCtrl/drawgraph:Adding group " +
-                                    ZMDataModel.getMonitorName($scope.monitors[g].Monitor.Id));
+                                NVRDataModel.debug("TimelineCtrl/drawgraph:Adding group " +
+                                    NVRDataModel.getMonitorName($scope.monitors[g].Monitor.Id));
                             }
 
 
@@ -627,7 +627,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
                                 var myevents = data[j];
 
                                 if (graphIndex > count) {
-                                    ZMDataModel.zmLog("Exiting page count graph - reached limit of " + count);
+                                    NVRDataModel.log("Exiting page count graph - reached limit of " + count);
                                     break;
 
                                 }
@@ -636,7 +636,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
                                     // make sure group id exists before adding
                                     var idfound = true;
-                                    var ld = ZMDataModel.getLogin();
+                                    var ld = NVRDataModel.getLogin();
 
                                     if (ld.persistMontageOrder) {
 
@@ -651,15 +651,15 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
                                         }
                                     }
 
-                                    myevents[i].Event.MonitorName = ZMDataModel.getMonitorName(myevents[i].Event.MonitorId);
+                                    myevents[i].Event.MonitorName = NVRDataModel.getMonitorName(myevents[i].Event.MonitorId);
                                     // now construct base path
 
-                                    myevents[i].Event.streamingURL = ZMDataModel.getStreamingURL(myevents[i].Event.MonitorId);
-                                    myevents[i].Event.baseURL = ZMDataModel.getBaseURL(myevents[i].Event.MonitorId);
-                                    myevents[i].Event.imageMode = ZMDataModel.getImageMode(myevents[i].Event.MonitorId);
-                                    if (ZMDataModel.getLogin().url != myevents[i].Event.baseURL) {
-                                        //ZMDataModel.zmDebug ("Multi server, changing base");
-                                        myevents[i].Event.baseURL = ZMDataModel.getLogin().url;
+                                    myevents[i].Event.streamingURL = NVRDataModel.getStreamingURL(myevents[i].Event.MonitorId);
+                                    myevents[i].Event.baseURL = NVRDataModel.getBaseURL(myevents[i].Event.MonitorId);
+                                    myevents[i].Event.imageMode = NVRDataModel.getImageMode(myevents[i].Event.MonitorId);
+                                    if (NVRDataModel.getLogin().url != myevents[i].Event.baseURL) {
+                                        //NVRDataModel.debug ("Multi server, changing base");
+                                        myevents[i].Event.baseURL = NVRDataModel.getLogin().url;
 
                                     }
                                     // console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL);
@@ -699,7 +699,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
 
                                     if (graphIndex > count) {
-                                        ZMDataModel.zmLog("Exiting event graph - reached limit of " + count);
+                                        NVRDataModel.log("Exiting event graph - reached limit of " + count);
                                         break;
 
                                     }
@@ -717,7 +717,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
                             $ionicLoading.hide();
                             $scope.graphLoaded = true;
-                            ZMDataModel.zmDebug("graph loaded: " + $scope.graphLoaded);
+                            NVRDataModel.debug("graph loaded: " + $scope.graphLoaded);
                             $scope.navControls = false;
                             var dblclick = false;
 
@@ -742,17 +742,17 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
                                     var itm = prop.item;
                                     //console.log ("ITEM CLICKED " + itm);
                                     if (itm && !isNaN(itm)) {
-                                        ZMDataModel.zmDebug("TimelineCtrl/drawGraph:You clicked on item " + itm);
+                                        NVRDataModel.debug("TimelineCtrl/drawGraph:You clicked on item " + itm);
                                         var item = graphData.get(itm);
-                                        ZMDataModel.zmDebug("TimelineCtrl/drawGraph: clicked item details:" + JSON.stringify(item));
+                                        NVRDataModel.debug("TimelineCtrl/drawGraph: clicked item details:" + JSON.stringify(item));
                                         showEvent(item.myevent);
 
 
                                     } else {
-                                        ZMDataModel.zmDebug("exact match not found, guessing item with co-ordinates X=" + prop.x + " group=" + prop.group);
+                                        NVRDataModel.debug("exact match not found, guessing item with co-ordinates X=" + prop.x + " group=" + prop.group);
                                         if (prop.group) {
                                             var visible = timeline.getVisibleItems();
-                                            ZMDataModel.zmDebug("Visible items=" + JSON.stringify(visible));
+                                            NVRDataModel.debug("Visible items=" + JSON.stringify(visible));
                                             var closestItem = null;
                                             var minDist = 99999;
                                             var _item;
@@ -762,7 +762,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
                                                     if (Math.abs(_item.left - prop.x) < minDist) {
                                                         closestItem = _item;
                                                         minDist = Math.abs(_item.left - prop.x);
-                                                        ZMDataModel.zmDebug("Temporary closest " + _item.left);
+                                                        NVRDataModel.debug("Temporary closest " + _item.left);
                                                         //console.log (_item);
                                                     }
                                                 }
@@ -770,10 +770,10 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
                                             }
 
                                             if (closestItem != null) {
-                                                ZMDataModel.zmLog("Closest item " + closestItem.left + " group: " + closestItem.data.group);
+                                                NVRDataModel.log("Closest item " + closestItem.left + " group: " + closestItem.data.group);
                                                 showEvent(closestItem.data.myevent);
                                             } else {
-                                                ZMDataModel.zmLog("Did not find a visible item match");
+                                                NVRDataModel.log("Did not find a visible item match");
                                             }
                                         } else // no group row tapped, do nothing
                                         {
@@ -799,18 +799,18 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
                                 var itm = prop.item;
                                 //console.log ("ITEM CLICKED " + itm);
                                 if (itm && !isNaN(itm)) {
-                                    ZMDataModel.zmDebug("TimelineCtrl/drawGraph:You clicked on item " + itm);
+                                    NVRDataModel.debug("TimelineCtrl/drawGraph:You clicked on item " + itm);
                                     var item = graphData.get(itm);
-                                    ZMDataModel.zmDebug("TimelineCtrl/drawGraph: clicked item details:" + JSON.stringify(item));
+                                    NVRDataModel.debug("TimelineCtrl/drawGraph: clicked item details:" + JSON.stringify(item));
                                     eventDetails(item.myevent);
 
 
                                 } else {
 
-                                    ZMDataModel.zmDebug("exact match not found, guessing item with co-ordinates X=" + prop.x + " group=" + prop.group);
+                                    NVRDataModel.debug("exact match not found, guessing item with co-ordinates X=" + prop.x + " group=" + prop.group);
                                     if (prop.group) {
                                         var visible = timeline.getVisibleItems();
-                                        ZMDataModel.zmDebug("Visible items=" + JSON.stringify(visible));
+                                        NVRDataModel.debug("Visible items=" + JSON.stringify(visible));
                                         var closestItem = null;
                                         var minDist = 99999;
                                         var _item;
@@ -820,18 +820,18 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
                                                 if (Math.abs(_item.left - prop.x) < minDist) {
                                                     closestItem = _item;
                                                     minDist = Math.abs(_item.left - prop.x);
-                                                    ZMDataModel.zmDebug("Temporary closest " + _item.left);
+                                                    NVRDataModel.debug("Temporary closest " + _item.left);
                                                     //console.log (_item);
                                                 }
                                             }
 
                                         }
-                                        ZMDataModel.zmLog("Closest item " + closestItem.left + " group: " + closestItem.data.group);
+                                        NVRDataModel.log("Closest item " + closestItem.left + " group: " + closestItem.data.group);
                                         if (closestItem != null) {
-                                            ZMDataModel.zmLog("Closest item " + closestItem.left + " group: " + closestItem.data.group);
+                                            NVRDataModel.log("Closest item " + closestItem.left + " group: " + closestItem.data.group);
                                             showEvent(closestItem.data.myevent);
                                         } else {
-                                            ZMDataModel.zmLog("Did not find a visible item match");
+                                            NVRDataModel.log("Did not find a visible item match");
                                         }
                                     }
 
@@ -841,7 +841,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
                             });
                         },
                         function (error) {
-                            ZMDataModel.displayBanner('error', 'Timeline error', 'Please try again');
+                            NVRDataModel.displayBanner('error', 'Timeline error', 'Please try again');
 
                         }
 
diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js
index a4b2cb4b..87f26126 100644
--- a/www/js/TimelineModalCtrl.js
+++ b/www/js/TimelineModalCtrl.js
@@ -6,7 +6,7 @@
 
 
 
-angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '$rootScope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', '$translate', function ($scope, $rootScope, zm, ZMDataModel, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup, $translate) {
+angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '$rootScope', 'zm', 'NVRDataModel', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$q', '$sce', 'carouselUtils', '$ionicPopup', '$translate', function ($scope, $rootScope, zm, NVRDataModel, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $stateParams, $ionicHistory, $ionicScrollDelegate, $q, $sce, carouselUtils, $ionicPopup, $translate) {
 
 
 
@@ -25,7 +25,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
     var current_options;
     var btype;
 
-    $scope.graphType = ZMDataModel.getLogin().timelineModalGraphType;
+    $scope.graphType = NVRDataModel.getLogin().timelineModalGraphType;
     //$scope.graphType = "all";
     $scope.errorDetails = "";
 
@@ -58,7 +58,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
 
     $rootScope.$on("auth-success", function () {
 
-        ZMDataModel.zmDebug("EventModalCtrl: Re-login detected, resetting everything & re-generating connkey");
+        NVRDataModel.debug("EventModalCtrl: Re-login detected, resetting everything & re-generating connkey");
 
 
     });
@@ -80,7 +80,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
         if ($scope.graphType == $translate.instant('kGraphAll')) {
             current_data = onlyalarm_data;
             $scope.graphType = $translate.instant('kGraphAlarmed');
-            ZMDataModel.zmDebug("Alarm array has " + onlyalarm_data.labels.length + " frames");
+            NVRDataModel.debug("Alarm array has " + onlyalarm_data.labels.length + " frames");
             btype = 'bar';
             //console.log (JSON.stringify(onlyalarm_data));
 
@@ -91,11 +91,11 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
             btype = 'line';
         }
 
-        ZMDataModel.zmLog("Switching graph type to " + $scope.graphType);
+        NVRDataModel.log("Switching graph type to " + $scope.graphType);
 
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
         ld.timelineModalGraphType = $scope.graphType;
-        ZMDataModel.setLogin(ld);
+        NVRDataModel.setLogin(ld);
 
 
         $timeout(function () {
@@ -165,18 +165,18 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
 
         $scope.alarm_images = [];
         $scope.graphWidth = $rootScope.devWidth - 30;
-        ZMDataModel.zmLog("Setting init graph width to " + $scope.graphWidth);
+        NVRDataModel.log("Setting init graph width to " + $scope.graphWidth);
         $scope.dataReady = false;
 
-        ZMDataModel.getKeyConfigParams(0)
+        NVRDataModel.getKeyConfigParams(0)
             .then(function (data) {
                 //console.log ("***GETKEY: " + JSON.stringify(data));
                 eventImageDigits = parseInt(data);
-                ZMDataModel.zmLog("Image padding digits reported as " + eventImageDigits);
+                NVRDataModel.log("Image padding digits reported as " + eventImageDigits);
             });
 
         $scope.eventdetails = $translate.instant('kLoading') + "...";
-        $scope.mName = ZMDataModel.getMonitorName($scope.event.Event.MonitorId);
+        $scope.mName = NVRDataModel.getMonitorName($scope.event.Event.MonitorId);
         $scope.humanizeTime = humanizeTime($scope.event.Event.StartTime);
         processEvent();
         //$scope.eventdetails = JSON.stringify($scope.event);
@@ -190,9 +190,9 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
     function processEvent() {
         var eid = $scope.event.Event.Id;
         //eid = 22302;
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
         var apiurl = ld.apiurl + "/events/" + eid + ".json";
-        ZMDataModel.zmLog("Getting " + apiurl);
+        NVRDataModel.log("Getting " + apiurl);
         $http.get(apiurl)
             .then(function (success) {
                     //$scope.eventdetails = JSON.stringify(success);
@@ -200,7 +200,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
                 },
                 function (error) {
                     $scope.errorDetails = $translate.instant('kGraphError');
-                    ZMDataModel.zmLog("Error in timeline frames " + JSON.stringify(error));
+                    NVRDataModel.log("Error in timeline frames " + JSON.stringify(error));
                 });
     }
 
@@ -296,7 +296,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
         if ($scope.graphWidth < $rootScope.devWidth)
             $scope.graphWidth = $rootScope.devWidth;
 
-        // ZMDataModel.zmLog ("Changing graph width to " + $scope.graphWidth);
+        // NVRDataModel.log ("Changing graph width to " + $scope.graphWidth);
 
         for (var i = 0; i < event.event.Frame.length; i++) {
 
@@ -343,7 +343,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
         cv = document.getElementById("tcchart");
         ctx = cv.getContext("2d");
 
-        if (ZMDataModel.getLogin().timelineModalGraphType == $translate.instant('kGraphAll')) {
+        if (NVRDataModel.getLogin().timelineModalGraphType == $translate.instant('kGraphAll')) {
             btype = 'line';
             current_data = data;
         } else {
@@ -381,7 +381,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
                 id: items.id,
                 fname: items.fname,
                 score: items.score,
-                time: moment(items.x).format("MMM D," + ZMDataModel.getTimeFormatSec()),
+                time: moment(items.x).format("MMM D," + NVRDataModel.getTimeFormatSec()),
                 eid: items.eid
             });
         });
@@ -396,7 +396,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
 
     function computeRelativePath(event) {
         var relativePath = "";
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
         var yy = moment(str).format('YY');
         var mm = moment(str).format('MM');
@@ -421,7 +421,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
 
     function computeBasePath(event) {
         var basePath = "";
-        var loginData = ZMDataModel.getLogin();
+        var loginData = NVRDataModel.getLogin();
         var str = event.Event.StartTime;
         var yy = moment(str).format('YY');
         var mm = moment(str).format('MM');
diff --git a/www/js/WizardCtrl.js b/www/js/WizardCtrl.js
index a06a86c2..0b39b431 100644
--- a/www/js/WizardCtrl.js
+++ b/www/js/WizardCtrl.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console, Masonry, URI */
 
-angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$rootScope', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$ionicPopup', 'SecuredPopups', '$http', '$q', 'zm', '$ionicLoading', 'WizardHandler', '$translate', function ($scope, $rootScope, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $ionicHistory, $state, $ionicPopup, SecuredPopups, $http, $q, zm, $ionicLoading, WizardHandler, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$rootScope', '$ionicModal', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$ionicPopup', 'SecuredPopups', '$http', '$q', 'zm', '$ionicLoading', 'WizardHandler', '$translate', function ($scope, $rootScope, $ionicModal, NVRDataModel, $ionicSideMenuDelegate, $ionicHistory, $state, $ionicPopup, SecuredPopups, $http, $q, zm, $ionicLoading, WizardHandler, $translate) {
     $scope.openMenu = function () {
         $ionicSideMenuDelegate.toggleLeft();
     };
@@ -91,7 +91,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
                         }
 
                         if (foundMid != -1) {
-                            ZMDataModel.zmDebug("zmWizard - getFirstMonitor returned " + foundMid);
+                            NVRDataModel.debug("zmWizard - getFirstMonitor returned " + foundMid);
                             d.resolve(foundMid);
                             return d.promise;
                         } else {
@@ -126,18 +126,18 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
             var t = "";
             if (tail) t = tail;
             //$ionicLoading.show({template: 'trying ' + urls[0].server});
-            ZMDataModel.zmLog("zmWizard test.." + urls[0] + t);
+            NVRDataModel.log("zmWizard test.." + urls[0] + t);
             return $http.get(urls[0] + t).then(function () {
-                ZMDataModel.zmLog("Success:  on " + urls[0] + t);
+                NVRDataModel.log("Success:  on " + urls[0] + t);
                 //$ionicLoading.hide();
                 return urls[0];
             }, function (err) {
-                ZMDataModel.zmLog("zmWizard:Failed on " + urls[0] + t + " with error " + JSON.stringify(err));
+                NVRDataModel.log("zmWizard:Failed on " + urls[0] + t + " with error " + JSON.stringify(err));
                 return findFirstReachableUrl(urls.slice(1), tail);
             });
         } else {
             // $ionicLoading.hide();
-            ZMDataModel.zmLog("zmWizard: findFirst returned no success");
+            NVRDataModel.log("zmWizard: findFirst returned no success");
             d.reject("No reachable URL");
             return d.promise;
 
@@ -176,7 +176,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
 
         var baseUri = c.scheme + "://" + p1 + c.host + p2;
 
-        ZMDataModel.zmLog("zmWizard CGI: baseURL is " + baseUri);
+        NVRDataModel.log("zmWizard CGI: baseURL is " + baseUri);
 
         var a4 = baseUri + "/cgi-bin/zm"; // another one I found with a CentOS 6 guy
         var a3 = baseUri + "/zm/cgi-bin"; // ubuntu/debian
@@ -187,18 +187,18 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
         var urls = [a1, a2, a3, a4];
 
 
-        ZMDataModel.getPathZms() // what does ZM have stored in PATH_ZMS?
+        NVRDataModel.getPathZms() // what does ZM have stored in PATH_ZMS?
             .then(function (data) {
                     // remove zms or nph-zms
                     var path = data.trim();
                     path = path.replace("/nph-zms", "");
                     path = path.replace("/zms", "");
                     urls.push(baseUri.trim() + path);
-                    ZMDataModel.zmLog("zmWizard: getPathZMS succeeded, adding " + baseUri + path + " to things to try");
+                    NVRDataModel.log("zmWizard: getPathZMS succeeded, adding " + baseUri + path + " to things to try");
                     continueCgi(urls);
                 },
                 function (error) {
-                    ZMDataModel.zmLog("zmWizard: getPathZMS failed, but continuing...");
+                    NVRDataModel.log("zmWizard: getPathZMS failed, but continuing...");
                     continueCgi(urls);
                 });
 
@@ -216,19 +216,19 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
                         if ($scope.wizard.useauth && $scope.wizard.usezmauth) {
 
                             var ck = Math.floor(Math.random() * (50000 - 10000 + 1)) + 10000;
-                            ZMDataModel.getAuthKey(success, ck)
+                            NVRDataModel.getAuthKey(success, ck)
                                 .then(function (success) {
                                         if (success == "") {
-                                            ZMDataModel.zmLog("getAuthKey returned null, so going user=&pwd= way");
+                                            NVRDataModel.log("getAuthKey returned null, so going user=&pwd= way");
                                             tail += "&user=" + $scope.wizard.zmuser + "&pass=" + $scope.wizard.zmpassword;
                                         } else {
                                             tail += success;
                                         }
-                                        ZMDataModel.zmLog("auth computed is : " + tail);
+                                        NVRDataModel.log("auth computed is : " + tail);
                                         proceedwithCgiAfterAuth(urls, tail);
                                     },
                                     function (error) {
-                                        ZMDataModel.zmLog("Should never come here, getAuthKey doesn't return error");
+                                        NVRDataModel.log("Should never come here, getAuthKey doesn't return error");
 
                                     });
 
@@ -250,7 +250,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
                             findFirstReachableUrl(urls, tail)
                                 .then(function (success) {
                                         $ionicLoading.hide();
-                                        ZMDataModel.zmLog("Valid cgi-bin found with: " + success);
+                                        NVRDataModel.log("Valid cgi-bin found with: " + success);
                                         $scope.wizard.streamingURL = success;
                                         $scope.wizard.streamingValidText = "cgi-bin: " + $scope.wizard.streamingURL;
                                         $scope.wizard.streamingColor = "#16a085";
@@ -310,7 +310,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
 
         findFirstReachableUrl(apilist, '/host/getVersion.json')
             .then(function (success) {
-                    ZMDataModel.zmLog("Valid API response found with:" + success);
+                    NVRDataModel.log("Valid API response found with:" + success);
                     $scope.wizard.apiURL = success;
 
 
@@ -431,7 +431,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
         $scope.wizard.fqportal = u;
 
         u = u + '/index.php';
-        ZMDataModel.zmLog("Wizard: login url is " + u);
+        NVRDataModel.log("Wizard: login url is " + u);
 
         // now lets login
 
@@ -444,7 +444,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
 
         // logout first for the adventurers amongst us who must
         // use it even after logging in
-        ZMDataModel.zmLog("zmWizard: logging out");
+        NVRDataModel.log("zmWizard: logging out");
         $ionicLoading.show({
             template: $translate.instant('kCleaningUp') + "...",
             noBackdrop: true,
@@ -454,7 +454,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
             .then(function (ans) {
                 // login now
                 $ionicLoading.hide();
-                ZMDataModel.zmLog("zmWizard: logging in with " + u + " " + zmu);
+                NVRDataModel.log("zmWizard: logging in with " + u + " " + zmu);
 
                 // The logic will be:
                 // Login then do an api detect and cgi-detect together
@@ -466,7 +466,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
                 login(u, zmu, zmp)
                     .then(function (success) {
                             $ionicLoading.hide();
-                            ZMDataModel.zmLog("zmWizard: login succeeded");
+                            NVRDataModel.log("zmWizard: login succeeded");
 
                             // API Detection
                             $ionicLoading.show({
@@ -477,7 +477,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
                             detectapi()
                                 .then(function (success) {
                                         $ionicLoading.hide();
-                                        ZMDataModel.zmLog("zmWizard: API succeeded");
+                                        NVRDataModel.log("zmWizard: API succeeded");
 
                                         $ionicLoading.show({
                                             template: $translate.instant('kDiscoveringCGI') + "...",
@@ -499,7 +499,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
                                     },
                                     function (error) {
                                         $ionicLoading.hide();
-                                        ZMDataModel.zmLog("zmWizard: api failed");
+                                        NVRDataModel.log("zmWizard: api failed");
 
                                         // return true here because we want to progress
                                         return d.resolve(true);
@@ -511,7 +511,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
                         // if login failed, don't progress in the wizard
                         function (error) {
                             $ionicLoading.hide();
-                            ZMDataModel.zmLog("zmWizard: login failed");
+                            NVRDataModel.log("zmWizard: login failed");
                             $scope.wizard.portalValidText = $translate.instant('kPortalLoginUnsuccessful');
                             $scope.wizard.portalColor = "#e74c3c";
                             return d.resolve(true);
@@ -542,7 +542,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
     //--------------------------------------------------------------------------
 
     $scope.exitAuth = function () {
-        ZMDataModel.zmLog("Wizard: validating auth syntax");
+        NVRDataModel.log("Wizard: validating auth syntax");
         if ($scope.wizard.useauth) {
             if (!$scope.wizard.usezmauth && !$scope.wizard.usebasicauth) {
                 $rootScope.zmPopup = SecuredPopups.show('show', {
@@ -596,7 +596,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
     //--------------------------------------------------------------------------
 
     $scope.exitPortal = function () {
-        ZMDataModel.zmLog("Wizard: validating portal url syntax");
+        NVRDataModel.log("Wizard: validating portal url syntax");
 
         if (!$scope.wizard.portalurl) {
             $rootScope.zmPopup = SecuredPopups.show('show', {
@@ -632,7 +632,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
                 buttons: [{
                     text: $translate.instant('kButtonOk'),
                     onTap: function (e) {
-                        ZMDataModel.zmDebug("Protocol selected:" + $scope.myproto.proto);
+                        NVRDataModel.debug("Protocol selected:" + $scope.myproto.proto);
                         $scope.wizard.portalurl = $scope.myproto.proto + stripProto($scope.wizard.portalurl);
                     }
 
@@ -644,7 +644,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
 
         $scope.wizard.portalurl = $scope.wizard.portalurl.toLowerCase().trim();
 
-        ZMDataModel.zmLog("Wizard: stripped url:" + $scope.wizard.portalurl);
+        NVRDataModel.log("Wizard: stripped url:" + $scope.wizard.portalurl);
 
         var c = URI.parse($scope.wizard.portalurl);
 
@@ -674,7 +674,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
         if (c.host) $scope.wizard.portalurl += c.host;
         if (c.port) $scope.wizard.portalurl += ":" + c.port;
         if (c.path) $scope.wizard.portalurl += c.path;
-        ZMDataModel.zmLog("Wizard: normalized url:" + $scope.wizard.portalurl);
+        NVRDataModel.log("Wizard: normalized url:" + $scope.wizard.portalurl);
         return true;
     };
 
diff --git a/www/js/app.js b/www/js/app.js
index 9b24fa9e..f9ea05e5 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -144,8 +144,8 @@ angular.module('zmApp', [
 // (keeps reading data). Hence not using it now
 //credit: http://stackoverflow.com/questions/34958575/intercepting-img-src-via-http-interceptor-as-well-as-not-lose-the-ability-to-kee
 .directive('httpSrc', [
-        '$http', 'imageLoadingDataShare', 'ZMDataModel',
-        function ($http, imageLoadingDataShare, ZMDataModel) {
+        '$http', 'imageLoadingDataShare', 'NVRDataModel',
+        function ($http, imageLoadingDataShare, NVRDataModel) {
         var directive = {
             link: postLink,
             restrict: 'A'
@@ -503,7 +503,7 @@ angular.module('zmApp', [
 //-----------------------------------------------------------------
 // This service automatically checks for new versions every 24 hrs
 //------------------------------------------------------------------
-.factory('zmCheckUpdates', function ($interval, $http, zm, $timeout, $localstorage, ZMDataModel, $rootScope) {
+.factory('zmCheckUpdates', function ($interval, $http, zm, $timeout, $localstorage, NVRDataModel, $rootScope) {
     var zmUpdateHandle;
     var zmUpdateVersion = "";
 
@@ -517,7 +517,7 @@ angular.module('zmApp', [
 
 
         function checkUpdate() {
-            var lastdateString = ZMDataModel.getLastUpdateCheck();
+            var lastdateString = NVRDataModel.getLastUpdateCheck();
             var lastdate;
             if (!lastdateString) {
 
@@ -528,38 +528,38 @@ angular.module('zmApp', [
             }
             var timdiff = moment().diff(lastdate, 'hours');
             if (timdiff < 24) {
-                ZMDataModel.zmLog("Checked for update " + timdiff + " hours ago. Not checking again");
+                NVRDataModel.log("Checked for update " + timdiff + " hours ago. Not checking again");
 
                 return;
             }
-            ZMDataModel.zmLog("Checking for new version updates...");
+            NVRDataModel.log("Checking for new version updates...");
 
 
             $http.get(zm.latestRelease)
                 .then(function (success) {
 
-                    ZMDataModel.setLastUpdateCheck(moment().toISOString());
+                    NVRDataModel.setLastUpdateCheck(moment().toISOString());
                     // $localstorage.set("lastUpdateCheck", moment().toISOString());
                     //console.log ("FULL STRING " + success.data.tag_name);
                     var res = success.data.tag_name.match("v(.*)");
                     zmUpdateVersion = res[1];
-                    var currentVersion = ZMDataModel.getAppVersion();
+                    var currentVersion = NVRDataModel.getAppVersion();
                     if ($rootScope.platformOS == "desktop") {
                         zmUpdateVersion = zmUpdateVersion + "D";
                     }
-                    //if (ZMDataModel.getAppVersion() != zmUpdateVersion) {
-                    if (ZMDataModel.versionCompare(ZMDataModel.getAppVersion(), zmUpdateVersion) == -1) {
+                    //if (NVRDataModel.getAppVersion() != zmUpdateVersion) {
+                    if (NVRDataModel.versionCompare(NVRDataModel.getAppVersion(), zmUpdateVersion) == -1) {
                         $rootScope.newVersionAvailable = "v" + zmUpdateVersion + " available";
                     } else {
                         $rootScope.newVersionAvailable = "";
                     }
-                    ZMDataModel.zmDebug("current version: " + currentVersion + " & available version " + zmUpdateVersion);
-                    //console.log ("Version compare returned: " + ZMDataModel.versionCompare(currentVersion, //zmUpdateVersion));
-                    // console.log ("Version compare returned: " + ZMDataModel.versionCompare(zmUpdateVersion, currentVersion));
+                    NVRDataModel.debug("current version: " + currentVersion + " & available version " + zmUpdateVersion);
+                    //console.log ("Version compare returned: " + NVRDataModel.versionCompare(currentVersion, //zmUpdateVersion));
+                    // console.log ("Version compare returned: " + NVRDataModel.versionCompare(zmUpdateVersion, currentVersion));
                     //console.log ("UPDATE " + zmVersion);
                 });
 
-            ZMDataModel.zmLog("Checking for news updates");
+            NVRDataModel.log("Checking for news updates");
             $http.get(zm.blogUrl)
                 .success(function (data) {
                     $rootScope.newBlogPost = "";
@@ -568,7 +568,7 @@ angular.module('zmApp', [
                         return;
                     }
 
-                    var lastDate = ZMDataModel.getLatestBlogPostChecked();
+                    var lastDate = NVRDataModel.getLatestBlogPostChecked();
                     //console.log ("************ BLOG LAST DATE " + lastDate);
                     if (!lastDate) {
 
@@ -580,14 +580,14 @@ angular.module('zmApp', [
                     var mItemDate = moment(data[0].date);
 
                     if (mItemDate.diff(mLastDate) > 0) {
-                        ZMDataModel.zmDebug("New post dated " + data[0].date + " found");
+                        NVRDataModel.debug("New post dated " + data[0].date + " found");
                         if (data[0].level == "critical") {
                             $rootScope.newBlogPost = "(new post)";
                         } else {
-                            ZMDataModel.zmDebug("Not showing a notification in menu as this is not critical");
+                            NVRDataModel.debug("Not showing a notification in menu as this is not critical");
                         }
                     } else {
-                        ZMDataModel.zmDebug("Latest post dated " + data[0].date + " but you read " + lastDate);
+                        NVRDataModel.debug("Latest post dated " + data[0].date + " but you read " + lastDate);
                     }
 
 
@@ -616,7 +616,7 @@ angular.module('zmApp', [
 // This service automatically logs into ZM at periodic intervals
 //------------------------------------------------------------------
 
-.factory('zmAutoLogin', function ($interval, ZMDataModel, $http, zm, $browser, $timeout, $q, $rootScope, $ionicLoading, $ionicPopup, $state, $ionicContentBanner, EventServer, $ionicHistory, $translate) {
+.factory('zmAutoLogin', function ($interval, NVRDataModel, $http, zm, $browser, $timeout, $q, $rootScope, $ionicLoading, $ionicPopup, $state, $ionicContentBanner, EventServer, $ionicHistory, $translate) {
     var zmAutoLoginHandle;
 
     //------------------------------------------------------------------
@@ -625,8 +625,8 @@ angular.module('zmApp', [
 
     $rootScope.$on("auth-error", function () {
 
-        ZMDataModel.zmDebug("zmAutoLogin: Inside auth-error emit");
-        ZMDataModel.displayBanner('error', ['ZoneMinder authentication failed', 'Please check settings']);
+        NVRDataModel.debug("zmAutoLogin: Inside auth-error emit");
+        NVRDataModel.displayBanner('error', ['ZoneMinder authentication failed', 'Please check settings']);
 
     });
 
@@ -638,7 +638,7 @@ angular.module('zmApp', [
     //------------------------------------------------------------------
 
     $rootScope.$on("init-complete", function () {
-        ZMDataModel.zmLog(">>>>>>>>>>>>>>> All init over, going to portal login");
+        NVRDataModel.log(">>>>>>>>>>>>>>> All init over, going to portal login");
         $ionicHistory.nextViewOptions({ disableAnimate: true});
         $state.go("zm-portal-login");
     });
@@ -658,12 +658,12 @@ angular.module('zmApp', [
         $timeout(function () {
             contentBannerInstance();
         }, 2000);
-        ZMDataModel.zmDebug("auth-success emit:Successful");
+        NVRDataModel.debug("auth-success emit:Successful");
     });
 
 
     $rootScope.getProfileName = function () {
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
         return (ld.serverName || '(none)');
     };
 
@@ -682,13 +682,13 @@ angular.module('zmApp', [
         var statename = $ionicHistory.currentStateName();
 
         if (statename == "montage-history") {
-            ZMDataModel.zmLog("Skipping login process as we are in montage history. Re-logging will mess up the stream");
+            NVRDataModel.log("Skipping login process as we are in montage history. Re-logging will mess up the stream");
             d.resolve("success");
             return d.promise;
 
         }
 
-        ZMDataModel.zmDebug("Resetting zmCookie...");
+        NVRDataModel.debug("Resetting zmCookie...");
         $rootScope.zmCookie = '';
         // first try to login, if it works, good
         // else try to do reachability
@@ -700,7 +700,7 @@ angular.module('zmApp', [
                 function (error)
                 // login to main failed, so try others
                 {
-                    ZMDataModel.getReachableConfig(true)
+                    NVRDataModel.getReachableConfig(true)
                         .then(function (data) {
                                 proceedWithLogin()
                                     .then(function (success) {
@@ -735,8 +735,8 @@ angular.module('zmApp', [
             // console.log ("***** STATENAME IS " + statename);
 
             var d = $q.defer();
-            var ld = ZMDataModel.getLogin();
-            ZMDataModel.zmLog("zmAutologin called");
+            var ld = NVRDataModel.getLogin();
+            NVRDataModel.log("zmAutologin called");
 
             if (str) {
                 $ionicLoading.show({
@@ -746,11 +746,11 @@ angular.module('zmApp', [
                 });
             }
 
-            ZMDataModel.isReCaptcha()
+            NVRDataModel.isReCaptcha()
                 .then(function (result) {
                     if (result == true) {
                         $ionicLoading.hide();
-                        ZMDataModel.displayBanner('error', ['reCaptcha must be disabled',
+                        NVRDataModel.displayBanner('error', ['reCaptcha must be disabled',
                                             ], "", 8000);
                         var alertPopup = $ionicPopup.alert({
                             title: 'reCaptcha enabled',
@@ -775,8 +775,8 @@ angular.module('zmApp', [
 
 
 
-            var loginData = ZMDataModel.getLogin();
-            //ZMDataModel.zmDebug ("*** AUTH LOGIN URL IS " + loginData.url);
+            var loginData = NVRDataModel.getLogin();
+            //NVRDataModel.debug ("*** AUTH LOGIN URL IS " + loginData.url);
             $http({
                     method: 'POST',
                     //withCredentials: true,
@@ -815,7 +815,7 @@ angular.module('zmApp', [
                         //eventServer.start();
                         $rootScope.loggedIntoZm = 1;
 
-                        ZMDataModel.zmLog("zmAutologin successfully logged into Zoneminder");
+                        NVRDataModel.log("zmAutologin successfully logged into Zoneminder");
 
                         d.resolve("Login Success");
 
@@ -825,7 +825,7 @@ angular.module('zmApp', [
                     {
                         $rootScope.loggedIntoZm = -1;
                         //console.log("**** ZM Login FAILED");
-                        ZMDataModel.zmLog("zmAutologin Error: Bad Credentials ", "error");
+                        NVRDataModel.log("zmAutologin Error: Bad Credentials ", "error");
                         $rootScope.$emit('auth-error', "incorrect credentials");
 
                         d.reject("Login Error");
@@ -835,21 +835,21 @@ angular.module('zmApp', [
                     // Now go ahead and re-get auth key 
                     // if login was a success
                     $rootScope.authSession = "undefined";
-                    var ld = ZMDataModel.getLogin();
-                    ZMDataModel.getAuthKey($rootScope.validMonitorId)
+                    var ld = NVRDataModel.getLogin();
+                    NVRDataModel.getAuthKey($rootScope.validMonitorId)
                         .then(function (success) {
 
                                 //console.log(success);
                                 $rootScope.authSession = success;
-                                ZMDataModel.zmLog("Stream authentication construction: " +
+                                NVRDataModel.log("Stream authentication construction: " +
                                     $rootScope.authSession);
 
                             },
                             function (error) {
                                 //console.log(error);
 
-                                ZMDataModel.zmLog("Modal: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
-                                ZMDataModel.zmDebug("Error was: " + JSON.stringify(error));
+                                NVRDataModel.log("Modal: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
+                                NVRDataModel.debug("Error was: " + JSON.stringify(error));
                             });
 
                     return (d.promise);
@@ -862,7 +862,7 @@ angular.module('zmApp', [
 
                     // FIXME: Is this sometimes results in null
 
-                    ZMDataModel.zmLog("zmAutologin Error " + JSON.stringify(error) + " and status " + status);
+                    NVRDataModel.log("zmAutologin Error " + JSON.stringify(error) + " and status " + status);
                     // bad urls etc come here
                     $rootScope.loggedIntoZm = -1;
                     $rootScope.$emit('auth-error', error);
@@ -877,7 +877,7 @@ angular.module('zmApp', [
     }
 
     function start() {
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
         // lets keep this timer irrespective of auth or no auth
         $rootScope.loggedIntoZm = 0;
         $interval.cancel(zmAutoLoginHandle);
@@ -892,11 +892,11 @@ angular.module('zmApp', [
     }
 
     function stop() {
-        var ld = ZMDataModel.getLogin();
+        var ld = NVRDataModel.getLogin();
 
         $interval.cancel(zmAutoLoginHandle);
         $rootScope.loggedIntoZm = 0;
-        ZMDataModel.zmLog("Cancelling zmAutologin timer");
+        NVRDataModel.log("Cancelling zmAutologin timer");
 
     }
 
@@ -913,7 +913,7 @@ angular.module('zmApp', [
 //====================================================================
 
 
-.run(function ($ionicPlatform, $ionicPopup, $rootScope, zm, $state, $stateParams, ZMDataModel, $cordovaSplashscreen, $http, $interval, zmAutoLogin, zmCheckUpdates, $fileLogger, $timeout, $ionicHistory, $window, $ionicSideMenuDelegate, EventServer, $ionicContentBanner, $ionicLoading, $ionicNativeTransitions, $translate, $localstorage) {
+.run(function ($ionicPlatform, $ionicPopup, $rootScope, zm, $state, $stateParams, NVRDataModel, $cordovaSplashscreen, $http, $interval, zmAutoLogin, zmCheckUpdates, $fileLogger, $timeout, $ionicHistory, $window, $ionicSideMenuDelegate, EventServer, $ionicContentBanner, $ionicLoading, $ionicNativeTransitions, $translate, $localstorage) {
 
 
 
@@ -947,7 +947,7 @@ angular.module('zmApp', [
 
         // only for android
         $rootScope.exitApp = function () {
-            ZMDataModel.zmLog("user exited app");
+            NVRDataModel.log("user exited app");
 
             ionic.Platform.exitApp();
         };
@@ -955,7 +955,7 @@ angular.module('zmApp', [
 
         // This is a global exception interceptor
         $rootScope.exceptionMessage = function (error) {
-            ZMDataModel.zmDebug("**EXCEPTION**" + error.reason + " caused by " + error.cause);
+            NVRDataModel.debug("**EXCEPTION**" + error.reason + " caused by " + error.cause);
         };
 
         // register callbacks for online/offline
@@ -964,13 +964,13 @@ angular.module('zmApp', [
         $window.addEventListener("offline", function () {
             $rootScope.$apply(function () {
                 $rootScope.online = false;
-                ZMDataModel.zmLog("Your network went offline");
+                NVRDataModel.log("Your network went offline");
             });
         }, false);
         $window.addEventListener("online", function () {
             $rootScope.$apply(function () {
                 $rootScope.online = true;
-                ZMDataModel.zmLog("Your network is online, re-authenticating");
+                NVRDataModel.log("Your network is online, re-authenticating");
                 zmAutoLogin.doLogin($translate.instant('kReAuthenticating'));
 
             });
@@ -1013,7 +1013,7 @@ angular.module('zmApp', [
         // switch to another server
         $rootScope.cancelAuth = function () {
             $ionicLoading.hide();
-            ZMDataModel.zmLog("User cancelled login");
+            NVRDataModel.log("User cancelled login");
             $ionicHistory.nextViewOptions({
                 disableAnimate: true,
                 disableBack: true
@@ -1035,12 +1035,12 @@ angular.module('zmApp', [
         $rootScope.$on('$stateChangeStart', function (event, toState, toParams) {
             var requireLogin = toState.data.requireLogin;
 
-            if (ZMDataModel.isLoggedIn() || toState.data.requireLogin == false) {
+            if (NVRDataModel.isLoggedIn() || toState.data.requireLogin == false) {
                 //console.log("State transition is authorized");
 
                 return;
             } else {
-                ZMDataModel.zmLog("In Auth State trans: Not logged in, requested to go to " + JSON.stringify(toState));
+                NVRDataModel.log("In Auth State trans: Not logged in, requested to go to " + JSON.stringify(toState));
                 // event.preventDefault();
                 // 
 
@@ -1080,14 +1080,14 @@ angular.module('zmApp', [
             $rootScope.db = null;
 
             $rootScope.platformOS = "desktop";
-            ZMDataModel.zmLog("Device is ready");
-            // var ld = ZMDataModel.getLogin();
+            NVRDataModel.log("Device is ready");
+            // var ld = NVRDataModel.getLogin();
             if ($ionicPlatform.is('ios'))
                 $rootScope.platformOS = "ios";
             if ($ionicPlatform.is('android'))
                 $rootScope.platformOS = "android";
 
-            ZMDataModel.zmLog("You are running on " + $rootScope.platformOS);
+            NVRDataModel.log("You are running on " + $rootScope.platformOS);
 
 
             localforage.config({
@@ -1123,7 +1123,7 @@ angular.module('zmApp', [
                 );
             }).then(function () {
                 // this should alert "cordovaSQLiteDriver" when in an emulator or a device
-                ZMDataModel.zmLog("localforage driver for storage:" + localforage.driver());
+                NVRDataModel.log("localforage driver for storage:" + localforage.driver());
 
                 // Now lets import old data if it exists:
                 var defaultServerName = $localstorage.get("defaultServerName");
@@ -1134,14 +1134,14 @@ angular.module('zmApp', [
                         // if neither, we are in first use, mates!
                         if (!val && !defaultServerName) {
                             continueInitialInit();
-                            /*  ZMDataModel.zmDebug ("Neither localstorage or forage  - First use, showing warm and fuzzy...");
+                            /*  NVRDataModel.debug ("Neither localstorage or forage  - First use, showing warm and fuzzy...");
                     $ionicHistory.nextViewOptions({
                         disableAnimate: true,
                         disableBack: true
                     });
                     $state.go('first-use');*/
                         } else if (!val && defaultServerName) {
-                            ZMDataModel.zmLog(">>>>Importing data from localstorage....");
+                            NVRDataModel.log(">>>>Importing data from localstorage....");
 
 
 
@@ -1152,56 +1152,56 @@ angular.module('zmApp', [
                             var lbpc = $localstorage.get('latestBlogPostChecked');
                             var sgl = $localstorage.getObject('serverGroupList');
 
-                            ZMDataModel.zmLog(">>>Localstorage data found as below:");
-                            ZMDataModel.zmLog("server name:" + dsn);
-                            ZMDataModel.zmLog("default lang :" + dl);
-                            ZMDataModel.zmLog("is first use:" + ifu);
-                            ZMDataModel.zmLog("last update check:" + luc);
-                            ZMDataModel.zmLog("latest blog post check:" + lbpc);
-                            ZMDataModel.zmLog("server group list:" + JSON.stringify(sgl));
+                            NVRDataModel.log(">>>Localstorage data found as below:");
+                            NVRDataModel.log("server name:" + dsn);
+                            NVRDataModel.log("default lang :" + dl);
+                            NVRDataModel.log("is first use:" + ifu);
+                            NVRDataModel.log("last update check:" + luc);
+                            NVRDataModel.log("latest blog post check:" + lbpc);
+                            NVRDataModel.log("server group list:" + JSON.stringify(sgl));
 
                             localforage.setItem('defaultLang', dl)
                                 .then(function () {
 
-                                    ZMDataModel.zmLog(">>>>migrated defaultLang...");
-                                    ZMDataModel.setFirstUse(ifu);
+                                    NVRDataModel.log(">>>>migrated defaultLang...");
+                                    NVRDataModel.setFirstUse(ifu);
                                     return localforage.setItem('isFirstUse', ifu);
                                 })
                                 .then(function () {
-                                    ZMDataModel.zmLog(">>>>migrated isFirstUse...");
+                                    NVRDataModel.log(">>>>migrated isFirstUse...");
                                     return localforage.setItem('lastUpdateCheck', ifu);
                                 })
                                 .then(function () {
-                                    ZMDataModel.zmLog(">>>>migrated lastUpdateCheck...");
+                                    NVRDataModel.log(">>>>migrated lastUpdateCheck...");
                                     return localforage.setItem('latestBlogPostChecked', lbpc);
                                 })
                                 .then(function () {
-                                    ZMDataModel.zmLog(">>>>migrated latestBlogPostChecked...");
+                                    NVRDataModel.log(">>>>migrated latestBlogPostChecked...");
                                     // lets encrypt serverGroupList
-                                    ZMDataModel.zmLog("server group list is " + JSON.stringify(sgl));
+                                    NVRDataModel.log("server group list is " + JSON.stringify(sgl));
                                     var ct = CryptoJS.AES.encrypt(JSON.stringify(sgl), zm.cipherKey);
-                                    ZMDataModel.zmLog("encrypted server group list is " + ct);
+                                    NVRDataModel.log("encrypted server group list is " + ct);
                                     ct = sgl;
                                     return localforage.setItem('serverGroupList', ct);
                                 })
                                 .then(function () {
-                                    ZMDataModel.zmLog(">>>>migrated serverGroupList...");
+                                    NVRDataModel.log(">>>>migrated serverGroupList...");
                                     return localforage.setItem('defaultServerName', dsn);
                                 })
                                 .then(function () {
-                                    ZMDataModel.zmLog(">>>>migrated defaultServerName...");
-                                    ZMDataModel.zmLog(">>>>Migrated all values, continuing...");
-                                    //ZMDataModel.migrationComplete();
+                                    NVRDataModel.log(">>>>migrated defaultServerName...");
+                                    NVRDataModel.log(">>>>Migrated all values, continuing...");
+                                    //NVRDataModel.migrationComplete();
                                     continueInitialInit();
                                 })
                                 .catch(function (err) {
-                                    ZMDataModel.zmLog("Migration error : " + JSON.stringify(err));
+                                    NVRDataModel.log("Migration error : " + JSON.stringify(err));
                                     continueInitialInit();
                                 });
 
                         } else {
-                            ZMDataModel.zmLog(">>>>No data to import....");
-                            //ZMDataModel.migrationComplete();
+                            NVRDataModel.log(">>>>No data to import....");
+                            //NVRDataModel.migrationComplete();
                             continueInitialInit();
                         }
 
@@ -1235,13 +1235,13 @@ angular.module('zmApp', [
                 if (window.cordova) {
                     $cordovaSplashscreen.hide();
 
-                    ZMDataModel.zmLog("Enabling insecure SSL");
+                    NVRDataModel.log("Enabling insecure SSL");
                     cordova.plugins.certificates.trustUnsecureCerts(true);
 
                     cordova.getAppVersion.getVersionNumber().then(function (version) {
                         appVersion = version;
-                        ZMDataModel.zmLog("App Version: " + appVersion);
-                        ZMDataModel.setAppVersion(appVersion);
+                        NVRDataModel.log("App Version: " + appVersion);
+                        NVRDataModel.setAppVersion(appVersion);
                     });
                 }
 
@@ -1249,28 +1249,28 @@ angular.module('zmApp', [
                     if (parseInt(resp.size) > zm.logFileMaxSize) {
 
                         $fileLogger.deleteLogfile().then(function () {
-                            ZMDataModel.zmLog("Deleting old log file as it exceeds " + zm.logFileMaxSize + " bytes");
+                            NVRDataModel.log("Deleting old log file as it exceeds " + zm.logFileMaxSize + " bytes");
 
                         });
                     }
                 });
 
                 $fileLogger.setStorageFilename(zm.logFile);
-                $fileLogger.setTimestampFormat('MMM d, y ' + ZMDataModel.getTimeFormat());
+                $fileLogger.setTimestampFormat('MMM d, y ' + NVRDataModel.getTimeFormat());
 
 
 
-                if (ZMDataModel.getLogin().disableNative) {
-                    ZMDataModel.zmLog("Disabling native transitions...");
+                if (NVRDataModel.getLogin().disableNative) {
+                    NVRDataModel.log("Disabling native transitions...");
                     $ionicNativeTransitions.enable(false);
                 } else {
-                    ZMDataModel.zmLog("Enabling native transitions...");
+                    NVRDataModel.log("Enabling native transitions...");
                     $ionicNativeTransitions.enable(true);
                 }
                 // At this stage, DataModel.init is not called yet
                 // but I do need to know the language
 
-                ZMDataModel.zmLog("Retrieving language before init is called...");
+                NVRDataModel.log("Retrieving language before init is called...");
                 localforage.getItem("defaultLang")
                     .then(function (val) {
 
@@ -1279,18 +1279,18 @@ angular.module('zmApp', [
 
 
                         if (lang == undefined || lang == null) {
-                            ZMDataModel.zmLog("No language set, switching to en");
+                            NVRDataModel.log("No language set, switching to en");
                             lang = "en";
 
 
                         } else {
-                            ZMDataModel.zmLog("Language stored as:" + lang);
+                            NVRDataModel.log("Language stored as:" + lang);
 
                         }
 
-                        ZMDataModel.setDefaultLanguage(lang, false)
+                        NVRDataModel.setDefaultLanguage(lang, false)
                             .then(function (success) {
-                                ZMDataModel.zmLog(">>>>Language to be used:" + $translate.proposedLanguage());
+                                NVRDataModel.log(">>>>Language to be used:" + $translate.proposedLanguage());
                                 moment.locale($translate.proposedLanguage());
 
                                 // Remember this is before data Init
@@ -1299,7 +1299,7 @@ angular.module('zmApp', [
                                     .then(function (val) {
                                         //console.log ("isFirstUse is " + val);
                                         if (val == null || val == true) {
-                                            ZMDataModel.zmLog("First time detected");
+                                            NVRDataModel.log("First time detected");
                                             $state.go("first-use");
                                         } else {
                                             continueRestOfInit();
@@ -1318,11 +1318,11 @@ angular.module('zmApp', [
 
 
             function continueRestOfInit() {
-                ZMDataModel.zmLog("Language file loaded, continuing with rest");
-                ZMDataModel.init();
+                NVRDataModel.log("Language file loaded, continuing with rest");
+                NVRDataModel.init();
                 EventServer.init();
                 zmCheckUpdates.start();
-                ZMDataModel.zmLog("Setting up POST LOGIN timer");
+                NVRDataModel.log("Setting up POST LOGIN timer");
                 zmAutoLogin.start();
                 setupPauseAndResume();
 
@@ -1333,20 +1333,20 @@ angular.module('zmApp', [
 
 
             function setupPauseAndResume() {
-                ZMDataModel.zmLog("Setting up pause and resume handler AFTER language is loaded...");
+                NVRDataModel.log("Setting up pause and resume handler AFTER language is loaded...");
                 //---------------------------------------------------------------------------
                 // resume handler
                 //----------------------------------------------------------------------------
                 document.addEventListener("resume", function () {
-                    ZMDataModel.zmLog("App is resuming from background");
-                    var forceDelay = ZMDataModel.getLogin().resumeDelay;
-                    ZMDataModel.zmLog(">>> Resume delayed for " + forceDelay + " ms, to wait for network stack...");
+                    NVRDataModel.log("App is resuming from background");
+                    var forceDelay = NVRDataModel.getLogin().resumeDelay;
+                    NVRDataModel.log(">>> Resume delayed for " + forceDelay + " ms, to wait for network stack...");
 
                     $timeout(function () {
-                        var ld = ZMDataModel.getLogin();
+                        var ld = NVRDataModel.getLogin();
 
 
-                        ZMDataModel.setBackground(false);
+                        NVRDataModel.setBackground(false);
                         // don't animate
                         $ionicHistory.nextViewOptions({
                             disableAnimate: true,
@@ -1359,21 +1359,21 @@ angular.module('zmApp', [
                             $rootScope.lastState = $ionicHistory.currentView().stateName;
                             $rootScope.lastStateParam =
                                 $ionicHistory.currentView().stateParams;
-                            ZMDataModel.zmDebug("Last State recorded:" +
+                            NVRDataModel.debug("Last State recorded:" +
                                 JSON.stringify($ionicHistory.currentView()));
 
                             if ($rootScope.lastState == "zm-portal-login") {
-                                ZMDataModel.zmDebug("Last state was portal-login, so forcing montage");
+                                NVRDataModel.debug("Last state was portal-login, so forcing montage");
                                 $rootScope.lastState = "montage";
                             }
 
-                            ZMDataModel.zmDebug("going to portal login");
+                            NVRDataModel.debug("going to portal login");
                             $ionicHistory.nextViewOptions({ disableAnimate: true});
                             $state.go("zm-portal-login");
                         } else {
                             $rootScope.lastState = "";
                             $rootScope.lastStateParam = "";
-                            ZMDataModel.zmDebug("reset lastState to null");
+                            NVRDataModel.debug("reset lastState to null");
                             $ionicHistory.nextViewOptions({ disableAnimate: true});
                             $state.go("zm-portal-login");
                         }
@@ -1386,23 +1386,23 @@ angular.module('zmApp', [
                 // background handler
                 //----------------------------------------------------------------------------
                 document.addEventListener("pause", function () {
-                    ZMDataModel.setBackground(true);
-                    ZMDataModel.setJustResumed(true); // used for window stop
+                    NVRDataModel.setBackground(true);
+                    NVRDataModel.setJustResumed(true); // used for window stop
 
-                    ZMDataModel.zmLog("ROOT APP:App is going into background");
+                    NVRDataModel.log("ROOT APP:App is going into background");
 
                     $interval.cancel($rootScope.eventQueryInterval);
                     $interval.cancel($rootScope.intervalHandle);
 
 
-                    ZMDataModel.zmLog("ROOT APP: Stopping network pull...");
+                    NVRDataModel.log("ROOT APP: Stopping network pull...");
                     window.stop(); // dont call stopNetwork - we need to stop here 
 
 
-                    var ld = ZMDataModel.getLogin();
+                    var ld = NVRDataModel.getLogin();
 
                     if (ld.exitOnSleep && $rootScope.platformOS == "android") {
-                        ZMDataModel.zmLog("user exited app");
+                        NVRDataModel.log("user exited app");
                         ionic.Platform.exitApp();
                     }
 
@@ -1550,9 +1550,9 @@ angular.module('zmApp', [
             requireLogin: true
         },
         resolve: {
-            message: function (ZMDataModel) {
+            message: function (NVRDataModel) {
                 // console.log("Inside app.montage resolve");
-                return ZMDataModel.getMonitors(0);
+                return NVRDataModel.getMonitors(0);
             }
         },
         url: "/monitors",
@@ -1567,9 +1567,9 @@ angular.module('zmApp', [
             requireLogin: true
         },
         resolve: {
-            message: function (ZMDataModel) {
+            message: function (NVRDataModel) {
                 //console.log("Inside app.events resolve");
-                return ZMDataModel.getMonitors(0);
+                return NVRDataModel.getMonitors(0);
             }
         },
         url: "/events/:id",
@@ -1650,9 +1650,9 @@ angular.module('zmApp', [
             requireLogin: true
         },
         resolve: {
-            message: function (ZMDataModel) {
+            message: function (NVRDataModel) {
                 //console.log("Inside app.events resolve");
-                return ZMDataModel.getMonitors(0);
+                return NVRDataModel.getMonitors(0);
             }
         },
         url: "/timeline",
@@ -1666,8 +1666,8 @@ angular.module('zmApp', [
             requireLogin: true
         },
         resolve: {
-            message: function (ZMDataModel) {
-                return ZMDataModel.getMonitors(0);
+            message: function (NVRDataModel) {
+                return NVRDataModel.getMonitors(0);
             }
         },
         url: "/eventserversettings",
@@ -1722,9 +1722,9 @@ angular.module('zmApp', [
             requireLogin: true
         },
         resolve: {
-            message: function (ZMDataModel) {
+            message: function (NVRDataModel) {
                 //console.log("Inside app.events resolve");
-                return ZMDataModel.getMonitors(0);
+                return NVRDataModel.getMonitors(0);
             }
 
         },
@@ -1744,9 +1744,9 @@ angular.module('zmApp', [
             requireLogin: true
         },
         resolve: {
-            message: function (ZMDataModel) {
+            message: function (NVRDataModel) {
                 //console.log("Inside app.events resolve");
-                return ZMDataModel.getMonitors(0);
+                return NVRDataModel.getMonitors(0);
             }
 
         },