diff --git a/ripngd/ripng_ifrmap.c b/ripngd/ripng_ifrmap.c
index 3375965..d358690 100644
--- a/ripngd/ripng_ifrmap.c
+++ b/ripngd/ripng_ifrmap.c
@@ -194,8 +194,8 @@
   return 1;
 }
 
-DEFUN (if_rmap,
-       if_rmap_cmd,
+DEFUN (ripng_if_rmap,
+       ripng_if_rmap_cmd,
        "route-map RMAP_NAME (in|out) IFNAME",
        "Route map set\n"
        "Route map name\n"
@@ -221,8 +221,8 @@
   return CMD_SUCCESS;
 }       
 
-DEFUN (no_if_rmap,
-       no_if_rmap_cmd,
+DEFUN (no_ripng_if_rmap,
+       no_ripng_if_rmap_cmd,
        "no route-map ROUTEMAP_NAME (in|out) IFNAME",
        NO_STR
        "Route map unset\n"
@@ -300,6 +300,6 @@
 {
   ifrmaphash = hash_create (if_rmap_hash_make, if_rmap_hash_cmp);
 
-  install_element (RIPNG_NODE, &if_rmap_cmd);
-  install_element (RIPNG_NODE, &no_if_rmap_cmd);
+  install_element (RIPNG_NODE, &ripng_if_rmap_cmd);
+  install_element (RIPNG_NODE, &no_ripng_if_rmap_cmd);
 }
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index fcf8e3c..d8c34e8 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2178,8 +2178,8 @@
 }
 
 /* Please be carefull to use this command. */
-DEFUN (default_information_originate,
-       default_information_originate_cmd,
+DEFUN (ripng_default_information_originate,
+       ripng_default_information_originate_cmd,
        "default-information originate",
        "Default route information\n"
        "Distribute default route\n")
@@ -2194,8 +2194,8 @@
   return CMD_SUCCESS;
 }
 
-DEFUN (no_default_information_originate,
-       no_default_information_originate_cmd,
+DEFUN (no_ripng_default_information_originate,
+       no_ripng_default_information_originate_cmd,
        "no default-information originate",
        NO_STR
        "Default route information\n"
@@ -2494,8 +2494,8 @@
   install_element (RIPNG_NODE, &no_ripng_garbage_timer_cmd);
 #endif /* 0 */
 
-  install_element (RIPNG_NODE, &default_information_originate_cmd);
-  install_element (RIPNG_NODE, &no_default_information_originate_cmd);
+  install_element (RIPNG_NODE, &ripng_default_information_originate_cmd);
+  install_element (RIPNG_NODE, &no_ripng_default_information_originate_cmd);
 
   ripng_if_init ();
   ripng_debug_init ();