diff --git a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
index 4c5aec933b4..441a3f62fed 100644
--- a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
@@ -1551,7 +1551,7 @@ private void HandleInputDataReady(object sender, EventArgs e)
         /// <param name="inputstream"></param>
         private void WriteInput(ObjectStreamBase inputstream)
         {
-            Collection<object> inputObjects = inputstream.ObjectReader.NonBlockingRead(Int32.MaxValue);
+            Collection<object> inputObjects = inputstream.ObjectReader.NonBlockingRead(int.MaxValue);
 
             foreach (object inputObject in inputObjects)
             {
@@ -1562,7 +1562,7 @@ private void WriteInput(ObjectStreamBase inputstream)
             if (!inputstream.IsOpen)
             {
                 // Write any data written after the NonBlockingRead call above.
-                inputObjects = inputstream.ObjectReader.NonBlockingRead(Int32.MaxValue);
+                inputObjects = inputstream.ObjectReader.NonBlockingRead(int.MaxValue);
 
                 foreach (object inputObject in inputObjects)
                 {
diff --git a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
index 0dd769537c6..e340a1acbdb 100644
--- a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
@@ -226,7 +226,7 @@ public override PSCredential Credential
         [Parameter(ParameterSetName = InvokeCommandCommand.ComputerNameParameterSet)]
         [Parameter(ParameterSetName = InvokeCommandCommand.FilePathComputerNameParameterSet)]
         [Parameter(ParameterSetName = InvokeCommandCommand.SSHHostParameterSet)]
-        [ValidateRange((int)1, (int)UInt16.MaxValue)]
+        [ValidateRange((int)1, (int)ushort.MaxValue)]
         public override int Port
         {
             get
diff --git a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
index 8a5df652470..ee06dc22130 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
@@ -606,7 +606,7 @@ public virtual PSCredential Credential
         /// </remarks>
         [Parameter(ParameterSetName = PSRemotingBaseCmdlet.ComputerNameParameterSet)]
         [Parameter(ParameterSetName = PSRemotingBaseCmdlet.SSHHostParameterSet)]
-        [ValidateRange((int)1, (int)UInt16.MaxValue)]
+        [ValidateRange((int)1, (int)ushort.MaxValue)]
         public virtual int Port { get; set; }
 
         /// <summary>
@@ -4149,7 +4149,7 @@ internal static string ExtractMessage(
                                     try
                                     {
                                         // WinRM returns both signed and unsigned 32 bit string values.  Convert to signed 32 bit integer.
-                                        Int64 eCode = Convert.ToInt64(errorCodeString, System.Globalization.NumberFormatInfo.InvariantInfo);
+                                        long eCode = Convert.ToInt64(errorCodeString, System.Globalization.NumberFormatInfo.InvariantInfo);
                                         unchecked
                                         {
                                             errorCode = (int)eCode;
diff --git a/src/System.Management.Automation/engine/remoting/commands/StartJob.cs b/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
index 05611d8c0ae..9913ec64ced 100644
--- a/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/StartJob.cs
@@ -277,7 +277,7 @@ public override string ConfigurationName
         /// <summary>
         /// Overriding to suppress this parameter.
         /// </summary>
-        public override Int32 ThrottleLimit
+        public override int ThrottleLimit
         {
             get
             {
diff --git a/src/System.Management.Automation/engine/remoting/commands/WaitJob.cs b/src/System.Management.Automation/engine/remoting/commands/WaitJob.cs
index 3bbc4463fe8..6964a1154b5 100644
--- a/src/System.Management.Automation/engine/remoting/commands/WaitJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/WaitJob.cs
@@ -46,7 +46,7 @@ public class WaitJobCommand : JobCmdletBase, IDisposable
         /// </summary>
         [Parameter]
         [Alias("TimeoutSec")]
-        [ValidateRange(-1, Int32.MaxValue)]
+        [ValidateRange(-1, int.MaxValue)]
         public int Timeout
         {
             get
diff --git a/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs b/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
index fb6bf348aba..22af9adf9ff 100644
--- a/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
@@ -283,7 +283,7 @@ public string CertificateThumbprint
         /// </remarks>
         [Parameter(ParameterSetName = GetPSSessionCommand.ComputerNameParameterSet)]
         [Parameter(ParameterSetName = GetPSSessionCommand.ComputerInstanceIdParameterSet)]
-        [ValidateRange((int)1, (int)UInt16.MaxValue)]
+        [ValidateRange((int)1, (int)ushort.MaxValue)]
         public int Port { get; set; }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
index 242bde2ac53..475dc705674 100644
--- a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
@@ -225,7 +225,7 @@ public int OpenTimeout
                     // The timer constructor will throw an exception
                     // for any value greater than Int32.MaxValue
                     // hence this is the maximum possible limit
-                    _openTimeout = Int32.MaxValue;
+                    _openTimeout = int.MaxValue;
                 }
             }
         }
@@ -270,7 +270,7 @@ public int OpenTimeout
         /// The maximum allowed idle timeout duration (in ms) that can be set on a Runspace.  This is a read-only property
         /// that is set once the Runspace is successfully created and opened.
         /// </summary>
-        public int MaxIdleTimeout { get; internal set; } = Int32.MaxValue;
+        public int MaxIdleTimeout { get; internal set; } = int.MaxValue;
 
         /// <summary>
         /// Populates session options from a PSSessionOption instance.
@@ -2505,7 +2505,7 @@ private static string[] ParseArgv(ProcessStartInfo psi)
             var argvList = new List<string>();
             argvList.Add(psi.FileName);
 
-            var argsToParse = String.Join(' ', psi.ArgumentList).Trim();
+            var argsToParse = string.Join(' ', psi.ArgumentList).Trim();
             var argsLength = argsToParse.Length;
             for (int i = 0; i < argsLength; )
             {
diff --git a/src/System.Management.Automation/engine/remoting/common/fragmentor.cs b/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
index e0a82e46cf2..c451ba32f45 100644
--- a/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
+++ b/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
@@ -757,11 +757,11 @@ private void WriteCurrentFragmentAndReset()
             PSEtwLog.LogAnalyticVerbose(
                 PSEventId.SentRemotingFragment, PSOpcode.Send, PSTask.None,
                 PSKeyword.Transport | PSKeyword.UseAlwaysAnalytic,
-                (Int64)(_currentFragment.ObjectId),
-                (Int64)(_currentFragment.FragmentId),
+                (long)(_currentFragment.ObjectId),
+                (long)(_currentFragment.FragmentId),
                 _currentFragment.IsStartFragment ? 1 : 0,
                 _currentFragment.IsEndFragment ? 1 : 0,
-                (UInt32)(_currentFragment.BlobLength),
+                (uint)(_currentFragment.BlobLength),
                 new PSETWBinaryBlob(_currentFragment.Blob, 0, _currentFragment.BlobLength));
 
             // finally write into memory stream
diff --git a/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
index 0859a54965f..c3cf3b278aa 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
@@ -213,7 +213,7 @@ public abstract class BaseTransportManager : IDisposable
 
         // This value instructs the server to use whatever setting it has for idle timeout.
         internal const int UseServerDefaultIdleTimeout = -1;
-        internal const uint UseServerDefaultIdleTimeoutUInt = UInt32.MaxValue;
+        internal const uint UseServerDefaultIdleTimeoutUInt = uint.MaxValue;
 
         // Minimum allowed idle timeout time is 60 seconds.
         internal const int MinimumIdleTimeout = 60 * 1000;
@@ -390,9 +390,9 @@ internal void OnDataAvailableCallback(RemoteDataObject<PSObject> remoteObject)
                                                   PSKeyword.Transport | PSKeyword.UseAlwaysAnalytic,
                                                   remoteObject.RunspacePoolId.ToString(),
                                                   remoteObject.PowerShellId.ToString(),
-                                                  (UInt32)(remoteObject.Destination),
-                                                  (UInt32)(remoteObject.DataType),
-                                                  (UInt32)(remoteObject.TargetInterface));
+                                                  (uint)(remoteObject.Destination),
+                                                  (uint)(remoteObject.DataType),
+                                                  (uint)(remoteObject.TargetInterface));
 
             // This might throw exceptions which the caller handles.
             PowerShellGuidObserver.SafeInvoke(remoteObject.PowerShellId, EventArgs.Empty);
@@ -1414,8 +1414,8 @@ private void OnDataAvailable(byte[] dataToSend, bool isEndFragment)
                 _runspacePoolInstanceId.ToString(),
                 _powerShellInstanceId.ToString(),
                 dataToSend.Length.ToString(CultureInfo.InvariantCulture),
-                (UInt32)_dataType,
-                (UInt32)_targetInterface);
+                (uint)_dataType,
+                (uint)_targetInterface);
 
             SendDataToClient(dataToSend, isEndFragment && _shouldFlushData, _reportAsPending, isEndFragment);
         }
diff --git a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
index 4d8535ca4a9..a0f38a78a07 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
@@ -561,11 +561,11 @@ internal void ProcessRawData(byte[] data, OnDataAvailableCallback callback)
                     PSEtwLog.LogAnalyticVerbose(
                         PSEventId.ReceivedRemotingFragment, PSOpcode.Receive, PSTask.None,
                         PSKeyword.Transport | PSKeyword.UseAlwaysAnalytic,
-                        (Int64)objectId,
-                        (Int64)fragmentId,
+                        (long)objectId,
+                        (long)fragmentId,
                         sFlag ? 1 : 0,
                         eFlag ? 1 : 0,
-                        (UInt32)blobLength,
+                        (uint)blobLength,
                         new PSETWBinaryBlob(oneFragment, FragmentedRemoteObject.HeaderLength, blobLength));
 
                     byte[] extraData = null;