diff --git a/Yang/ietf-l3-isis-topology.yang b/Yang/ietf-l3-isis-topology.yang
index 0180b84..da35b79 100644
--- a/Yang/ietf-l3-isis-topology.yang
+++ b/Yang/ietf-l3-isis-topology.yang
@@ -30,7 +30,7 @@ module ietf-l3-isis-topology {
 
 
   organization
-    "IETF OPSA (Operations and Management Area) Working Group";
+    "IETF NMOP (Network Management Operations) Working Group";
   contact
     "WG Web:  <https://datatracker.ietf.org/wg/opsawg/>
     WG List:  <mailto:opsawg@ietf.org>
diff --git a/draft-ogondio-opsawg-isis-topology.md b/draft-ogondio-nmop-isis-topology.md
similarity index 99%
rename from draft-ogondio-opsawg-isis-topology.md
rename to draft-ogondio-nmop-isis-topology.md
index 4f0d125..5aca8b4 100644
--- a/draft-ogondio-opsawg-isis-topology.md
+++ b/draft-ogondio-nmop-isis-topology.md
@@ -1,12 +1,12 @@
 ---
 title: A YANG Data Model for Intermediate System to intermediate System (IS-IS) Topology
 abbrev: IS-IS Topology YANG
-docname: draft-ogondio-opsawg-isis-topology-latest
+docname: draft-ogondio-nmop-isis-topology-latest
 
 stand_alone: true
 ipr: trust200902
 area: "Operations and Management"
-wg: opsawg
+wg: nmop
 category: std
 submissiontype: IETF  # also: "independent", "IAB", or "IRTF"