diff --git a/src/sonic-yang-models/yang-models/sonic-sflow.yang b/src/sonic-yang-models/yang-models/sonic-sflow.yang
index 9c494d695d7c..f2ca931e454b 100644
--- a/src/sonic-yang-models/yang-models/sonic-sflow.yang
+++ b/src/sonic-yang-models/yang-models/sonic-sflow.yang
@@ -12,14 +12,17 @@ module sonic-sflow{
         prefix stypes;
     }
     import sonic-port {
-        prefix prt;
+        prefix port;
     }
     import sonic-vlan {
-        prefix svlan;
+        prefix vlan;
+    }
+    import sonic-portchannel {
+        prefix lag;
     }
     /*
     import sonic-mgmt-port {
-        prefix smt;
+        prefix mgmt-port;
     }
     */
 
@@ -62,7 +65,7 @@ module sonic-sflow{
 
                 leaf port {
                     type leafref {
-                        path "/prt:sonic-port/prt:PORT/prt:PORT_LIST/prt:name";
+                        path "/port:sonic-port/port:PORT/port:PORT_LIST/port:name";
                     }
                 }
 
@@ -104,14 +107,17 @@ module sonic-sflow{
                 leaf agent_id {
                     type union {
                         type leafref {
-                            path "/prt:sonic-port/prt:PORT/prt:PORT_LIST/prt:name";
+                            path "/port:sonic-port/port:PORT/port:PORT_LIST/port:name";
+                        }
+                        type leafref {
+                            path "/lag:sonic-portchannel/lag:PORTCHANNEL/lag:PORTCHANNEL_LIST/lag:name";
                         }
                         /*
                         type leafref {
-                            path "/smt:sonic-mgmt-port/smt:MGMT_PORT/smt:MGMT_PORT_LIST/smt:name";
+                            path "/mgmt-port:sonic-mgmt-port/mgmt-port:MGMT_PORT/mgmt-port:MGMT_PORT_LIST/mgmt-port:name";
                         }*/
                         type leafref {
-                            path "/svlan:sonic-vlan/svlan:VLAN/svlan:VLAN_LIST/svlan:name";
+                            path "/vlan:sonic-vlan/vlan:VLAN/vlan:VLAN_LIST/vlan:name";
                         }
                     }
                     description "Interface name";
diff --git a/src/sonic-yang-models/yang-models/sonic-system-tacacs.yang b/src/sonic-yang-models/yang-models/sonic-system-tacacs.yang
index 7f8b056a4630..d4338d94cd6d 100644
--- a/src/sonic-yang-models/yang-models/sonic-system-tacacs.yang
+++ b/src/sonic-yang-models/yang-models/sonic-system-tacacs.yang
@@ -8,27 +8,27 @@ module sonic-system-tacacs {
     }
 
     import sonic-port {
-        prefix prt;
+        prefix port;
     }
 
     import sonic-portchannel {
-        prefix spc;
+        prefix lag;
     }
 
     import sonic-vlan {
-        prefix svlan;
+        prefix vlan;
     }
 
     import sonic-loopback-interface {
-        prefix lo;
+        prefix loopback;
     }
 
     import sonic-interface {
-        prefix sintf;
+        prefix interface;
     }
 
 //    import sonic-mgmt-port {
-//        prefix smt;
+//        prefix mgmt-port;
 //    }
 
     revision 2021-04-15 {
@@ -142,19 +142,19 @@ module sonic-system-tacacs {
                 leaf src_intf {
                     type union {
                         type leafref {
-                            path "/prt:sonic-port/prt:PORT/prt:PORT_LIST/prt:name";
+                            path "/port:sonic-port/port:PORT/port:PORT_LIST/port:name";
                         }
                         type leafref {
-                            path "/spc:sonic-portchannel/spc:PORTCHANNEL/spc:PORTCHANNEL_LIST/spc:name";
+                            path "/lag:sonic-portchannel/lag:PORTCHANNEL/lag:PORTCHANNEL_LIST/lag:name";
                         }
                         type leafref {
-                            path "/svlan:sonic-vlan/svlan:VLAN/svlan:VLAN_LIST/svlan:name";
+                            path "/vlan:sonic-vlan/vlan:VLAN/vlan:VLAN_LIST/vlan:name";
                         }
                         type leafref {
-                            path "/lo:sonic-loopback-interface/lo:LOOPBACK_INTERFACE/lo:LOOPBACK_INTERFACE_LIST/lo:name";
+                            path "/loopback:sonic-loopback-interface/loopback:LOOPBACK_INTERFACE/loopback:LOOPBACK_INTERFACE_LIST/loopback:name";
                         }
                         //type leafref {
-                        // path "/smt:sonic-mgmt-port/smt:MGMT_PORT/smt:MGMT_PORT_LIST/smt:name";
+                        // path "/mgmt-port:sonic-mgmt-port/mgmt-port:MGMT_PORT/mgmt-port:MGMT_PORT_LIST/mgmt-port:name";
                         //}
                     }
                     description "Source IP to use from source interface for TACACS+ server communication.";