diff --git a/overlay_interface.c b/overlay_interface.c
index e07a3296..6af7e968 100644
--- a/overlay_interface.c
+++ b/overlay_interface.c
@@ -167,11 +167,8 @@ overlay_interface * overlay_interface_find_name(const char *name){
   for (i=0;i<OVERLAY_MAX_INTERFACES;i++){
     if (overlay_interfaces[i].state!=INTERFACE_STATE_UP)
       continue;
-    if (strcasecmp((*name=='>'?name+1:name), 
-		   (*overlay_interfaces[i].name=='>'?overlay_interfaces[i].name+1:overlay_interfaces[i].name)
-		   )==0){
+    if (strcasecmp(name, overlay_interfaces[i].name) == 0)
       return &overlay_interfaces[i];
-    }
   }
   return NULL;
 }
diff --git a/tests/directory_service b/tests/directory_service
index bec77499..94d72089 100755
--- a/tests/directory_service
+++ b/tests/directory_service
@@ -79,7 +79,7 @@ test_publish() {
 }
 
 start_routing_instance() {
-   executeOk_servald config set interface.folder "$SERVALD_VAR"
+   executeOk_servald config set server.dummy_interface_dir "$SERVALD_VAR"
    executeOk_servald config set monitor.socket "org.servalproject.servald.monitor.socket.$TFWUNIQUE.$instance_name"
    executeOk_servald config set mdp.socket "org.servalproject.servald.mdp.socket.$TFWUNIQUE.$instance_name"
    executeOk_servald config set log.show_pid on
@@ -96,25 +96,26 @@ setup_routing() {
    >$SERVALD_VAR/dummyB
    >$SERVALD_VAR/dummyC
    set_instance +A
-   executeOk_servald config set interfaces "+>dummyB,+>dummyC"
-   executeOk_servald config set mdp.dummyB.tick_ms 0
-   executeOk_servald config set mdp.dummyC.tick_ms 0
+   executeOk_servald config set interfaces.0.dummy dummyB
+   executeOk_servald config set interfaces.0.mdp_tick_ms 0
+   executeOk_servald config set interfaces.1.dummy dummyC
+   executeOk_servald config set interfaces.1.mdp_tick_ms 0
    executeOk_servald config set dna.helper.executable "$servald_build_root/directory_service"
    executeOk_servald config set debug.dnahelper on
    start_routing_instance
    set_instance +B
-   executeOk_servald config set interfaces "+>dummyB"
-   executeOk_servald config set mdp.dummyB.tick_ms 0
+   executeOk_servald config set interfaces.0.dummy dummyB
+   executeOk_servald config set interfaces.0.mdp_tick_ms 0
    executeOk_servald config set directory.service $SIDA
-   executeOk_servald config set $SIDA.interface "dummyB"
-   executeOk_servald config set $SIDA.address 127.0.0.1
+   execute $servald config set hosts.$SIDA.address 127.0.0.1
+   executeOk_servald config set hosts.$SIDA.interface "dummyB"
    start_routing_instance
    set_instance +C
-   executeOk_servald config set interfaces "+>dummyC"
-   executeOk_servald config set mdp.dummyC.tick_ms 0
+   executeOk_servald config set interfaces.1.dummy dummyC
+   executeOk_servald config set interfaces.1.mdp_tick_ms 0
    executeOk_servald config set directory.service $SIDA
-   executeOk_servald config set $SIDA.interface "dummyC"
-   executeOk_servald config set $SIDA.address 127.0.0.1
+   execute $servald config set hosts.$SIDA.address 127.0.0.1
+   executeOk_servald config set hosts.$SIDA.interface "dummyC"
    start_routing_instance
 }