From 1bc07c48e20f86629d99f9c800c7e1bfe0dbbabf Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Wed, 1 May 2019 10:34:46 -0700
Subject: [PATCH] Update use of `Windows PowerShell` to just `PowerShell`

---
 .../resources/GetEventResources.txt           |   4 +-
 .../resources/WsManResources.txt              |   4 +-
 .../GetEvent.types.ps1xml                     |   4 +-
 .../WSMan.format.ps1xml                       |   4 +-
 .../Windows/PSDiagnostics/PSDiagnostics.psm1  |   2 +-
 .../PowerShell.Core.Instrumentation.man       |  14 +-
 .../engine/remoting/client/remoterunspace.cs  |   2 +-
 .../common/WireDataFormat/RemoteHost.cs       |   4 +-
 .../resources/EventResource.resx              | 446 +++++++++---------
 .../resources/RunspacePoolStrings.resx        |   4 +-
 .../engine/Module/ModulePath.Tests.ps1        |   4 +-
 11 files changed, 246 insertions(+), 246 deletions(-)

diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/resources/GetEventResources.txt b/src/Microsoft.PowerShell.Commands.Diagnostics/resources/GetEventResources.txt
index 6e004d457d8..4605fbe008c 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/resources/GetEventResources.txt
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/resources/GetEventResources.txt
@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft Corporation. All rights reserved.
 
 Vendor=Microsoft
-Description=This Windows PowerShell snap-in contains Windows Eventing and Performance Counter cmdlets.
+Description=This PowerShell snap-in contains Windows Eventing and Performance Counter cmdlets.
 
 NoMatchingEventsFound=No events were found that match the specified selection criteria.
 NoMatchingLogsFound=There is not an event log on the {0} computer that matches "{1}".
@@ -56,4 +56,4 @@ CounterCircularNoMaxSize=The Circular parameter will be ignored unless the MaxSi
 ExportCtrWin7Required=This cmdlet can be run only on Microsoft Windows 7 and above.
 FileOpenFailed=Unable to open the {0} file for writing.
 FileCreateFailed=Unable to create the {0} file. Verify that the path is valid.
-ExportDestPathAmbiguous=The following export destination path is ambiguous: {0}.
\ No newline at end of file
+ExportDestPathAmbiguous=The following export destination path is ambiguous: {0}.
diff --git a/src/Microsoft.WSMan.Management/resources/WsManResources.txt b/src/Microsoft.WSMan.Management/resources/WsManResources.txt
index fd0bd37eb74..61be75be118 100644
--- a/src/Microsoft.WSMan.Management/resources/WsManResources.txt
+++ b/src/Microsoft.WSMan.Management/resources/WsManResources.txt
@@ -3,7 +3,7 @@
 # {0} = Delegate
 
 Vendor=Microsoft
-Description=This Windows PowerShell snap-in contains cmdlets (such as Get-WSManInstance and Set-WSManInstance) that are used by the Windows PowerShell host to manage WSMan operations.
+Description=This PowerShell snap-in contains cmdlets (such as Get-WSManInstance and Set-WSManInstance) that are used by the PowerShell host to manage WSMan operations.
 InvalidComputerName=The WinRM client cannot complete the operation.Check if the computer name is valid.
 InvalidFileName=This command cannot be used because file does not exist.Check the file existence and run your command.
 InvalidPath=This command cannot be used because root path does not exist.Check the root path and run your command.
@@ -65,4 +65,4 @@ SetItemWhatIfAndConfirmText= "Set-Item" on the WinRM configuration setting "{0}"
 SetItemWarnigForPPQ=The updated configuration is effective only if it is less than or equal to the value of global quota {0}. Verify the value for the global quota using the PowerShell cmdlet "Get-Item {0}".
 SetItemWarningForGlobalQuota=The updated configuration might affect the operation of the plugins having a per plugin quota value greater than {0}. Verify the configuration of all the registered plugins and change the per plugin quota values for the affected plugins.
 SetItemServiceRestartWarning= The configuration changes you made will only be effective after the WinRM service is restarted.  To restart the WinRM service, run the following command: 'Restart-Service winrm'
-SetItemServiceRestartWarningRemote= The configuration changes you made will only be effective after the WinRM service is restarted on {0}.
\ No newline at end of file
+SetItemServiceRestartWarningRemote= The configuration changes you made will only be effective after the WinRM service is restarted on {0}.
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml
index 150f184c164..dbe1d96dae0 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml
+++ b/src/Modules/Windows/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- *******************************************************************
-These sample files contain formatting information used by the Windows
+These sample files contain formatting information used by the
 PowerShell engine. Do not edit or change the contents of this file
-directly. Please see the Windows PowerShell documentation or type
+directly. Please see the PowerShell documentation or type
 Get-Help Update-TypeData for more information.
 
 Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/src/Modules/Windows/Microsoft.WSMan.Management/WSMan.format.ps1xml b/src/Modules/Windows/Microsoft.WSMan.Management/WSMan.format.ps1xml
index 246a7a307dc..71a30b7dec5 100644
--- a/src/Modules/Windows/Microsoft.WSMan.Management/WSMan.format.ps1xml
+++ b/src/Modules/Windows/Microsoft.WSMan.Management/WSMan.format.ps1xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- *******************************************************************
-These sample files contain formatting information used by the Windows
+These sample files contain formatting information used by the
 PowerShell engine. Do not edit or change the contents of this file
-directly. Please see the Windows PowerShell documentation or type
+directly. Please see the PowerShell documentation or type
 Get-Help Update-FormatData for more information.
 
 Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psm1 b/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psm1
index 53286a970e6..478e8e69775 100644
--- a/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psm1
+++ b/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psm1
@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 
 <#
-  Windows PowerShell Diagnostics Module
+  PowerShell Diagnostics Module
   This module contains a set of wrapper scripts that
   enable a user to use ETW tracing in Windows
   PowerShell.
diff --git a/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man b/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man
index 1ee6f70f89b..e0c671ca8aa 100644
--- a/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man
+++ b/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man
@@ -18,7 +18,7 @@
       version="$(build.version)"
       versionScope="nonSxS"
       />
-  <!--Define the instrumentation for Windows PowerShell-->
+  <!--Define the instrumentation for PowerShell-->
   <instrumentation
       xmlns:trace="http://schemas.microsoft.com/win/2004/08/events/trace"
       xmlns:win="http://manifests.microsoft.com/win/2004/08/windows/events"
@@ -2210,7 +2210,7 @@
               />
         </events>
         <channels>
-          <!--There are three channels defined for Windows PowerShell instrumentation
+          <!--There are three channels defined for PowerShell instrumentation
               event provider
                 1. Operational - for high level diagnostic messages
                 2. Analytic - for high volume high performance trace messages
@@ -5655,23 +5655,23 @@
             />
         <string
             id="PS_PROVIDER.event.E_O_REMOTE_NAMEDPIPE_LISTENER_START.message"
-            value="Windows PowerShell has started an IPC listening thread on process: %1 in AppDomain: %2."
+            value="PowerShell has started an IPC listening thread on process: %1 in AppDomain: %2."
             />
         <string
             id="PS_PROVIDER.event.E_O_REMOTE_NAMEDPIPE_LISTENER_END.message"
-            value="Windows PowerShell has ended an IPC listening thread on process: %1 in AppDomain: %2."
+            value="PowerShell has ended an IPC listening thread on process: %1 in AppDomain: %2."
             />
         <string
             id="PS_PROVIDER.event.E_O_REMOTE_NAMEDPIPE_LISTENER_ERROR.message"
-            value="An error has occurred in Windows PowerShell IPC listening thread on process: %1 in AppDomain: %2.  Error Message: %3."
+            value="An error has occurred in PowerShell IPC listening thread on process: %1 in AppDomain: %2.  Error Message: %3."
             />
         <string
             id="PS_PROVIDER.event.E_O_REMOTE_NAMEDPIPE_CONNECT.message"
-            value="Windows PowerShell IPC connect on process: %1 in AppDomain: %2 for User: %3."
+            value="PowerShell IPC connect on process: %1 in AppDomain: %2 for User: %3."
             />
         <string
             id="PS_PROVIDER.event.E_O_REMOTE_NAMEDPIPE_DISCONNECT.message"
-            value="Windows PowerShell IPC disconnect on process: %1 in AppDomain: %2 for User: %3."
+            value="PowerShell IPC disconnect on process: %1 in AppDomain: %2 for User: %3."
             />
       </stringTable>
     </resources>
diff --git a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
index 895e9a6d886..4a030da7e85 100644
--- a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
@@ -2531,7 +2531,7 @@ private void CheckForValidateState()
             {
                 throw new PSInvalidOperationException(
                     // The remote session to which you are connected does not support remote debugging.
-                    // You must connect to a remote computer that is running Windows PowerShell {0} or greater.
+                    // You must connect to a remote computer that is running PowerShell {0} or greater.
                     StringUtil.Format(RemotingErrorIdStrings.RemoteDebuggingEndpointVersionError, PSVersionInfo.PSV4Version),
                     null,
                     "RemoteDebugger:RemoteDebuggingNotSupported",
diff --git a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs
index 46e26ce799a..562e58db8bc 100644
--- a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs
+++ b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs
@@ -342,7 +342,7 @@ internal Collection<RemoteHostCall> PerformSecurityChecksOnHostMessage(string co
 
             // check if the incoming message is a PromptForCredential message
             // if so, do the following:
-            //       (a) prepend "Windows PowerShell Credential Request" in the title
+            //       (a) prepend "PowerShell Credential Request" in the title
             //       (b) prepend "Message from Server XXXXX" to the text message
             if (MethodId == RemoteHostMethodId.PromptForCredential1 ||
                 MethodId == RemoteHostMethodId.PromptForCredential2)
@@ -436,7 +436,7 @@ internal Collection<RemoteHostCall> PerformSecurityChecksOnHostMessage(string co
         /// <summary>
         /// Provides the modified caption for the given caption
         /// Used in ensuring that remote prompt messages are
-        /// tagged with "Windows PowerShell Credential Request"
+        /// tagged with "PowerShell Credential Request"
         /// </summary>
         /// <param name="caption">Caption to modify.</param>
         /// <returns>New modified caption.</returns>
diff --git a/src/System.Management.Automation/resources/EventResource.resx b/src/System.Management.Automation/resources/EventResource.resx
index 87e12dda7bb..a4f245cde93 100644
--- a/src/System.Management.Automation/resources/EventResource.resx
+++ b/src/System.Management.Automation/resources/EventResource.resx
@@ -67,18 +67,18 @@
     <value>A message was not found for event id PowerShell.Core.Instrumentation.man.</value>
 </data>
 <data name="PS_PROVIDEReventE_O_ScheduledJobStarted" xml:space="preserve">
-    <value>Scheduled Job {0} started at {1} 
+    <value>Scheduled Job {0} started at {1}
 </value>
 </data>
 <data name="PS_PROVIDEReventE_O_ScheduledJobCompleted" xml:space="preserve">
-    <value>Scheduled Job {0} completed at {1} with state {2} 
+    <value>Scheduled Job {0} completed at {1} with state {2}
 </value>
 </data>
 <data name="PS_PROVIDEReventE_O_ScheduledJobException" xml:space="preserve">
-    <value>Scheduled Job Exception {0}: 
- Message: {1} 
- StackTrace: {2} 
- InnerException: {3} 
+    <value>Scheduled Job Exception {0}:
+ Message: {1}
+ StackTrace: {2}
+ InnerException: {3}
 </value>
 </data>
 <data name="PS_PROVIDEReventE_O_ExperimentalFeatureInvalidName" xml:space="preserve">
@@ -86,296 +86,296 @@
 </data>
 <data name="PS_PROVIDEReventE_O_ExperimentalFeatureReadConfigError" xml:space="preserve">
     <value>Experimental Feature Initialization: Failed to read the config file.
- Exception: {0} 
- Message: {1} 
- StackTrace: {2} 
+ Exception: {0}
+ Message: {1}
+ StackTrace: {2}
 </value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowPluginStarted" xml:space="preserve">
-    <value>Workflow plugin loaded. 
- 	 EndpointName: {0} 
- 	 User: {1} 
- 	 HostingMode: {2} 
- 	 Protocol: {3} 
- 	 Configuration: 
+    <value>Workflow plugin loaded.
+ 	 EndpointName: {0}
+ 	 User: {1}
+ 	 HostingMode: {2}
+ 	 Protocol: {3}
+ 	 Configuration:
  {4}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowExecutionStarted" xml:space="preserve">
-    <value>Workflow execution started. 
- 	 WorkflowId: {0} 
+    <value>Workflow execution started.
+ 	 WorkflowId: {0}
  	 ManagedNodes: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowStateChanged" xml:space="preserve">
-    <value>Workflow state changed. 
- 	 WorkflowId: {0} 
- 	 NewState: {1} 
+    <value>Workflow state changed.
+ 	 WorkflowId: {0}
+ 	 NewState: {1}
  	 OldState: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowPluginRequestedToShutdown" xml:space="preserve">
-    <value>Workflow plugin has been requested for a shutdown. 
+    <value>Workflow plugin has been requested for a shutdown.
  	 EndpointName: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowPluginRestarted" xml:space="preserve">
-    <value>Workflow plugin restarted. 
+    <value>Workflow plugin restarted.
  	 EndpointName: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowWorkflowsResuming" xml:space="preserve">
-    <value>Workflow is resuming. 
+    <value>Workflow is resuming.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowQuotaViolationDetected" xml:space="preserve">
-    <value>A quota limit that was set for the endpoint was exceeded. 
- 	 EndpointName: {0} 
- 	 ConfigName: {1} 
- 	 AllowedValue: {2} 
+    <value>A quota limit that was set for the endpoint was exceeded.
+ 	 EndpointName: {0}
+ 	 ConfigName: {1}
+ 	 AllowedValue: {2}
  	 ValueInQuestion: {3}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowWorkflowsResumed" xml:space="preserve">
-    <value>Workflow has resumed. 
+    <value>Workflow has resumed.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowRunspacePoolCreated" xml:space="preserve">
-    <value>Workflow runspace pool was created. 
- 	 WorkflowId: {0} 
+    <value>Workflow runspace pool was created.
+ 	 WorkflowId: {0}
  	 ManagedNode: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowActivityExecutionQueued" xml:space="preserve">
-    <value>Activity was queued for execution. 
- 	 WorkflowId: {0} 
+    <value>Activity was queued for execution.
+ 	 WorkflowId: {0}
  	 ActivityName: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowActivityExecutionStarted" xml:space="preserve">
-    <value>Activity execution started. 
- 	 ActivityName: {0} 
+    <value>Activity execution started.
+ 	 ActivityName: {0}
  	 ActivityTypeName: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowImportingFromXaml" xml:space="preserve">
-    <value>Workflow is being imported from a XAML file. 
- 	 WorkflowId: {0} 
+    <value>Workflow is being imported from a XAML file.
+ 	 WorkflowId: {0}
  	 XamlFile: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowImportedFromXaml" xml:space="preserve">
-    <value>Workflow has been imported from a XAML file. 
- 	 WorkflowId: {0} 
+    <value>Workflow has been imported from a XAML file.
+ 	 WorkflowId: {0}
  	 XamlFile: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowImportFromXamlError" xml:space="preserve">
-    <value>Workflow could not be imported from a XAML file because of an error. 
- 	 WorkflowId: {0} 
+    <value>Workflow could not be imported from a XAML file because of an error.
+ 	 WorkflowId: {0}
  	 ErrorDescription: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowImportFromXamlValidationStarted" xml:space="preserve">
-    <value>Workflow validation started. 
+    <value>Workflow validation started.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowImportFromXamlValidationFinishedSuccessfully" xml:space="preserve">
-    <value>Workflow validation succeeded. 
+    <value>Workflow validation succeeded.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowImportFromXamlValidationFinishedWithError" xml:space="preserve">
-    <value>Workflow validation failed with error. 
+    <value>Workflow validation failed with error.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowImportFromXamlActivityValidated" xml:space="preserve">
-    <value>Workflow activity validated. 
- 	 WorkflowId: {0} 
- 	 ActivityDisplayName: {1} 
+    <value>Workflow activity validated.
+ 	 WorkflowId: {0}
+ 	 ActivityDisplayName: {1}
  	 ActivityTypeName: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowImportFromXamlActivityValidationFailed" xml:space="preserve">
-    <value>Workflow activity could not be validated. 
- 	 WorkflowId: {0} 
- 	 ActivityDisplayName: {1} 
+    <value>Workflow activity could not be validated.
+ 	 WorkflowId: {0}
+ 	 ActivityDisplayName: {1}
  	 ActivityTypeName: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowActivityExecutionFailed" xml:space="preserve">
-    <value>Activity execution failed. 
- 	 WorkflowId: {0} 
- 	 ActivityName: {1} 
+    <value>Activity execution failed.
+ 	 WorkflowId: {0}
+ 	 ActivityName: {1}
  	 FailureDescription: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowRunspaceAvailabilityChanged" xml:space="preserve">
-    <value>Runspace availability changed. 
- 	 RunspaceId: {0} 
+    <value>Runspace availability changed.
+ 	 RunspaceId: {0}
  	 Availability: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowRunspaceStateChanged" xml:space="preserve">
-    <value>Runspace state changed. 
- 	 RunspaceId: {0} 
- 	 NewState: {1} 
+    <value>Runspace state changed.
+ 	 RunspaceId: {0}
+ 	 NewState: {1}
  	 OldState: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowLoadedForExecution" xml:space="preserve">
-    <value>Workflow loaded for execution. 
+    <value>Workflow loaded for execution.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowUnloaded" xml:space="preserve">
-    <value>Workflow unloaded. 
+    <value>Workflow unloaded.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowCancelled" xml:space="preserve">
-    <value>Workflow execution cancelled. 
+    <value>Workflow execution cancelled.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowAborted" xml:space="preserve">
-    <value>Workflow execution aborted. 
+    <value>Workflow execution aborted.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowCleanup" xml:space="preserve">
-    <value>Workflow cleanup operation executed. 
+    <value>Workflow cleanup operation executed.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowLoadedFromDisk" xml:space="preserve">
-    <value>Persisted workflow loaded from disk. 
- 	 WorkflowId: {0} 
+    <value>Persisted workflow loaded from disk.
+ 	 WorkflowId: {0}
  	 Path: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowDeletedFromDisk" xml:space="preserve">
-    <value>Workflow data was deleted from disk. 
- 	 WorkflowId: {0} 
+    <value>Workflow data was deleted from disk.
+ 	 WorkflowId: {0}
  	 Path: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PRemoveJobStarted" xml:space="preserve">
-    <value>Starting remove job. 
+    <value>Starting remove job.
  	 JobId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PJobStateChanged" xml:space="preserve">
-    <value>Job state changed. 
- 	 JobId: {0} 
- 	 WorkflowId: {1} 
- 	 NewState: {2} 
+    <value>Job state changed.
+ 	 JobId: {0}
+ 	 WorkflowId: {1}
+ 	 NewState: {2}
  	 OldState: {3}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PJobError" xml:space="preserve">
-    <value>Job error. 
- 	 JobId: {0} 
- 	 WorkflowId: {1} 
+    <value>Job error.
+ 	 JobId: {0}
+ 	 WorkflowId: {1}
  	 ErrorDescription: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowJobCreated" xml:space="preserve">
-    <value>Job created for workflow (child job). 
- 	 ParentJobId: {0} 
- 	 ChildJobId: {1} 
+    <value>Job created for workflow (child job).
+ 	 ParentJobId: {0}
+ 	 ChildJobId: {1}
  	 ChildWorkflowId: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PParentJobCreated" xml:space="preserve">
-    <value>Parent job created for workflow. 
+    <value>Parent job created for workflow.
  	 JobId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PJobCreationCompleted" xml:space="preserve">
-    <value>All required jobs were created for workflow execution. 
- 	 JobId: {0} 
+    <value>All required jobs were created for workflow execution.
+ 	 JobId: {0}
  	 WorkflowId: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PJobRemoved" xml:space="preserve">
-    <value>Child job removed for workflow. 
- 	 ParentJobId: {0} 
- 	 ChildJobId: {1} 
+    <value>Child job removed for workflow.
+ 	 ParentJobId: {0}
+ 	 ChildJobId: {1}
  	 WorkflowId: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PJobRemoveError" xml:space="preserve">
-    <value>An error occurred while removing job. 
- 	 ParentJobId: {0} 
- 	 ChildJobId: {1} 
- 	 WorkflowId: {2} 
+    <value>An error occurred while removing job.
+ 	 ParentJobId: {0}
+ 	 ChildJobId: {1}
+ 	 WorkflowId: {2}
  	 Error: {3}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PLoadingWorkflowForExecution" xml:space="preserve">
-    <value>Loading workflow for execution. 
+    <value>Loading workflow for execution.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowExecutionFinished" xml:space="preserve">
-    <value>Workflow execution finished. 
+    <value>Workflow execution finished.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PCancellingWorkflowExecution" xml:space="preserve">
-    <value>Cancelling workflow execution. 
+    <value>Cancelling workflow execution.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PAbortingWorkflowExecution" xml:space="preserve">
-    <value>Aborting workflow execution. 
- 	 WorkflowId: {0} 
+    <value>Aborting workflow execution.
+ 	 WorkflowId: {0}
  	 Reason: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PUnloadingWorkflow" xml:space="preserve">
-    <value>Unloading workflow. 
+    <value>Unloading workflow.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PForcedWorkflowShutdownStarted" xml:space="preserve">
-    <value>Forced workflow shutdown started. 
+    <value>Forced workflow shutdown started.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PForcedWorkflowShutdownFinished" xml:space="preserve">
-    <value>Forced workflow shutdown finished. 
+    <value>Forced workflow shutdown finished.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PForcedWorkflowShutdownError" xml:space="preserve">
-    <value>An error occurred while forcefully shutting down a workflow. 
- 	 WorkflowId: {0} 
+    <value>An error occurred while forcefully shutting down a workflow.
+ 	 WorkflowId: {0}
  	 ErrorDescription: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PPersistingWorkflow" xml:space="preserve">
-    <value>Persisting workflow to disk. 
- 	 WorkflowId: {0} 
+    <value>Persisting workflow to disk.
+ 	 WorkflowId: {0}
  	 PersistPath: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowPersisted" xml:space="preserve">
-    <value>Workflow persisted to disk. 
+    <value>Workflow persisted to disk.
  	 WorkflowId: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowActivityExecutionFinished" xml:space="preserve">
-    <value>Activity execution finished. 
+    <value>Activity execution finished.
  	 ActivityName: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowExecutionError" xml:space="preserve">
-    <value>Workflow execution error. 
- 	 WorkflowId: {0} 
+    <value>Workflow execution error.
+ 	 WorkflowId: {0}
  	 ErrorDescription: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PEndpointRegistered" xml:space="preserve">
-    <value>A new PowerShell endpoint was registered. 
- 	 EndpointName: {0} 
- 	 EndpointType: {1} 
+    <value>A new PowerShell endpoint was registered.
+ 	 EndpointName: {0}
+ 	 EndpointType: {1}
  	 RegisteredBy: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PEndpointModified" xml:space="preserve">
-    <value>Endpoint configuration modified. 
- 	 EndpointName: {0} 
+    <value>Endpoint configuration modified.
+ 	 EndpointName: {0}
  	 ModifiedBy: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PEndpointUnregistered" xml:space="preserve">
-    <value>Endpoint configuration unregistered. 
- 	 EndpointName: {0} 
+    <value>Endpoint configuration unregistered.
+ 	 EndpointName: {0}
  	 UnregisteredBy: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PEndpointDisabled" xml:space="preserve">
-    <value>Endpoint configuration disabled. 
- 	 EndpointName: {0} 
+    <value>Endpoint configuration disabled.
+ 	 EndpointName: {0}
  	 DisabledBy: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PEndpointEnabled" xml:space="preserve">
-    <value>Endpoint configuration enabled. 
- 	 EndpointName: {0} 
+    <value>Endpoint configuration enabled.
+ 	 EndpointName: {0}
  	 EnabledBy: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3POutOfProcessRunspaceStarted" xml:space="preserve">
-    <value>Out of process runspace started. 
+    <value>Out of process runspace started.
  	 Command: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PParameterSplattingWasPerformed" xml:space="preserve">
-    <value>Parameter splatting was performed during workflow execution. 
- 	 Parameters: {0} 
+    <value>Parameter splatting was performed during workflow execution.
+ 	 Parameters: {0}
  	 Computers: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_M3PWorkflowEngineStarted" xml:space="preserve">
-    <value>Workflow engine started. 
+    <value>Workflow engine started.
  	 EndpointName: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_D_M3PWORKFLOW_MANAGER_CHECKPOINTPATH" xml:space="preserve">
-    <value>Workflow manager instantiated with 
- 	 CheckpointPath: {0} 
- 	 ConfigProviderId: {1} 
- 	 UserName: {2} 
+    <value>Workflow manager instantiated with
+ 	 CheckpointPath: {0}
+ 	 ConfigProviderId: {1}
+ 	 UserName: {2}
  	 Path: {3}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_CMDLETS_HOSTNAMERESOLVE" xml:space="preserve">
@@ -483,8 +483,8 @@ User Data:
 </value>
 </data>
 <data name="PS_PROVIDEReventE_A_WriteTransferEvent" xml:space="preserve">
-    <value>Correlating activity id's. 
- 	 CurrentActivityId: {0} 
+    <value>Correlating activity id's.
+ 	 CurrentActivityId: {0}
  	 ParentActivityId: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_ENGINE_TRACE" xml:space="preserve">
@@ -498,13 +498,13 @@ Activity GUID = {6}
 Parameters = {7}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_RUNSPACE_CONSTRUCTOR" xml:space="preserve">
-    <value>Creating Runspace object 
+    <value>Creating Runspace object
  	 Instance Id: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_RUNSPACEPOOL_CONSTRUCTOR" xml:space="preserve">
-    <value>Creating RunspacePool object 
- 	 InstanceId {0} 
- 	 MinRunspaces {1} 
+    <value>Creating RunspacePool object
+ 	 InstanceId {0}
+ 	 MinRunspaces {1}
  	 MaxRunspaces {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_RUNSPACEPOOL_OPEN" xml:space="preserve">
@@ -520,19 +520,19 @@ Parameters = {7}</value>
     <value>Attempting session creation retry {0} for error code {1} on session Id {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_REMOTE_NAMEDPIPE_LISTENER_START" xml:space="preserve">
-    <value>Windows PowerShell has started an IPC listening thread on process: {0} in AppDomain: {1}.</value>
+    <value>PowerShell has started an IPC listening thread on process: {0} in AppDomain: {1}.</value>
 </data>
 <data name="PS_PROVIDEReventE_O_REMOTE_NAMEDPIPE_LISTENER_END" xml:space="preserve">
-    <value>Windows PowerShell has ended an IPC listening thread on process: {0} in AppDomain: {1}.</value>
+    <value>PowerShell has ended an IPC listening thread on process: {0} in AppDomain: {1}.</value>
 </data>
 <data name="PS_PROVIDEReventE_O_REMOTE_NAMEDPIPE_LISTENER_ERROR" xml:space="preserve">
-    <value>An error has occurred in Windows PowerShell IPC listening thread on process: {0} in AppDomain: {1}.  Error Message: {2}.</value>
+    <value>An error has occurred in PowerShell IPC listening thread on process: {0} in AppDomain: {1}.  Error Message: {2}.</value>
 </data>
 <data name="PS_PROVIDEReventE_O_REMOTE_NAMEDPIPE_CONNECT" xml:space="preserve">
-    <value>Windows PowerShell IPC connect on process: {0} in AppDomain: {1} for User: {2}.</value>
+    <value>PowerShell IPC connect on process: {0} in AppDomain: {1} for User: {2}.</value>
 </data>
 <data name="PS_PROVIDEReventE_O_REMOTE_NAMEDPIPE_DISCONNECT" xml:space="preserve">
-    <value>Windows PowerShell IPC disconnect on process: {0} in AppDomain: {1} for User: {2}.</value>
+    <value>PowerShell IPC disconnect on process: {0} in AppDomain: {1} for User: {2}.</value>
 </data>
 <data name="PS_PROVIDEReventE_A_RUNSPACE_PORT" xml:space="preserve">
     <value>Port resolved to {0}</value>
@@ -550,17 +550,17 @@ Parameters = {7}</value>
     <value>Test analytic message</value>
 </data>
 <data name="PS_PROVIDEReventE_A_RUNSPACE_WSMANCONNECTIONINFO" xml:space="preserve">
-    <value>Connection Paramters are 
- Connection URI: {0} 
- Resource URI: {1} 
- User: {2} 
- OpenTimeout: {3} 
- IdleTimeout: {4} 
- CancelTimeout: {5} 
- AuthenticationMechanism: {6} 
- Thumb Print: {7} 
- MaxUriRedirectionCount: {8} 
- MaxReceivedDataSizePerCommand: {0}0 
+    <value>Connection Paramters are
+ Connection URI: {0}
+ Resource URI: {1}
+ User: {2}
+ OpenTimeout: {3}
+ IdleTimeout: {4}
+ CancelTimeout: {5}
+ AuthenticationMechanism: {6}
+ Thumb Print: {7}
+ MaxUriRedirectionCount: {8}
+ MaxReceivedDataSizePerCommand: {0}0
  MaxReceivedObjectSize: {0}1</value>
 </data>
 <data name="PS_PROVIDEReventE_A_RUNSPACEPOOL_TRANSFER" xml:space="preserve">
@@ -570,25 +570,25 @@ Parameters = {7}</value>
     <value>Received object with Runspace Id: {0} Command Id: {1} Destination: {2} DataType: {3} TargetInterface: {4}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_APPDOMAIN_UNHANDLED_EXCEPTION" xml:space="preserve">
-    <value>An unhandled exception occurred in the appdomain. 
-Exception Type: {0} 
-Exception Message: {1} 
+    <value>An unhandled exception occurred in the appdomain.
+Exception Type: {0}
+Exception Message: {1}
 Exception StackTrace: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_TRANSPORT_ERROR" xml:space="preserve">
-    <value>Runspace Id: {0} Pipeline Id: {1}. WSMan reported an error with error code: {2}. 
- Error message: {3} 
+    <value>Runspace Id: {0} Pipeline Id: {1}. WSMan reported an error with error code: {2}.
+ Error message: {3}
  StackTrace: {4}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_APPDOMAIN_UNHANDLED_EXCEPTION" xml:space="preserve">
-    <value>An unhandled exception occurred in the appdomain. 
-Exception Type: {0} 
-Exception Message: {1} 
+    <value>An unhandled exception occurred in the appdomain.
+Exception Type: {0}
+Exception Message: {1}
 Exception StackTrace: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_TRANSPORT_ERROR" xml:space="preserve">
-    <value>Runspace Id: {0} Pipeline Id: {1}. WSMan reported an error with error code: {2}. 
- Error message: {3} 
+    <value>Runspace Id: {0} Pipeline Id: {1}. WSMan reported an error with error code: {2}.
+ Error message: {3}
  StackTrace: {4}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_TRANSPORT_CONNECT" xml:space="preserve">
@@ -646,9 +646,9 @@ Exception StackTrace: {2}</value>
     <value>Reporting context for request: {0} Context Reported: {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_REPORT_OPERATION_COMPLETE" xml:space="preserve">
-    <value>Reporting operation complete for request: {0} 
- Error Code: {1} 
- Error Message: {2} 
+    <value>Reporting operation complete for request: {0}
+ Error Code: {1}
+ Error Message: {2}
  StackTrace: {3}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_CREATE_COMMAND_REMOTESESSION" xml:space="preserve">
@@ -673,88 +673,88 @@ Exception StackTrace: {2}</value>
     <value>Loading type {0} for custom shell with shell Id {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_RECEIVED_FRAGMENT" xml:space="preserve">
-    <value>Received remoting fragment. 
- 	 Object Id: {0} 
- 	 Fragment Id: {1} 
- 	 Start Flag: {2} 
- 	 End Flag: {3} 
- 	 Payload Length: {4} 
+    <value>Received remoting fragment.
+ 	 Object Id: {0}
+ 	 Fragment Id: {1}
+ 	 Start Flag: {2}
+ 	 End Flag: {3}
+ 	 Payload Length: {4}
  	 Payload Data: {5}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SENT_FRAGMENT" xml:space="preserve">
-    <value>Sent remoting fragment. 
- 	 Object Id: {0} 
- 	 Fragment Id: {1} 
- 	 Start Flag: {2} 
- 	 End Flag: {3} 
- 	 Payload Length: {4} 
+    <value>Sent remoting fragment.
+ 	 Object Id: {0}
+ 	 Fragment Id: {1}
+ 	 Start Flag: {2}
+ 	 End Flag: {3}
+ 	 Payload Length: {4}
  	 Payload Data: {5}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SHUTTING_DOWN" xml:space="preserve">
     <value>Shutting down winrm service.</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SERIALIZER_REHYDRATION_SUCCESS" xml:space="preserve">
-    <value>Successfully rehydrated an object. 
- 	 Deserialized type name: {0} 
- 	 Rehydrated by casting to type: {1} 
+    <value>Successfully rehydrated an object.
+ 	 Deserialized type name: {0}
+ 	 Rehydrated by casting to type: {1}
  	 Rehydrated object is of type: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SERIALIZER_REHYDRATION_FAILURE" xml:space="preserve">
-    <value>Failed to rehydrated an object. 
- 	 Deserialized type name: {0} 
- 	 Rehydrated by casting to type: {1} 
- 	 Type cast exception: {2} 
+    <value>Failed to rehydrated an object.
+ 	 Deserialized type name: {0}
+ 	 Rehydrated by casting to type: {1}
+ 	 Type cast exception: {2}
  	 Type cast inner exception: {3}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SERIALIZER_DEPTH_OVERRIDE" xml:space="preserve">
-    <value>Serialization depth has been overriden. 
- 	 Serialized type name: {0} 
- 	 Original depth: {1} 
- 	 Overriden depth: {2} 
+    <value>Serialization depth has been overriden.
+ 	 Serialized type name: {0}
+ 	 Original depth: {1}
+ 	 Overriden depth: {2}
  	 Current depth below top level: {3}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SERIALIZER_MODE_OVERRIDE" xml:space="preserve">
-    <value>Serialization mode has been overriden. 
- 	 Serialized type name: {0} 
+    <value>Serialization mode has been overriden.
+ 	 Serialized type name: {0}
  	 Overriden mode: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SERIALIZER_SCRIPT_PROPERTY_WITHOUT_RUNSPACE" xml:space="preserve">
-    <value>Serialization of a script property has been skipped, because there is no runspace to use for evaluation of the property. 
- 	 Property name: {0} 
- 	 Property owner's type name: {1} 
+    <value>Serialization of a script property has been skipped, because there is no runspace to use for evaluation of the property.
+ 	 Property name: {0}
+ 	 Property owner's type name: {1}
  	 Getter script: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SERIALIZER_PROPERTY_GETTER_FAILED" xml:space="preserve">
-    <value>Serialization of a property has been skipped, because property getter failed. 
- 	 Property name: {0} 
- 	 Property owner's type name: {1} 
- 	 Exception from property getter: {2} 
+    <value>Serialization of a property has been skipped, because property getter failed.
+ 	 Property name: {0}
+ 	 Property owner's type name: {1}
+ 	 Exception from property getter: {2}
  	 Inner exception from property getter: {3}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SERIALIZER_ENUMERATION_FAILED" xml:space="preserve">
-    <value>Serialization of an enumerable object might not be complete, because object being enumerated threw an exception. 
- 	 Type of object being enumerated: {0} 
+    <value>Serialization of an enumerable object might not be complete, because object being enumerated threw an exception.
+ 	 Type of object being enumerated: {0}
  	 Exception: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SERIALIZER_TOSTRING_FAILED" xml:space="preserve">
-    <value>Serialization called object's ToString method which failed. 
- 	 Type of object: {0} 
+    <value>Serialization called object's ToString method which failed.
+ 	 Type of object: {0}
  	 Exception: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SERIALIZER_MAX_DEPTH_WHEN_SERIALIZING" xml:space="preserve">
-    <value>Maximum depth below top level has been reached, forcing object to be serialized as strings. 
- 	 Object type at max depth: {0} 
- 	 Property name at max depth: {1} 
+    <value>Maximum depth below top level has been reached, forcing object to be serialized as strings.
+ 	 Object type at max depth: {0}
+ 	 Property name at max depth: {1}
  	 Depth: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SERIALIZER_XMLEXCEPTION_WHEN_DESERIALIZING" xml:space="preserve">
-    <value>XmlException has been thrown by the deserializer (most likely indicating incorrect clixml format). 
- 	 Line number: {0} Line position: {1} 
+    <value>XmlException has been thrown by the deserializer (most likely indicating incorrect clixml format).
+ 	 Line number: {0} Line position: {1}
  	 Exception: {2}</value>
 </data>
 <data name="PS_PROVIDEReventE_A_SERIALIZER_SPECIFIC_PROPERTY_MISSING" xml:space="preserve">
-    <value>Serialization of specified properties failed, because one of the specified properties was missing. 
- 	 Type of object: {0} 
+    <value>Serialization of specified properties failed, because one of the specified properties was missing.
+ 	 Type of object: {0}
  	 Property name: {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_O_PowershellConsoleStartupStart" xml:space="preserve">
@@ -767,44 +767,44 @@ Exception StackTrace: {2}</value>
     <value>{0}</value>
 </data>
 <data name="PS_PROVIDEReventE_D_Powershell_ErrorRecord" xml:space="preserve">
-    <value>Tracing ErrorRecord: 
- Message: {0} 
- CategoryInfo.Category: {1} 
- CategoryInfo.Reason : {2} 
- CategoryInfo.TargetName : {3} 
- FullyQualifiedErrorId: {4} 
- Exception Details: 
- Message : {5} 
- Stack Trace: {6} 
- InnerException {7} 
+    <value>Tracing ErrorRecord:
+ Message: {0}
+ CategoryInfo.Category: {1}
+ CategoryInfo.Reason : {2}
+ CategoryInfo.TargetName : {3}
+ FullyQualifiedErrorId: {4}
+ Exception Details:
+ Message : {5}
+ Stack Trace: {6}
+ InnerException {7}
 </value>
 </data>
 <data name="PS_PROVIDEReventE_D_Powershell_Exception" xml:space="preserve">
-    <value>Exception: 
- Message: {0} 
- StackTrace: {1} 
- InnerException : {2} 
+    <value>Exception:
+ Message: {0}
+ StackTrace: {1}
+ InnerException : {2}
 </value>
 </data>
 <data name="PS_PROVIDEReventE_O_Powershell_PSObject" xml:space="preserve">
     <value>Tracing PSObject</value>
 </data>
 <data name="PS_PROVIDEReventE_D_Powershell_Job" xml:space="preserve">
-    <value>Tracing Job: 
- Id: {0} 
- InstanceId: {1} 
- Name: {2} 
- Location: {3} 
- State: {4} 
- Command: {5} 
+    <value>Tracing Job:
+ Id: {0}
+ InstanceId: {1}
+ Name: {2}
+ Location: {3}
+ State: {4}
+ Command: {5}
 </value>
 </data>
 <data name="PS_PROVIDEReventE_D_MESSAGE" xml:space="preserve">
-    <value>Trace Information: 
+    <value>Trace Information:
  {0}</value>
 </data>
 <data name="PS_PROVIDEReventE_D_MESSAGE2" xml:space="preserve">
-    <value>Trace Information: 
+    <value>Trace Information:
  {0} {1}</value>
 </data>
 <data name="PS_PROVIDEReventE_D_M3PBeginStartWorkflowApplication" xml:space="preserve">
diff --git a/src/System.Management.Automation/resources/RunspacePoolStrings.resx b/src/System.Management.Automation/resources/RunspacePoolStrings.resx
index b6f7561247a..515bcece698 100644
--- a/src/System.Management.Automation/resources/RunspacePoolStrings.resx
+++ b/src/System.Management.Automation/resources/RunspacePoolStrings.resx
@@ -157,7 +157,7 @@
     <value>Cannot perform the operation because the runspace pool is in the Disconnected state.</value>
   </data>
   <data name="DisconnectNotSupportedOnServer" xml:space="preserve">
-    <value>The Disconnect operation is not supported on the server.  The server must be running Windows PowerShell 3.0 or greater for remote runspace pool disconnection support.</value>
+    <value>The Disconnect operation is not supported on the server.  The server must be running PowerShell 3.0 or greater for remote runspace pool disconnection support.</value>
   </data>
   <data name="CannotReconstructCommands" xml:space="preserve">
     <value>This runspace pool {0} is not configured to provide disconnected PowerShell objects for commands running on the remote server.  Use the RunspacePool class GetRunspacePools() static method to query the server and return runspace pool objects that are configured to do this.</value>
@@ -166,6 +166,6 @@
     <value>This runspace pool cannot be connected because the corresponding server side runspace pool is connected to another client.</value>
   </data>
   <data name="ResetRunspaceStateNotSupportedOnServer" xml:space="preserve">
-    <value>ResetRunspaceState is not supported on the server.  The server must be running Windows PowerShell 5.0 or greater.</value>
+    <value>ResetRunspaceState is not supported on the server.  The server must be running PowerShell 5.0 or greater.</value>
   </data>
 </root>
diff --git a/test/powershell/engine/Module/ModulePath.Tests.ps1 b/test/powershell/engine/Module/ModulePath.Tests.ps1
index d0fbd2247bf..00b63aa40c1 100644
--- a/test/powershell/engine/Module/ModulePath.Tests.ps1
+++ b/test/powershell/engine/Module/ModulePath.Tests.ps1
@@ -25,7 +25,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
 
         # Skip these tests in cases when there is no 'pwsh' executable (e.g. when framework dependent PS package is used)
         $skipNoPwsh = -not (Test-Path $powershell)
-        
+
         if ($IsWindows)
         {
             $expectedWindowsPowerShellPSHomePath = Join-Path $env:windir "System32" "WindowsPowerShell" "v1.0" "Modules"
@@ -135,7 +135,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
 
     It 'Ensures $PSHOME\Modules is inserted correctly when launched from a different version of PowerShell' -Skip:(!($IsCoreCLR -and $IsWindows) -or $skipNoPwsh) {
         # When launched from a different version of PowerShell, PSModulePath contains the other version's PSHOME\Modules path
-        # and the Windows PowerShell modoule path. THe other version's module path should be removed and this version's
+        # and the Windows PowerShell module path. The other version's module path should be removed and this version's
         # PSHOME\Modules path should be inserted before Windows PowerShell module path.
         $winpwshModulePath = [System.IO.Path]::Combine([System.Environment]::SystemDirectory, "WindowsPowerShell", "v1.0", "Modules");
         $pwshModulePath = Join-Path -Path $PSHOME -ChildPath 'Modules'