diff --git a/opensync-ext-static/src/main/resources/config_2_ssids.json b/opensync-ext-static/src/main/resources/config_2_ssids.json
index 6486caf..91b4ffb 100644
--- a/opensync-ext-static/src/main/resources/config_2_ssids.json
+++ b/opensync-ext-static/src/main/resources/config_2_ssids.json
@@ -1,14 +1,14 @@
 {
-  "_type" : "OpensyncAPConfig",
+  "model_type" : "OpensyncAPConfig",
   "radioConfig" : {
-    "_type" : "OpensyncAPRadioConfig",
+    "model_type" : "OpensyncAPRadioConfig",
     "country" : "CA",
     "radioChannel24G" : 1,
     "radioChannel5LG" : 44,
     "radioChannel5HG" : 108
   },
   "ssidConfigs" : [ {
-    "_type" : "OpensyncAPSsidConfig",
+    "model_type" : "OpensyncAPSsidConfig",
     "radioType" : "is2dot4GHz",
     "ssid" : "Connectus-local",
     "encryption" : "WPA-PSK",
@@ -16,7 +16,7 @@
     "mode" : "2",
     "broadcast" : true
   }, {
-    "_type" : "OpensyncAPSsidConfig",
+    "model_type" : "OpensyncAPSsidConfig",
     "radioType" : "is5GHz",
     "ssid" : "Connectus-local-5",
     "encryption" : "WPA-PSK",
diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
index 5b1cea8..f938bb8 100644
--- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
+++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
@@ -98,7 +98,7 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
                     MQTT mqtt = new MQTT();
                     //mqtt.setHost("tcp://192.168.0.137:61616");
                     mqtt.setHost("tls://"+mqttBrokerAddress+":"+mqttBrokerListenPort);
-                    LOG.info("Connecting to Artemis using MQTT at {}", mqtt.getHost());
+                    LOG.info("Connecting to MQTT broker at {}", mqtt.getHost());
                     mqtt.setClientId("opensync_mqtt");
                     mqtt.setUserName(username);
                     mqtt.setPassword(password);
@@ -109,7 +109,7 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
                     //TODO: revisit this blocking connection, change it to futureConnection
                     connection = mqtt.blockingConnection();
                     connection.connect();
-                    LOG.info("Connected to Artemis cluster at {}", mqtt.getHost());
+                    LOG.info("Connected to MQTT broker at {}", mqtt.getHost());
             
                     // Subscribe to topics:
                     //