diff --git a/yang/frr-pim.yang b/yang/frr-pim.yang
index e37ed18e9a1e..594891144b84 100644
--- a/yang/frr-pim.yang
+++ b/yang/frr-pim.yang
@@ -104,12 +104,12 @@ module frr-pim {
       enum "mrib-only" {
         value 1;
         description
-          "Lookup in unicast RIB only.";
+          "Lookup in multicast RIB only.";
       }
       enum "urib-only" {
         value 2;
         description
-          "Lookup in multicast RIB only.";
+          "Lookup in unicast RIB only.";
       }
       enum "mrib-then-urib" {
         value 3;
@@ -349,14 +349,14 @@ module frr-pim {
 
       leaf log-neighbor-events {
         type boolean;
-        default false;
+        default "false";
         description
           "Log all MSDP neighbor related events.";
       }
 
       leaf log-sa-events {
         type boolean;
-        default false;
+        default "false";
         description
           "Log all MSDP SA related events.";
       }
@@ -371,7 +371,7 @@ module frr-pim {
 
       leaf shutdown {
         type boolean;
-        default false;
+        default "false";
         description
           "Shutdown MSDP functionality.";
       }