diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang
index 40fb722754313e7fc3c3867222ad7c63cfb4b750..ba3518603b7b753cabe91907055b181498f72fe7 100755
--- a/yang-models/_3gpp-common-managed-element.yang
+++ b/yang-models/_3gpp-common-managed-element.yang
@@ -14,7 +14,7 @@ module _3gpp-common-managed-element {
   import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
   import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }
   import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }
-  import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; }
+  import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -36,6 +36,7 @@ module _3gpp-common-managed-element {
       3GPP TS 28.620 
       Umbrella Information Model (UIM)";
       
+  revision 2025-04-19 { reference "CR-0541"; } 
   revision 2025-03-25 { reference "CR-0516"; } 
   revision 2024-10-01 { reference "CR-0437,CR-0438" ; } 
   revision 2024-01-30 { reference CR-0328 ; } 
diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang
index 8a012d09aa0f6cada86062adb7e56cb9a3892fc5..eb1de3b00285cd3b63afe387ddaf29aeee4536e8 100755
--- a/yang-models/_3gpp-common-managed-function.yang
+++ b/yang-models/_3gpp-common-managed-function.yang
@@ -8,13 +8,13 @@ module _3gpp-common-managed-function {
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-common-measurements { prefix meas3gpp; }
   import _3gpp-common-trace { prefix trace3gpp; }
-  import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; }
+  import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; }
   
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "The module defines a base class/grouping for major 3GPP 
     functions.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference 
     "3GPP TS 28.622 
@@ -25,6 +25,7 @@ module _3gpp-common-managed-function {
     3GPP TS 28.620 
     Umbrella Information Model (UIM)";
 
+  revision 2025-04-19 { reference "CR-0541"; } 
   revision 2024-11-19 { reference "Add STM"; } 
   revision 2024-02-24 { reference CR-0346; } 
   revision 2023-09-18 { reference CR-0271; } 
diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang
index 82a407e4ee326fc793399188d953637a72e806fe..07802b928dde298969b31150147ea6eb4b5a5bd1 100755
--- a/yang-models/_3gpp-common-subnetwork.yang
+++ b/yang-models/_3gpp-common-subnetwork.yang
@@ -15,7 +15,7 @@ module _3gpp-common-subnetwork {
   import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
   import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }
   import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }
-  import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; }
+  import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -36,6 +36,7 @@ module _3gpp-common-subnetwork {
       3GPP TS 28.620 
       Umbrella Information Model (UIM)";
   
+  revision 2025-04-19 { reference "CR-0541"; } 
   revision 2025-03-25 { reference "CR-0516 CR-0527"; } 
   revision 2024-11-19 { reference "Add STM"; } 
   revision 2024-01-30 { reference CR-1337 ; } 
diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-stm-nrm-stmfunction.yang
similarity index 94%
rename from yang-models/_3gpp-5gc-nrm-stmfunction.yang
rename to yang-models/_3gpp-stm-nrm-stmfunction.yang
index 5ad40a9c23956f0141890fee8bd7e3c7f6ec707b..1875343cb643ca02329febab9223bdfb6b45200a 100644
--- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang
+++ b/yang-models/_3gpp-stm-nrm-stmfunction.yang
@@ -1,7 +1,7 @@
-module _3gpp-5gc-nrm-stmfunction {
+module _3gpp-stm-nrm-stmfunction {
   yang-version 1.1;
   
-  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-stmfunction;
+  namespace urn:3gpp:sa5:_3gpp-stm-nrm-stmfunction;
   prefix stm3gpp;
   
   import _3gpp-common-top { prefix top3gpp; }
@@ -11,11 +11,12 @@ module _3gpp-5gc-nrm-stmfunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the STM function defined in 3GPP TS 28.abc.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.abc
     Signalling traffic monitoring management";
   
+  revision 2025-04-19 { reference "CR-0010"; } 
   revision 2024-11-07 { reference "S5-247077"; } 
   
   grouping StmCtrlGrp {