diff --git a/nlsr.conf b/nlsr.conf
index b3dbd2f..6632d4b 100644
--- a/nlsr.conf
+++ b/nlsr.conf
@@ -5,8 +5,8 @@
 ; mandatory configuration command section network, site and router
 
     network /ndn/         ; name of the network the router belongs to in ndn URI format
-    site /memphis.edu/    ; name of the site the router belongs to in ndn URI format
-    router /cs/pollux/    ; 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
 
 ; lsa-refresh-time is the time in seconds, after which router will refresh its LSAs
 
@@ -39,7 +39,7 @@
 
    neighbor
    {
-       name /ndn/memphis.edu/cs/castor        ; name prefix of the neighbor router consists
+       name /ndn/edu/memphis/%C1.O.R./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
@@ -48,7 +48,7 @@
 
    neighbor
    {
-       name /ndn/memphis.edu/cs/mira          ; name prefix of the neighbor router consists
+       name /ndn/edu/memphis/%C1.O.R./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
@@ -109,7 +109,7 @@
       filter
       {
         type name
-        regex ^[^<nlsr><INFO>]*<nlsr><INFO><><>$
+        regex ^[^<NLSR><INFO>]*<NLSR><INFO><><>$
       }
       checker
       {
@@ -123,7 +123,7 @@
             k-regex ^([^<KEY><NLSR>]*)<NLSR><KEY><ksk-.*><ID-CERT>$
             k-expand \\1\\2
             h-relation equal
-            p-regex ^([^<nlsr><INFO>]*)<nlsr><INFO><><>$
+            p-regex ^([^<NLSR><INFO>]*)<NLSR><INFO><><>$
             p-expand \\1
           }
         }