diff --git a/source/TemplateMenuItem.mc b/source/TemplateMenuItem.mc
index 4078572..b98d805 100644
--- a/source/TemplateMenuItem.mc
+++ b/source/TemplateMenuItem.mc
@@ -57,34 +57,34 @@ class TemplateMenuItem extends WatchUi.IconMenuItem {
     // error. The ErrorView cancellation will resume the call chain.
     //
     function onReturnGetState(responseCode as Lang.Number, data as Null or Lang.Dictionary) as Void {
-        // System.println("HomeAssistantTemplateMenuItem onReturnGetState() Response Code: " + responseCode);
-        // System.println("HomeAssistantTemplateMenuItem onReturnGetState() Response Data: " + data);
+        // System.println("TemplateMenuItem onReturnGetState() Response Code: " + responseCode);
+        // System.println("TemplateMenuItem onReturnGetState() Response Data: " + data);
 
         var status = WatchUi.loadResource($.Rez.Strings.Unavailable) as Lang.String;
         switch (responseCode) {
             case Communications.BLE_HOST_TIMEOUT:
             case Communications.BLE_CONNECTION_UNAVAILABLE:
-                // System.println("HomeAssistantTemplateMenuItem onReturnGetState() Response Code: BLE_HOST_TIMEOUT or BLE_CONNECTION_UNAVAILABLE, Bluetooth connection severed.");
+                // System.println("TemplateMenuItem onReturnGetState() Response Code: BLE_HOST_TIMEOUT or BLE_CONNECTION_UNAVAILABLE, Bluetooth connection severed.");
                 ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoPhone) as Lang.String + ".");
                 break;
 
             case Communications.BLE_QUEUE_FULL:
-                // System.println("HomeAssistantTemplateMenuItem onReturnGetState() Response Code: BLE_QUEUE_FULL, API calls too rapid.");
+                // System.println("TemplateMenuItem onReturnGetState() Response Code: BLE_QUEUE_FULL, API calls too rapid.");
                 ErrorView.show(WatchUi.loadResource($.Rez.Strings.ApiFlood) as Lang.String);
                 break;
 
             case Communications.NETWORK_REQUEST_TIMED_OUT:
-                // System.println("HomeAssistantTemplateMenuItem onReturnGetState() Response Code: NETWORK_REQUEST_TIMED_OUT, check Internet connection.");
+                // System.println("TemplateMenuItem onReturnGetState() Response Code: NETWORK_REQUEST_TIMED_OUT, check Internet connection.");
                 ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoResponse) as Lang.String);
                 break;
 
             case Communications.INVALID_HTTP_BODY_IN_NETWORK_RESPONSE:
-                // System.println("HomeAssistantTemplateMenuItem onReturnGetState() Response Code: INVALID_HTTP_BODY_IN_NETWORK_RESPONSE, check JSON is returned.");
+                // System.println("TemplateMenuItem onReturnGetState() Response Code: INVALID_HTTP_BODY_IN_NETWORK_RESPONSE, check JSON is returned.");
                 ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoJson) as Lang.String);
                 break;
 
             case Communications.NETWORK_RESPONSE_OUT_OF_MEMORY:
-                // System.println("HomeAssistantTemplateMenuItem onReturnGetState() Response Code: NETWORK_RESPONSE_OUT_OF_MEMORY, are we going too fast?");
+                // System.println("TemplateMenuItem onReturnGetState() Response Code: NETWORK_RESPONSE_OUT_OF_MEMORY, are we going too fast?");
                 var myTimer = new Timer.Timer();
                 // Now this feels very "closely coupled" to the application, but it is the most reliable method instead of using a timer.
                 myTimer.start(getApp().method(:updateNextMenuItem), Globals.scApiBackoff, false);
@@ -93,12 +93,12 @@ class TemplateMenuItem extends WatchUi.IconMenuItem {
                 break;
 
             case 404:
-                // System.println("HomeAssistantTemplateMenuItem onReturnGetState() Response Code: 404, page not found. Check API URL setting.");
+                // System.println("TemplateMenuItem onReturnGetState() Response Code: 404, page not found. Check API URL setting.");
                 ErrorView.show(WatchUi.loadResource($.Rez.Strings.ApiUrlNotFound) as Lang.String);
                 break;
 
             case 400:
-                // System.println("HomeAssistantTemplateMenuItem onReturnGetState() Response Code: 400, bad request. Template error.");
+                // System.println("TemplateMenuItem onReturnGetState() Response Code: 400, bad request. Template error.");
                 ErrorView.show(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String);
                 break;
 
@@ -110,7 +110,7 @@ class TemplateMenuItem extends WatchUi.IconMenuItem {
                 } else if(label instanceof Lang.String) {
                     setSubLabel(label);
                 } else if(label instanceof Lang.Dictionary) {
-                    // System.println("HomeAssistantTemplateMenuItem onReturnGetState() label = " + label);
+                    // System.println("TemplateMenuItem onReturnGetState() label = " + label);
                     if (label.get("error") != null) {
                         setSubLabel($.Rez.Strings.TemplateError);
                     } else {
@@ -127,7 +127,7 @@ class TemplateMenuItem extends WatchUi.IconMenuItem {
                 break;
 
             default:
-                // System.println("HomeAssistantTemplateMenuItem onReturnGetState(): Unhandled HTTP response code = " + responseCode);
+                // System.println("TemplateMenuItem onReturnGetState(): Unhandled HTTP response code = " + responseCode);
                 ErrorView.show(WatchUi.loadResource($.Rez.Strings.UnhandledHttpErr) as Lang.String + responseCode);
         }
         getApp().setApiStatus(status);
@@ -141,17 +141,17 @@ class TemplateMenuItem extends WatchUi.IconMenuItem {
             }
         } else {
             if (! System.getDeviceSettings().phoneConnected) {
-                // System.println("HomeAssistantTemplateMenuItem getState(): No Phone connection, skipping API call.");
+                // System.println("TemplateMenuItem getState(): No Phone connection, skipping API call.");
                 ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoPhone) as Lang.String + ".");
                 getApp().setApiStatus(WatchUi.loadResource($.Rez.Strings.Unavailable) as Lang.String);
             } else if (! System.getDeviceSettings().connectionAvailable) {
-                // System.println("HomeAssistantTemplateMenuItem getState(): No Internet connection, skipping API call.");
+                // System.println("TemplateMenuItem getState(): No Internet connection, skipping API call.");
                 ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoInternet) as Lang.String + ".");
                 getApp().setApiStatus(WatchUi.loadResource($.Rez.Strings.Unavailable) as Lang.String);
             } else {
                 // https://developers.home-assistant.io/docs/api/native-app-integration/sending-data/#render-templates
                 var url = Settings.getApiUrl() + "/webhook/" + Settings.getWebhookId();
-                // System.println("HomeAssistantTemplateMenuItem getState() URL=" + url + ", Template='" + mTemplate + "'");
+                // System.println("TemplateMenuItem getState() URL=" + url + ", Template='" + mTemplate + "'");
                 Communications.makeWebRequest(
                     url,
                     {