diff --git a/nlsr.conf b/nlsr.conf
index d6f31bc..13d7b5b 100644
--- a/nlsr.conf
+++ b/nlsr.conf
@@ -6,7 +6,7 @@
 
     network /ndn/         ; name of the network the router belongs to in ndn URI format
     site /edu/memphis    ; name of the site the router belongs to in ndn URI format
-    router /%C1.O.R./cs/pollux    ; name of the router in ndn URI format
+    router /%C1.Router/cs/pollux    ; name of the router in ndn URI format
 
 ; lsa-refresh-time is the time in seconds, after which router will refresh its LSAs
 
@@ -39,19 +39,19 @@
 
    neighbor
    {
-       name /ndn/edu/memphis/%C1.O.R./cs/castor        ; name prefix of the neighbor router consists
+       name /ndn/edu/memphis/%C1.Router/cs/castor        ; name prefix of the neighbor router consists
                                               ; of network, site-name and router-name
 
-       face-uri  udp://castor.cs.memphis.edu  ; face id of the face connected to the neighbor
+       face-uri  udp://castor.cs.memphis.edu  ; face uri of the face connected to the neighbor
        link-cost 25                         ; cost of the connecting link to neighbor
    }
 
    neighbor
    {
-       name /ndn/edu/memphis/%C1.O.R./cs/mira          ; name prefix of the neighbor router consists
+       name /ndn/edu/memphis/%C1.Router/cs/mira          ; name prefix of the neighbor router consists
                                               ; of network, site-name and router-name
 
-       face-uri  udp://mira.cs.memphis.edu    ; face id of the face connected to the neighbor
+       face-uri  udp://mira.cs.memphis.edu    ; face uri of the face connected to the neighbor
        link-cost 30                        ; cost of the connecting link to neighbor
    }
 }
@@ -165,7 +165,7 @@
       filter
       {
         type name
-        regex ^[^<KEY><%C1.O.R.>]*<%C1.O.R.>[^<KEY><NLSR>]*<KEY><ksk-.*><ID-CERT><>$
+        regex ^[^<KEY><%C1.Router>]*<%C1.Router>[^<KEY><NLSR>]*<KEY><ksk-.*><ID-CERT><>$
       }
       checker
       {
@@ -176,10 +176,10 @@
           type name
           hyper-relation
           {
-	    k-regex ^([^<KEY><%C1.O.N.>]*)<%C1.O.N.>[^<KEY>]*<KEY><ksk-.*><ID-CERT>$
+	    k-regex ^([^<KEY><%C1.Operator>]*)<%C1.Operator>[^<KEY>]*<KEY><ksk-.*><ID-CERT>$
             k-expand \\1
             h-relation equal
-            p-regex ^([^<KEY><%C1.O.R.>]*)<%C1.O.R.>[^<KEY>]*<KEY><ksk-.*><ID-CERT><>$
+            p-regex ^([^<KEY><%C1.Router>]*)<%C1.Router>[^<KEY>]*<KEY><ksk-.*><ID-CERT><>$
             p-expand \\1
           }
         }