diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
index a611f53fa9..fe655c18c9 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
@@ -66,7 +66,7 @@ namespace Microsoft.PowerShell.Commands
 
         private class MiscInfoGroup
         {
-            public UInt64? physicallyInstalledMemory;
+            public ulong? physicallyInstalledMemory;
             public string timeZone;
             public string logonServer;
             public FirmwareType? firmwareType;
@@ -1352,7 +1352,7 @@ namespace Microsoft.PowerShell.Commands
         /// the language parameter. If the language parameter is null or has a
         /// value that is not a valid language ID, the method returns null.
         /// </returns>
-        protected static string GetLanguageName(UInt32? language)
+        protected static string GetLanguageName(uint? language)
         {
             if (language != null)
                 return Conversion.LocaleIdToLocaleName(language.Value);
@@ -1407,7 +1407,7 @@ namespace Microsoft.PowerShell.Commands
         public byte? EmbeddedControllerMajorVersion;
         public byte? EmbeddedControllerMinorVersion;
         public string IdentificationCode;
-        public UInt16? InstallableLanguages;
+        public ushort? InstallableLanguages;
         public DateTime? InstallDate;
         public string LanguageEdition;
         public string[] ListOfLanguages;
@@ -1418,65 +1418,65 @@ namespace Microsoft.PowerShell.Commands
         public DateTime? ReleaseDate;
         public string SerialNumber;
         public string SMBIOSBIOSVersion;
-        public UInt16? SMBIOSMajorVersion;
-        public UInt16? SMBIOSMinorVersion;
+        public ushort? SMBIOSMajorVersion;
+        public ushort? SMBIOSMinorVersion;
         public bool? SMBIOSPresent;
-        public UInt16? SoftwareElementState;
+        public ushort? SoftwareElementState;
         public string Status;
         public byte? SystemBiosMajorVersion;
         public byte? SystemBiosMinorVersion;
-        public UInt16? TargetOperatingSystem;
+        public ushort? TargetOperatingSystem;
         public string Version;
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
     internal class WmiComputerSystem
     {
-        public UInt16? AdminPasswordStatus;
+        public ushort? AdminPasswordStatus;
         public bool? AutomaticManagedPagefile;
         public bool? AutomaticResetBootOption;
         public bool? AutomaticResetCapability;
-        public UInt16? BootOptionOnLimit;
-        public UInt16? BootOptionOnWatchDog;
+        public ushort? BootOptionOnLimit;
+        public ushort? BootOptionOnWatchDog;
         public bool? BootROMSupported;
         public string BootupState;
         public UInt16[] BootStatus;
         public string Caption;
-        public UInt16? ChassisBootupState;
+        public ushort? ChassisBootupState;
         public string ChassisSKUNumber;
         public Int16? CurrentTimeZone;
         public bool? DaylightInEffect;
         public string Description;
         public string DNSHostName;
         public string Domain;
-        public UInt16? DomainRole;
+        public ushort? DomainRole;
         public bool? EnableDaylightSavingsTime;
-        public UInt16? FrontPanelResetStatus;
+        public ushort? FrontPanelResetStatus;
         public bool? HypervisorPresent;
         public bool? InfraredSupported;
         public string InitialLoadInfo;
         public DateTime? InstallDate;
-        public UInt16? KeyboardPasswordStatus;
+        public ushort? KeyboardPasswordStatus;
         public string LastLoadInfo;
         public string Manufacturer;
         public string Model;
         public string Name;
         public bool? NetworkServerModeEnabled;
-        public UInt32? NumberOfLogicalProcessors;
-        public UInt32? NumberOfProcessors;
+        public uint? NumberOfLogicalProcessors;
+        public uint? NumberOfProcessors;
         public string[] OEMStringArray;
         public bool? PartOfDomain;
         public Int64? PauseAfterReset;
-        public UInt16? PCSystemType;
-        public UInt16? PCSystemTypeEx;
+        public ushort? PCSystemType;
+        public ushort? PCSystemTypeEx;
         public UInt16[] PowerManagementCapabilities;
         public bool? PowerManagementSupported;
-        public UInt16? PowerOnPasswordStatus;
-        public UInt16? PowerState;
-        public UInt16? PowerSupplyState;
+        public ushort? PowerOnPasswordStatus;
+        public ushort? PowerState;
+        public ushort? PowerSupplyState;
         public string PrimaryOwnerContact;
         public string PrimaryOwnerName;
-        public UInt16? ResetCapability;
+        public ushort? ResetCapability;
         public Int16? ResetCount;
         public Int16? ResetLimit;
         public string[] Roles;
@@ -1485,10 +1485,10 @@ namespace Microsoft.PowerShell.Commands
         public string SystemFamily;
         public string SystemSKUNumber;
         public string SystemType;
-        public UInt16? ThermalState;
-        public UInt64? TotalPhysicalMemory;
+        public ushort? ThermalState;
+        public ulong? TotalPhysicalMemory;
         public string UserName;
-        public UInt16? WakeUpType;
+        public ushort? WakeUpType;
         public string Workgroup;
 
         public PowerManagementCapabilities[] GetPowerManagementCapabilities()
@@ -1516,12 +1516,12 @@ namespace Microsoft.PowerShell.Commands
     internal class WmiDeviceGuard
     {
         public UInt32[] AvailableSecurityProperties;
-        public UInt32? CodeIntegrityPolicyEnforcementStatus;
-        public UInt32? UsermodeCodeIntegrityPolicyEnforcementStatus;
+        public uint? CodeIntegrityPolicyEnforcementStatus;
+        public uint? UsermodeCodeIntegrityPolicyEnforcementStatus;
         public UInt32[] RequiredSecurityProperties;
         public UInt32[] SecurityServicesConfigured;
         public UInt32[] SecurityServicesRunning;
-        public UInt32? VirtualizationBasedSecurityStatus;
+        public uint? VirtualizationBasedSecurityStatus;
 
         public DeviceGuard AsOutputType
         {
@@ -1590,9 +1590,9 @@ namespace Microsoft.PowerShell.Commands
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
     internal class WmiKeyboard
     {
-        public UInt16? Availability;
+        public ushort? Availability;
         public string Caption;
-        public UInt32? ConfigManagerErrorCode;
+        public uint? ConfigManagerErrorCode;
         public bool? ConfigManagerUserConfig;
         public string Description;
         public string DeviceID;
@@ -1600,16 +1600,16 @@ namespace Microsoft.PowerShell.Commands
         public string ErrorDescription;
         public DateTime? InstallDate;
         public bool? IsLocked;
-        public UInt32? LastErrorCode;
+        public uint? LastErrorCode;
         public string Layout;
         public string Name;
-        public UInt16? NumberOfFunctionKeys;
-        public UInt16? Password;
+        public ushort? NumberOfFunctionKeys;
+        public ushort? Password;
         public string PNPDeviceID;
         public UInt16[] PowerManagementCapabilities;
         public bool? PowerManagementSupported;
         public string Status;
-        public UInt16? StatusInfo;
+        public ushort? StatusInfo;
         public string SystemCreationClassName;
         public string SystemName;
     }
@@ -1618,7 +1618,7 @@ namespace Microsoft.PowerShell.Commands
     internal class WMiLogicalMemory
     {
         //TODO: fill this in!!!
-        public UInt32? TotalPhysicalMemory;
+        public uint? TotalPhysicalMemory;
     }
 
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
@@ -1629,76 +1629,76 @@ namespace Microsoft.PowerShell.Commands
         public DateTime? InstallDate;
         public string Name;
         public string Status;
-        public UInt16? Availability;
-        public UInt32? ConfigManagerErrorCode;
+        public ushort? Availability;
+        public uint? ConfigManagerErrorCode;
         public bool? ConfigManagerUserConfig;
         public string DeviceID;
         public bool? ErrorCleared;
         public string ErrorDescription;
-        public UInt32? LastErrorCode;
+        public uint? LastErrorCode;
         public string PNPDeviceID;
         public UInt16[] PowerManagementCapabilities;
         public bool? PowerManagementSupported;
-        public UInt16? StatusInfo;
+        public ushort? StatusInfo;
         public string SystemCreationClassName;
         public string SystemName;
-        public UInt64? Speed;
-        public UInt64? MaxSpeed;
-        public UInt64? RequestedSpeed;
-        public UInt16? UsageRestriction;
-        public UInt16? PortType;
+        public ulong? Speed;
+        public ulong? MaxSpeed;
+        public ulong? RequestedSpeed;
+        public ushort? UsageRestriction;
+        public ushort? PortType;
         public string OtherPortType;
         public string OtherNetworkPortType;
-        public UInt16? PortNumber;
-        public UInt16? LinkTechnology;
+        public ushort? PortNumber;
+        public ushort? LinkTechnology;
         public string OtherLinkTechnology;
         public string PermanentAddress;
         public string[] NetworkAddresses;
         public bool? FullDuplex;
         public bool? AutoSense;
-        public UInt64? SupportedMaximumTransmissionUnit;
-        public UInt64? ActiveMaximumTransmissionUnit;
+        public ulong? SupportedMaximumTransmissionUnit;
+        public ulong? ActiveMaximumTransmissionUnit;
         public string InterfaceDescription;
         public string InterfaceName;
-        public UInt64? NetLuid;
+        public ulong? NetLuid;
         public string InterfaceGuid;
-        public UInt32? InterfaceIndex;
+        public uint? InterfaceIndex;
         public string DeviceName;
-        public UInt32? NetLuidIndex;
+        public uint? NetLuidIndex;
         public bool? Virtual;
         public bool? Hidden;
         public bool? NotUserRemovable;
         public bool? IMFilter;
-        public UInt32? InterfaceType;
+        public uint? InterfaceType;
         public bool? HardwareInterface;
         public bool? WdmInterface;
         public bool? EndPointInterface;
         public bool? iSCSIInterface;
-        public UInt32? State;
-        public UInt32? NdisMedium;
-        public UInt32? NdisPhysicalMedium;
-        public UInt32? InterfaceOperationalStatus;
+        public uint? State;
+        public uint? NdisMedium;
+        public uint? NdisPhysicalMedium;
+        public uint? InterfaceOperationalStatus;
         public bool? OperationalStatusDownDefaultPortNotAuthenticated;
         public bool? OperationalStatusDownMediaDisconnected;
         public bool? OperationalStatusDownInterfacePaused;
         public bool? OperationalStatusDownLowPowerState;
-        public UInt32? InterfaceAdminStatus;
-        public UInt32? MediaConnectState;
-        public UInt32? MtuSize;
-        public UInt16? VlanID;
-        public UInt64? TransmitLinkSpeed;
-        public UInt64? ReceiveLinkSpeed;
+        public uint? InterfaceAdminStatus;
+        public uint? MediaConnectState;
+        public uint? MtuSize;
+        public ushort? VlanID;
+        public ulong? TransmitLinkSpeed;
+        public ulong? ReceiveLinkSpeed;
         public bool? PromiscuousMode;
         public bool? DeviceWakeUpEnable;
         public bool? ConnectorPresent;
-        public UInt32? MediaDuplexState;
+        public uint? MediaDuplexState;
         public string DriverDate;
-        public UInt64? DriverDateData;
+        public ulong? DriverDateData;
         public string DriverVersionString;
         public string DriverName;
         public string DriverDescription;
-        public UInt16? MajorDriverVersion;
-        public UInt16? MinorDriverVersion;
+        public ushort? MajorDriverVersion;
+        public ushort? MinorDriverVersion;
         public byte? DriverMajorNdisVersion;
         public byte? DriverMinorNdisVersion;
         public string PnPDeviceID;
@@ -1713,29 +1713,29 @@ namespace Microsoft.PowerShell.Commands
     internal class WmiNetworkAdapter
     {
         public string AdapterType;
-        public UInt16? AdapterTypeID;
+        public ushort? AdapterTypeID;
         public bool? AutoSense;
-        public UInt16? Availability;
+        public ushort? Availability;
         public string Caption;
-        public UInt32? ConfigManagerErrorCode;
+        public uint? ConfigManagerErrorCode;
         public bool? ConfigManagerUserConfig;
         public string Description;
         public string DeviceID;
         public bool? ErrorCleared;
         public string ErrorDescription;
         public string GUID;
-        public UInt32? Index;
+        public uint? Index;
         public DateTime? InstallDate;
         public bool? Installed;
-        public UInt32? InterfaceIndex;
-        public UInt32? LastErrorCode;
+        public uint? InterfaceIndex;
+        public uint? LastErrorCode;
         public string MACAddress;
         public string Manufacturer;
-        public UInt32? MaxNumberControlled;
-        public UInt64? MaxSpeed;
+        public uint? MaxNumberControlled;
+        public ulong? MaxSpeed;
         public string Name;
         public string NetConnectionID;
-        public UInt16? NetConnectionStatus;
+        public ushort? NetConnectionStatus;
         public bool? NetEnabled;
         public string[] NetworkAddresses;
         public string PermanentAddress;
@@ -1745,9 +1745,9 @@ namespace Microsoft.PowerShell.Commands
         public bool? PowerManagementSupported;
         public string ProductName;
         public string ServiceName;
-        public UInt64? Speed;
+        public ulong? Speed;
         public string Status;
-        public UInt16? StatusInfo;
+        public ushort? StatusInfo;
         public string SystemCreationClassName;
         public string SystemName;
         public DateTime? TimeOfLastReset;
@@ -1775,14 +1775,14 @@ namespace Microsoft.PowerShell.Commands
         public string DNSHostName;
         public string[] DNSServerSearchOrder;
         public bool? DomainDNSRegistrationEnabled;
-        public UInt32? ForwardBufferMemory;
+        public uint? ForwardBufferMemory;
         public bool? FullDNSRegistrationEnabled;
         public UInt16[] GatewayCostMetric;
         public byte? IGMPLevel;
-        public UInt32? Index;
-        public UInt32? InterfaceIndex;
+        public uint? Index;
+        public uint? InterfaceIndex;
         public string[] IPAddress;
-        public UInt32? IPConnectionMetric;
+        public uint? IPConnectionMetric;
         public bool? IPEnabled;
         public bool? IPFilterSecurityEnabled;
         public bool? IPPortSecurityEnabled;
@@ -1794,24 +1794,24 @@ namespace Microsoft.PowerShell.Commands
         public string IPXAddress;
         public bool? IPXEnabled;
         public UInt32[] IPXFrameType;
-        public UInt32? IPXMediaType;
+        public uint? IPXMediaType;
         public string[] IPXNetworkNumber;
         public string IPXVirtualNetNumber;
-        public UInt32? KeepAliveInterval;
-        public UInt32? KeepAliveTime;
+        public uint? KeepAliveInterval;
+        public uint? KeepAliveTime;
         public string MACAddress;
-        public UInt32? MTU;
-        public UInt32? NumForwardPackets;
+        public uint? MTU;
+        public uint? NumForwardPackets;
         public bool? PMTUBHDetectEnabled;
         public bool? PMTUDiscoveryEnabled;
         public string ServiceName;
         public string SettingID;
-        public UInt32? TcpipNetbiosOptions;
-        public UInt32? TcpMaxConnectRetransmissions;
-        public UInt32? TcpMaxDataRetransmissions;
-        public UInt32? TcpNumConnections;
+        public uint? TcpipNetbiosOptions;
+        public uint? TcpMaxConnectRetransmissions;
+        public uint? TcpMaxDataRetransmissions;
+        public uint? TcpNumConnections;
         public bool? TcpUseRFC1122UrgentPointer;
-        public UInt16? TcpWindowSize;
+        public ushort? TcpWindowSize;
         public bool? WINSEnableLMHostsLookup;
         public string WINSHostLookupFile;
         public string WINSPrimaryServer;
@@ -1839,47 +1839,47 @@ namespace Microsoft.PowerShell.Commands
         public bool? Debug;
         public string Description;
         public bool? Distributed;
-        public UInt32? EncryptionLevel;
+        public uint? EncryptionLevel;
         public byte? ForegroundApplicationBoost;
-        public UInt64? FreePhysicalMemory;
-        public UInt64? FreeSpaceInPagingFiles;
-        public UInt64? FreeVirtualMemory;
+        public ulong? FreePhysicalMemory;
+        public ulong? FreeSpaceInPagingFiles;
+        public ulong? FreeVirtualMemory;
         public DateTime? InstallDate;
         public DateTime? LastBootUpTime;
         public DateTime? LocalDateTime;
         public string Locale;
         public string Manufacturer;
-        public UInt32? MaxNumberOfProcesses;
-        public UInt64? MaxProcessMemorySize;
+        public uint? MaxNumberOfProcesses;
+        public ulong? MaxProcessMemorySize;
         public string[] MUILanguages;
         public string Name;
-        public UInt32? NumberOfLicensedUsers;
-        public UInt32? NumberOfProcesses;
-        public UInt32? NumberOfUsers;
-        public UInt32? OperatingSystemSKU;
+        public uint? NumberOfLicensedUsers;
+        public uint? NumberOfProcesses;
+        public uint? NumberOfUsers;
+        public uint? OperatingSystemSKU;
         public string Organization;
         public string OSArchitecture;
-        public UInt32? OSLanguage;
-        public UInt32? OSProductSuite;
-        public UInt16? OSType;
+        public uint? OSLanguage;
+        public uint? OSProductSuite;
+        public ushort? OSType;
         public string OtherTypeDescription;
         public bool? PAEEnabled;
         public bool? PortableOperatingSystem;
         public bool? Primary;
-        public UInt32? ProductType;
+        public uint? ProductType;
         public string RegisteredUser;
         public string SerialNumber;
-        public UInt16? ServicePackMajorVersion;
-        public UInt16? ServicePackMinorVersion;
-        public UInt64? SizeStoredInPagingFiles;
+        public ushort? ServicePackMajorVersion;
+        public ushort? ServicePackMinorVersion;
+        public ulong? SizeStoredInPagingFiles;
         public string Status;
-        public UInt32? SuiteMask;
+        public uint? SuiteMask;
         public string SystemDevice;
         public string SystemDirectory;
         public string SystemDrive;
-        public UInt64? TotalSwapSpaceSize;
-        public UInt64? TotalVirtualMemorySize;
-        public UInt64? TotalVisibleMemorySize;
+        public ulong? TotalSwapSpaceSize;
+        public ulong? TotalVirtualMemorySize;
+        public ulong? TotalVisibleMemorySize;
         public string Version;
         public string WindowsDirectory;
         #endregion Fields
@@ -1914,7 +1914,7 @@ namespace Microsoft.PowerShell.Commands
         #endregion Public Methods
 
         #region Private Methods
-        private OSProductSuite[] MakeProductSuites(UInt32? suiteMask)
+        private OSProductSuite[] MakeProductSuites(uint? suiteMask)
         {
             if (suiteMask == null)
                 return null;
@@ -1934,13 +1934,13 @@ namespace Microsoft.PowerShell.Commands
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
     internal class WmiPageFileUsage
     {
-        public UInt32? AllocatedBaseSize;
+        public uint? AllocatedBaseSize;
         public string Caption;
-        public UInt32? CurrentUsage;
+        public uint? CurrentUsage;
         public string Description;
         public DateTime? InstallDate;
         public string Name;
-        public UInt32? PeakUsage;
+        public uint? PeakUsage;
         public string Status;
         public bool? TempPageFile;
     }
@@ -1948,61 +1948,61 @@ namespace Microsoft.PowerShell.Commands
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
     internal class WmiProcessor
     {
-        public UInt16? AddressWidth;
-        public UInt16? Architecture;
+        public ushort? AddressWidth;
+        public ushort? Architecture;
         public string AssetTag;
-        public UInt16? Availability;
+        public ushort? Availability;
         public string Caption;
-        public UInt32? Characteristics;
-        public UInt32? ConfigManagerErrorCode;
+        public uint? Characteristics;
+        public uint? ConfigManagerErrorCode;
         public bool? ConfigManagerUserConfig;
-        public UInt16? CpuStatus;
-        public UInt32? CurrentClockSpeed;
-        public UInt16? CurrentVoltage;
-        public UInt16? DataWidth;
+        public ushort? CpuStatus;
+        public uint? CurrentClockSpeed;
+        public ushort? CurrentVoltage;
+        public ushort? DataWidth;
         public string Description;
         public string DeviceID;
         public bool? ErrorCleared;
         public string ErrorDescription;
-        public UInt32? ExtClock;
-        public UInt16? Family;
+        public uint? ExtClock;
+        public ushort? Family;
         public DateTime? InstallDate;
-        public UInt32? L2CacheSize;
-        public UInt32? L2CacheSpeed;
-        public UInt32? L3CacheSize;
-        public UInt32? L3CacheSpeed;
-        public UInt32? LastErrorCode;
-        public UInt16? Level;
-        public UInt16? LoadPercentage;
+        public uint? L2CacheSize;
+        public uint? L2CacheSpeed;
+        public uint? L3CacheSize;
+        public uint? L3CacheSpeed;
+        public uint? LastErrorCode;
+        public ushort? Level;
+        public ushort? LoadPercentage;
         public string Manufacturer;
-        public UInt32? MaxClockSpeed;
+        public uint? MaxClockSpeed;
         public string Name;
-        public UInt32? NumberOfCores;
-        public UInt32? NumberOfEnabledCore;
-        public UInt32? NumberOfLogicalProcessors;
+        public uint? NumberOfCores;
+        public uint? NumberOfEnabledCore;
+        public uint? NumberOfLogicalProcessors;
         public string OtherFamilyDescription;
         public string PartNumber;
         public string PNPDeviceID;
         public UInt16[] PowerManagementCapabilities;
         public bool? PowerManagementSupported;
         public string ProcessorId;
-        public UInt16? ProcessorType;
-        public UInt16? Revision;
+        public ushort? ProcessorType;
+        public ushort? Revision;
         public string Role;
         public bool? SecondLevelAddressTranslationExtensions;
         public string SerialNumber;
         public string SocketDesignation;
         public string Status;
-        public UInt16? StatusInfo;
+        public ushort? StatusInfo;
         public string Stepping;
         public string SystemName;
-        public UInt32? ThreadCount;
+        public uint? ThreadCount;
         public string UniqueId;
-        public UInt16? UpgradeMethod;
+        public ushort? UpgradeMethod;
         public string Version;
         public bool? VirtualizationFirmwareEnabled;
         public bool? VMMonitorModeExtensions;
-        public UInt32? VoltageCaps;
+        public uint? VoltageCaps;
     }
 
 #pragma warning restore 649
@@ -2168,26 +2168,26 @@ namespace Microsoft.PowerShell.Commands
         /// <summary>
         /// Address width of the processor
         /// </summary>
-        public UInt16? AddressWidth { get; internal set; }
+        public ushort? AddressWidth { get; internal set; }
         /// <summary>
         /// Data width of the processor
         /// </summary>
-        public UInt16? DataWidth { get; internal set; }
+        public ushort? DataWidth { get; internal set; }
         /// <summary>
         /// Maximum speed of the processor, in MHz
         /// </summary>
-        public UInt32? MaxClockSpeed { get; internal set; }
+        public uint? MaxClockSpeed { get; internal set; }
         /// <summary>
         /// Current speed of the processor, in MHz
         /// </summary>
-        public UInt32? CurrentClockSpeed { get; internal set; }
+        public uint? CurrentClockSpeed { get; internal set; }
         /// <summary>
         /// Number of cores for the current instance of the processor.
         /// </summary>
         /// <remarks>
         /// A core is a physical processor on the integrated circuit
         /// </remarks>
-        public UInt32? NumberOfCores { get; internal set; }
+        public uint? NumberOfCores { get; internal set; }
         /// <summary>
         /// Number of logical processors for the current instance of the processor.
         /// </summary>
@@ -2195,7 +2195,7 @@ namespace Microsoft.PowerShell.Commands
         /// For processors capable of hyperthreading, this value includes only the
         /// processors which have hyperthreading enabled
         /// </remarks>
-        public UInt32? NumberOfLogicalProcessors { get; internal set; }
+        public uint? NumberOfLogicalProcessors { get; internal set; }
         /// <summary>
         /// Processor information that describes the processor features.
         /// </summary>
@@ -2374,7 +2374,7 @@ namespace Microsoft.PowerShell.Commands
         /// Number of languages available for installation on this system.
         /// Language may determine properties such as the need for Unicode and bidirectional text
         /// </summary>
-        public UInt16? BiosInstallableLanguages { get; internal set; }
+        public ushort? BiosInstallableLanguages { get; internal set; }
 
         /// <summary>
         /// Date and time the object was installed.
@@ -2438,12 +2438,12 @@ namespace Microsoft.PowerShell.Commands
         /// <summary>
         /// SMBIOS major version number. This property is null if SMBIOS is not found
         /// </summary>
-        public UInt16? BiosSMBIOSMajorVersion { get; internal set; }
+        public ushort? BiosSMBIOSMajorVersion { get; internal set; }
 
         /// <summary>
         /// SMBIOS minor version number. This property is null if SMBIOS is not found
         /// </summary>
-        public UInt16? BiosSMBIOSMinorVersion { get; internal set; }
+        public ushort? BiosSMBIOSMinorVersion { get; internal set; }
 
         /// <summary>
         /// If true, the SMBIOS is available on this computer system
@@ -2463,17 +2463,17 @@ namespace Microsoft.PowerShell.Commands
         /// <summary>
         /// Major elease of the System BIOS
         /// </summary>
-        public UInt16? BiosSystemBiosMajorVersion { get; internal set; }
+        public ushort? BiosSystemBiosMajorVersion { get; internal set; }
 
         /// <summary>
         /// Minor release of the System BIOS
         /// </summary>
-        public UInt16? BiosSystemBiosMinorVersion { get; internal set; }
+        public ushort? BiosSystemBiosMinorVersion { get; internal set; }
 
         /// <summary>
         /// Target operating system
         /// </summary>
-        public UInt16? BiosTargetOperatingSystem { get; internal set; }
+        public ushort? BiosTargetOperatingSystem { get; internal set; }
 
         /// <summary>
         /// Version of the BIOS.
@@ -2664,7 +2664,7 @@ namespace Microsoft.PowerShell.Commands
         /// <summary>
         /// Number of logical processors available on the computer
         /// </summary>
-        public UInt32? CsNumberOfLogicalProcessors { get; internal set; }
+        public uint? CsNumberOfLogicalProcessors { get; internal set; }
 
         /// <summary>
         /// Number of physical processors currently available on a system.
@@ -2676,7 +2676,7 @@ namespace Microsoft.PowerShell.Commands
         /// then the value of CsNumberOfProcessors is 2 and CsNumberOfLogicalProcessors
         /// is 4. The processors may be multicore or they may be hyperthreading processors
         /// </remarks>
-        public UInt32? CsNumberOfProcessors { get; internal set; }
+        public uint? CsNumberOfProcessors { get; internal set; }
 
         /// <summary>
         /// Array of <see cref="Processor"/> objects describing each processor on the system.
@@ -2831,13 +2831,13 @@ namespace Microsoft.PowerShell.Commands
         /// return an accurate value for the physical memory. For example,
         /// it is not accurate if the BIOS is using some of the physical memory
         /// </remarks>
-        public UInt64? CsTotalPhysicalMemory { get; internal set; }
+        public ulong? CsTotalPhysicalMemory { get; internal set; }
 
         /// <summary>
         /// Size of physically installed memory, as reported by the Windows API
         /// function GetPhysicallyInstalledSystemMemory
         /// </summary>
-        public UInt64? CsPhysicallyInstalledMemory { get; internal set; }
+        public ulong? CsPhysicallyInstalledMemory { get; internal set; }
 
         /// <summary>
         /// Name of a user that is logged on currently.
@@ -3038,27 +3038,27 @@ namespace Microsoft.PowerShell.Commands
         /// physical memory, but what is reported to the operating system
         /// as available to it.
         /// </remarks>
-        public UInt64? OsTotalVisibleMemorySize { get; internal set; }
+        public ulong? OsTotalVisibleMemorySize { get; internal set; }
 
         /// <summary>
         /// Number, in kilobytes, of physical memory currently unused and available
         /// </summary>
-        public UInt64? OsFreePhysicalMemory { get; internal set; }
+        public ulong? OsFreePhysicalMemory { get; internal set; }
 
         /// <summary>
         /// Number, in kilobytes, of virtual memory
         /// </summary>
-        public UInt64? OsTotalVirtualMemorySize { get; internal set; }
+        public ulong? OsTotalVirtualMemorySize { get; internal set; }
 
         /// <summary>
         /// Number, in kilobytes, of virtual memory currently unused and available
         /// </summary>
-        public UInt64? OsFreeVirtualMemory { get; internal set; }
+        public ulong? OsFreeVirtualMemory { get; internal set; }
 
         /// <summary>
         /// Number, in kilobytes, of virtual memory currently in use
         /// </summary>
-        public UInt64? OsInUseVirtualMemory { get; internal set; }
+        public ulong? OsInUseVirtualMemory { get; internal set; }
 
         /// <summary>
         /// Total swap space in kilobytes
@@ -3070,7 +3070,7 @@ namespace Microsoft.PowerShell.Commands
         /// can be swapped out when the free page list falls and remains below
         /// a specified amount
         /// </remarks>
-        public UInt64? OsTotalSwapSpaceSize { get; internal set; }
+        public ulong? OsTotalSwapSpaceSize { get; internal set; }
 
         /// <summary>
         /// Total number of kilobytes that can be stored in the operating system
@@ -3078,13 +3078,13 @@ namespace Microsoft.PowerShell.Commands
         /// Be aware that this number does not represent the actual physical
         /// size of the paging file on disk
         /// </summary>
-        public UInt64? OsSizeStoredInPagingFiles { get; internal set; }
+        public ulong? OsSizeStoredInPagingFiles { get; internal set; }
 
         /// <summary>
         /// Number, in kilobytes, that can be mapped into the operating system
         /// paging files without causing any other pages to be swapped out
         /// </summary>
-        public UInt64? OsFreeSpaceInPagingFiles { get; internal set; }
+        public ulong? OsFreeSpaceInPagingFiles { get; internal set; }
 
         /// <summary>
         /// Array of fiel paths to the operating system's paging files
@@ -3111,12 +3111,12 @@ namespace Microsoft.PowerShell.Commands
         /// <summary>
         /// Maximum number of process contexts the operating system can support
         /// </summary>
-        public UInt32? OsMaxNumberOfProcesses { get; internal set; }
+        public uint? OsMaxNumberOfProcesses { get; internal set; }
 
         /// <summary>
         /// Maximum number, in kilobytes, of memory that can be allocated to a process
         /// </summary>
-        public UInt64? OsMaxProcessMemorySize { get; internal set; }
+        public ulong? OsMaxProcessMemorySize { get; internal set; }
 
         /// <summary>
         /// Array of Multilingual User Interface Pack (MUI Pack) languages installed
@@ -3128,18 +3128,18 @@ namespace Microsoft.PowerShell.Commands
         /// <summary>
         /// Number of user licenses for the operating system.
         /// </summary>
-        public UInt32? OsNumberOfLicensedUsers { get; internal set; }
+        public uint? OsNumberOfLicensedUsers { get; internal set; }
 
         /// <summary>
         /// Number of process contexts currently loaded or running on the operating system
         /// </summary>
-        public UInt32? OsNumberOfProcesses { get; internal set; }
+        public uint? OsNumberOfProcesses { get; internal set; }
 
         /// <summary>
         /// Number of user sessions for which the operating system is storing
         /// state information currently
         /// </summary>
-        public UInt32? OsNumberOfUsers { get; internal set; }
+        public uint? OsNumberOfUsers { get; internal set; }
 
         /// <summary>
         /// Company name for the registered user of the operating system
@@ -3204,12 +3204,12 @@ namespace Microsoft.PowerShell.Commands
         /// <summary>
         /// Major version of the service pack installed on the computer system
         /// </summary>
-        public UInt16? OsServicePackMajorVersion { get; internal set; }
+        public ushort? OsServicePackMajorVersion { get; internal set; }
 
         /// <summary>
         /// Minor version of the service pack installed on the computer system
         /// </summary>
-        public UInt16? OsServicePackMinorVersion { get; internal set; }
+        public ushort? OsServicePackMinorVersion { get; internal set; }
 
         /// <summary>
         /// Current status