diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/Microsoft.PowerShell.Utility.model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/Microsoft.PowerShell.model.yml
similarity index 100%
rename from powershell/ql/lib/semmle/code/powershell/frameworks/Microsoft.PowerShell.Utility.model.yml
rename to powershell/ql/lib/semmle/code/powershell/frameworks/Microsoft.PowerShell.model.yml
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/Microsoft.Win32.RegistryKey.model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/Microsoft.Win32.RegistryKey.model.yml
deleted file mode 100644
index 40b0c3bcd45..00000000000
--- a/powershell/ql/lib/semmle/code/powershell/frameworks/Microsoft.Win32.RegistryKey.model.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-extensions:
-  - addsTo:
-      pack: microsoft/powershell-all
-      extensible: sourceModel
-    data:
-      - ["microsoft.win32.registrykey	", "Method[GetValue].ReturnValue", "windows-registry"]
-      - ["microsoft.win32.registrykey	", "Method[GetValueNames].ReturnValue", "windows-registry"]
-      - ["microsoft.win32.registrykey	", "Method[GetSubKeyNames].ReturnValue", "windows-registry"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/System.Management.Automation.Language.model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/System.Management.Automation.Language.model.yml
deleted file mode 100644
index cfc575ae7aa..00000000000
--- a/powershell/ql/lib/semmle/code/powershell/frameworks/System.Management.Automation.Language.model.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-extensions:
-  - addsTo:
-      pack: microsoft/powershell-all
-      extensible: summaryModel
-    data:
-    - ["system.management.automation.language.codegeneration!", "Method[escapesinglequotedstringcontent]", "Argument[0]", "ReturnValue", "taint"]
\ No newline at end of file
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/System.Management.Automation.model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/System.Management.model.yml
similarity index 68%
rename from powershell/ql/lib/semmle/code/powershell/frameworks/System.Management.Automation.model.yml
rename to powershell/ql/lib/semmle/code/powershell/frameworks/System.Management.model.yml
index 94c7b76a71d..542faceefe2 100644
--- a/powershell/ql/lib/semmle/code/powershell/frameworks/System.Management.Automation.model.yml
+++ b/powershell/ql/lib/semmle/code/powershell/frameworks/System.Management.model.yml
@@ -1,4 +1,10 @@
 extensions:
+  - addsTo:
+      pack: microsoft/powershell-all
+      extensible: summaryModel
+    data:
+    - ["system.management.automation.language.codegeneration!", "Method[escapesinglequotedstringcontent]", "Argument[0]", "ReturnValue", "taint"]
+
   - addsTo:
       pack: microsoft/powershell-all
       extensible: sinkModel
diff --git a/powershell/ql/lib/semmle/code/powershell/frameworks/System.Net.Sockets.model.yml b/powershell/ql/lib/semmle/code/powershell/frameworks/System.Net.model.yml
similarity index 100%
rename from powershell/ql/lib/semmle/code/powershell/frameworks/System.Net.Sockets.model.yml
rename to powershell/ql/lib/semmle/code/powershell/frameworks/System.Net.model.yml