diff --git a/generation/emitter/requiredNamespacesForNames.rsp b/generation/emitter/requiredNamespacesForNames.rsp
index 0c801b89..0ef0f0d1 100644
--- a/generation/emitter/requiredNamespacesForNames.rsp
+++ b/generation/emitter/requiredNamespacesForNames.rsp
@@ -647,21 +647,21 @@ IUnknown_Release_Proxy=Windows.Win32.System.Rpc
 SOFTDISTINFO=Windows.Win32.UI.Shell
 # endregion urlmon.h
 # region userenv.h
-CreateAppContainerProfile=Windows.Win32.UI.Shell
-CreateEnvironmentBlock=Windows.Win32.UI.Shell
+CreateAppContainerProfile=Windows.Win32.Security.Isolation
+CreateEnvironmentBlock=Windows.Win32.System.Environment
 CreateProfile=Windows.Win32.UI.Shell
-DeleteAppContainerProfile=Windows.Win32.UI.Shell
+DeleteAppContainerProfile=Windows.Win32.Security.Isolation
 DeleteProfileA=Windows.Win32.UI.Shell
 DeleteProfileW=Windows.Win32.UI.Shell
-DeriveAppContainerSidFromAppContainerName=Windows.Win32.UI.Shell
-DeriveRestrictedAppContainerSidFromAppContainerSidAndRestrictedName=Windows.Win32.UI.Shell
-DestroyEnvironmentBlock=Windows.Win32.UI.Shell
-ExpandEnvironmentStringsForUserA=Windows.Win32.UI.Shell
-ExpandEnvironmentStringsForUserW=Windows.Win32.UI.Shell
+DeriveAppContainerSidFromAppContainerName=Windows.Win32.Security.Isolation
+DeriveRestrictedAppContainerSidFromAppContainerSidAndRestrictedName=Windows.Win32.Security.Isolation
+DestroyEnvironmentBlock=Windows.Win32.System.Environment
+ExpandEnvironmentStringsForUserA=Windows.Win32.System.Environment
+ExpandEnvironmentStringsForUserW=Windows.Win32.System.Environment
 GetAllUsersProfileDirectoryA=Windows.Win32.UI.Shell
 GetAllUsersProfileDirectoryW=Windows.Win32.UI.Shell
-GetAppContainerFolderPath=Windows.Win32.UI.Shell
-GetAppContainerRegistryLocation=Windows.Win32.UI.Shell
+GetAppContainerFolderPath=Windows.Win32.Security.Isolation
+GetAppContainerRegistryLocation=Windows.Win32.Security.Isolation
 GetDefaultUserProfileDirectoryA=Windows.Win32.UI.Shell
 GetDefaultUserProfileDirectoryW=Windows.Win32.UI.Shell
 GetProfilesDirectoryA=Windows.Win32.UI.Shell
diff --git a/scripts/BaselineWinmd/Windows.Win32.winmd b/scripts/BaselineWinmd/Windows.Win32.winmd
index 02367268..4eccc0d6 100644
Binary files a/scripts/BaselineWinmd/Windows.Win32.winmd and b/scripts/BaselineWinmd/Windows.Win32.winmd differ