diff --git a/bacnet-stack/demo/epics/main.c b/bacnet-stack/demo/epics/main.c
index f8e81062..05f7bfcb 100644
--- a/bacnet-stack/demo/epics/main.c
+++ b/bacnet-stack/demo/epics/main.c
@@ -281,9 +281,11 @@ static void Init_Service_Handlers(
 
 #if BAC_ROUTING
     uint32_t Object_Instance;
+    BACNET_CHARACTER_STRING name_string;
     /* Put this client Device into the Routing table (first entry) */
     Object_Instance = Device_Object_Instance_Number();
-    Add_Routed_Device(Object_Instance, Device_Object_Name(),
+    Device_Object_Name(Object_Instance, &name_string);
+    Add_Routed_Device(Object_Instance, &name_string,
         Device_Description());
 #endif
 
diff --git a/bacnet-stack/demo/gateway/main.c b/bacnet-stack/demo/gateway/main.c
index 6244b465..3e5a5bf0 100644
--- a/bacnet-stack/demo/gateway/main.c
+++ b/bacnet-stack/demo/gateway/main.c
@@ -126,6 +126,7 @@ void Devices_Init(
     int i;
     char nameText[MAX_DEV_NAME_LEN];
     char descText[MAX_DEV_DESC_LEN];
+    BACNET_CHARACTER_STRING name_string;
 
     /* Gateway Device has already been initialized.
      * But give it a better Description. */
@@ -141,8 +142,9 @@ void Devices_Init(
         snprintf(nameText, MAX_DEV_NAME_LEN, "%s %d", DEV_NAME_BASE, i + 1);
         snprintf(descText, MAX_DEV_DESC_LEN, "%s %d", DEV_DESCR_REMOTE, i);
 #endif
+        characterstring_init_ansi(&name_string, nameText);
 
-        Add_Routed_Device((first_object_instance + i), nameText, descText);
+        Add_Routed_Device((first_object_instance + i), &name_string, descText);
     }
 
 }
@@ -365,6 +367,8 @@ int main(
 
         /* blink LEDs, Turn on or off outputs, etc */
     }
+    // Dummy return
+    return 0;
 }
 
 /* @} */