diff --git a/Facepunch.Steamworks/Generated/SteamEnums.cs b/Facepunch.Steamworks/Generated/SteamEnums.cs
index 1281098..c38b9f2 100644
--- a/Facepunch.Steamworks/Generated/SteamEnums.cs
+++ b/Facepunch.Steamworks/Generated/SteamEnums.cs
@@ -9,16 +9,16 @@ namespace Steamworks
 	//
 	// ESteamIPType
 	//
-	internal enum SteamIPType : uint
+	internal enum SteamIPType : int
 	{
-		SteamIPType4 = 0,
-		SteamIPType6 = 1,
+		Type4 = 0,
+		Type6 = 1,
 	}
 	
 	//
 	// EUniverse
 	//
-	public enum Universe : uint
+	public enum Universe : int
 	{
 		Invalid = 0,
 		Public = 1,
@@ -31,7 +31,7 @@ public enum Universe : uint
 	//
 	// EResult
 	//
-	public enum Result : uint
+	public enum Result : int
 	{
 		None = 0,
 		OK = 1,
@@ -153,7 +153,7 @@ public enum Result : uint
 	//
 	// EVoiceResult
 	//
-	internal enum VoiceResult : uint
+	internal enum VoiceResult : int
 	{
 		OK = 0,
 		NotInitialized = 1,
@@ -170,7 +170,7 @@ internal enum VoiceResult : uint
 	//
 	// EDenyReason
 	//
-	internal enum DenyReason : uint
+	internal enum DenyReason : int
 	{
 		Invalid = 0,
 		InvalidVersion = 1,
@@ -193,7 +193,7 @@ internal enum DenyReason : uint
 	//
 	// EBeginAuthSessionResult
 	//
-	public enum BeginAuthResult : uint
+	public enum BeginAuthResult : int
 	{
 		OK = 0,
 		InvalidTicket = 1,
@@ -206,7 +206,7 @@ public enum BeginAuthResult : uint
 	//
 	// EAuthSessionResponse
 	//
-	public enum AuthResponse : uint
+	public enum AuthResponse : int
 	{
 		OK = 0,
 		UserNotConnectedToSteam = 1,
@@ -223,7 +223,7 @@ public enum AuthResponse : uint
 	//
 	// EUserHasLicenseForAppResult
 	//
-	public enum UserHasLicenseForAppResult : uint
+	public enum UserHasLicenseForAppResult : int
 	{
 		HasLicense = 0,
 		DoesNotHaveLicense = 1,
@@ -233,7 +233,7 @@ public enum UserHasLicenseForAppResult : uint
 	//
 	// EAccountType
 	//
-	internal enum AccountType : uint
+	internal enum AccountType : int
 	{
 		Invalid = 0,
 		Individual = 1,
@@ -252,7 +252,7 @@ internal enum AccountType : uint
 	//
 	// EAppReleaseState
 	//
-	internal enum AppReleaseState : uint
+	internal enum AppReleaseState : int
 	{
 		Unknown = 0,
 		Unavailable = 1,
@@ -264,7 +264,7 @@ internal enum AppReleaseState : uint
 	//
 	// EAppOwnershipFlags
 	//
-	internal enum AppOwnershipFlags : uint
+	internal enum AppOwnershipFlags : int
 	{
 		None = 0,
 		OwnsLicense = 1,
@@ -320,7 +320,7 @@ internal enum AppType : uint
 	//
 	// ESteamUserStatType
 	//
-	internal enum SteamUserStatType : uint
+	internal enum SteamUserStatType : int
 	{
 		INVALID = 0,
 		INT = 1,
@@ -334,7 +334,7 @@ internal enum SteamUserStatType : uint
 	//
 	// EChatEntryType
 	//
-	internal enum ChatEntryType : uint
+	internal enum ChatEntryType : int
 	{
 		Invalid = 0,
 		ChatMsg = 1,
@@ -353,7 +353,7 @@ internal enum ChatEntryType : uint
 	//
 	// EChatRoomEnterResponse
 	//
-	public enum RoomEnter : uint
+	public enum RoomEnter : int
 	{
 		Success = 1,
 		DoesntExist = 2,
@@ -372,7 +372,7 @@ public enum RoomEnter : uint
 	//
 	// EChatSteamIDInstanceFlags
 	//
-	internal enum ChatSteamIDInstanceFlags : uint
+	internal enum ChatSteamIDInstanceFlags : int
 	{
 		AccountInstanceMask = 4095,
 		InstanceFlagClan = 524288,
@@ -383,7 +383,7 @@ internal enum ChatSteamIDInstanceFlags : uint
 	//
 	// EMarketingMessageFlags
 	//
-	internal enum MarketingMessageFlags : uint
+	internal enum MarketingMessageFlags : int
 	{
 		None = 0,
 		HighPriority = 1,
@@ -396,7 +396,7 @@ internal enum MarketingMessageFlags : uint
 	//
 	// ENotificationPosition
 	//
-	public enum NotificationPosition : uint
+	public enum NotificationPosition : int
 	{
 		TopLeft = 0,
 		TopRight = 1,
@@ -407,7 +407,7 @@ public enum NotificationPosition : uint
 	//
 	// EBroadcastUploadResult
 	//
-	public enum BroadcastUploadResult : uint
+	public enum BroadcastUploadResult : int
 	{
 		None = 0,
 		OK = 1,
@@ -438,7 +438,7 @@ public enum BroadcastUploadResult : uint
 	//
 	// ELaunchOptionType
 	//
-	internal enum LaunchOptionType : uint
+	internal enum LaunchOptionType : int
 	{
 		None = 0,
 		Default = 1,
@@ -462,7 +462,7 @@ internal enum LaunchOptionType : uint
 	//
 	// EVRHMDType
 	//
-	internal enum VRHMDType : uint
+	internal enum VRHMDType : int
 	{
 		MDType_None = -1,
 		MDType_Unknown = 0,
@@ -502,7 +502,7 @@ internal enum VRHMDType : uint
 	//
 	// EMarketNotAllowedReasonFlags
 	//
-	internal enum MarketNotAllowedReasonFlags : uint
+	internal enum MarketNotAllowedReasonFlags : int
 	{
 		None = 0,
 		TemporaryFailure = 1,
@@ -526,7 +526,7 @@ internal enum MarketNotAllowedReasonFlags : uint
 	//
 	// EDurationControlProgress
 	//
-	internal enum DurationControlProgress : uint
+	internal enum DurationControlProgress : int
 	{
 		Progress_Full = 0,
 		Progress_Half = 1,
@@ -539,7 +539,7 @@ internal enum DurationControlProgress : uint
 	//
 	// EDurationControlNotification
 	//
-	internal enum DurationControlNotification : uint
+	internal enum DurationControlNotification : int
 	{
 		None = 0,
 		DurationControlNotification1Hour = 1,
@@ -554,7 +554,7 @@ internal enum DurationControlNotification : uint
 	//
 	// EGameIDType
 	//
-	internal enum GameIDType : uint
+	internal enum GameIDType : int
 	{
 		App = 0,
 		GameMod = 1,
@@ -565,7 +565,7 @@ internal enum GameIDType : uint
 	//
 	// EGameSearchErrorCode_t
 	//
-	internal enum GameSearchErrorCode_t : uint
+	internal enum GameSearchErrorCode_t : int
 	{
 		OK = 1,
 		Failed_Search_Already_In_Progress = 2,
@@ -581,7 +581,7 @@ internal enum GameSearchErrorCode_t : uint
 	//
 	// EPlayerResult_t
 	//
-	internal enum PlayerResult_t : uint
+	internal enum PlayerResult_t : int
 	{
 		FailedToConnect = 1,
 		Abandoned = 2,
@@ -593,7 +593,7 @@ internal enum PlayerResult_t : uint
 	//
 	// ESteamIPv6ConnectivityProtocol
 	//
-	internal enum SteamIPv6ConnectivityProtocol : uint
+	internal enum SteamIPv6ConnectivityProtocol : int
 	{
 		Invalid = 0,
 		HTTP = 1,
@@ -603,7 +603,7 @@ internal enum SteamIPv6ConnectivityProtocol : uint
 	//
 	// ESteamIPv6ConnectivityState
 	//
-	internal enum SteamIPv6ConnectivityState : uint
+	internal enum SteamIPv6ConnectivityState : int
 	{
 		Unknown = 0,
 		Good = 1,
@@ -613,7 +613,7 @@ internal enum SteamIPv6ConnectivityState : uint
 	//
 	// EFailureType
 	//
-	internal enum FailureType : uint
+	internal enum FailureType : int
 	{
 		FlushedCallbackQueue = 0,
 		PipeFail = 1,
@@ -622,7 +622,7 @@ internal enum FailureType : uint
 	//
 	// EFriendRelationship
 	//
-	public enum Relationship : uint
+	public enum Relationship : int
 	{
 		None = 0,
 		Blocked = 1,
@@ -638,7 +638,7 @@ public enum Relationship : uint
 	//
 	// EPersonaState
 	//
-	public enum FriendState : uint
+	public enum FriendState : int
 	{
 		Offline = 0,
 		Online = 1,
@@ -654,7 +654,7 @@ public enum FriendState : uint
 	//
 	// EFriendFlags
 	//
-	public enum FriendFlags : uint
+	public enum FriendFlags : int
 	{
 		None = 0,
 		Blocked = 1,
@@ -673,7 +673,7 @@ public enum FriendFlags : uint
 	//
 	// EUserRestriction
 	//
-	internal enum UserRestriction : uint
+	internal enum UserRestriction : int
 	{
 		None = 0,
 		Unknown = 1,
@@ -688,7 +688,7 @@ internal enum UserRestriction : uint
 	//
 	// EOverlayToStoreFlag
 	//
-	internal enum OverlayToStoreFlag : uint
+	internal enum OverlayToStoreFlag : int
 	{
 		None = 0,
 		AddToCart = 1,
@@ -698,7 +698,7 @@ internal enum OverlayToStoreFlag : uint
 	//
 	// EActivateGameOverlayToWebPageMode
 	//
-	internal enum ActivateGameOverlayToWebPageMode : uint
+	internal enum ActivateGameOverlayToWebPageMode : int
 	{
 		Default = 0,
 		Modal = 1,
@@ -707,7 +707,7 @@ internal enum ActivateGameOverlayToWebPageMode : uint
 	//
 	// EPersonaChange
 	//
-	internal enum PersonaChange : uint
+	internal enum PersonaChange : int
 	{
 		Name = 1,
 		Status = 2,
@@ -729,7 +729,7 @@ internal enum PersonaChange : uint
 	//
 	// ESteamAPICallFailure
 	//
-	internal enum SteamAPICallFailure : uint
+	internal enum SteamAPICallFailure : int
 	{
 		None = -1,
 		SteamGone = 0,
@@ -741,7 +741,7 @@ internal enum SteamAPICallFailure : uint
 	//
 	// EGamepadTextInputMode
 	//
-	public enum GamepadTextInputMode : uint
+	public enum GamepadTextInputMode : int
 	{
 		Normal = 0,
 		Password = 1,
@@ -750,7 +750,7 @@ public enum GamepadTextInputMode : uint
 	//
 	// EGamepadTextInputLineMode
 	//
-	public enum GamepadTextInputLineMode : uint
+	public enum GamepadTextInputLineMode : int
 	{
 		SingleLine = 0,
 		MultipleLines = 1,
@@ -759,7 +759,7 @@ public enum GamepadTextInputLineMode : uint
 	//
 	// ECheckFileSignature
 	//
-	public enum CheckFileSignature : uint
+	public enum CheckFileSignature : int
 	{
 		InvalidSignature = 0,
 		ValidSignature = 1,
@@ -771,7 +771,7 @@ public enum CheckFileSignature : uint
 	//
 	// EMatchMakingServerResponse
 	//
-	internal enum MatchMakingServerResponse : uint
+	internal enum MatchMakingServerResponse : int
 	{
 		ServerResponded = 0,
 		ServerFailedToRespond = 1,
@@ -781,7 +781,7 @@ internal enum MatchMakingServerResponse : uint
 	//
 	// ELobbyType
 	//
-	internal enum LobbyType : uint
+	internal enum LobbyType : int
 	{
 		Private = 0,
 		FriendsOnly = 1,
@@ -793,7 +793,7 @@ internal enum LobbyType : uint
 	//
 	// ELobbyComparison
 	//
-	internal enum LobbyComparison : uint
+	internal enum LobbyComparison : int
 	{
 		EqualToOrLessThan = -2,
 		LessThan = -1,
@@ -806,7 +806,7 @@ internal enum LobbyComparison : uint
 	//
 	// ELobbyDistanceFilter
 	//
-	internal enum LobbyDistanceFilter : uint
+	internal enum LobbyDistanceFilter : int
 	{
 		Close = 0,
 		Default = 1,
@@ -817,7 +817,7 @@ internal enum LobbyDistanceFilter : uint
 	//
 	// EChatMemberStateChange
 	//
-	internal enum ChatMemberStateChange : uint
+	internal enum ChatMemberStateChange : int
 	{
 		Entered = 1,
 		Left = 2,
@@ -829,7 +829,7 @@ internal enum ChatMemberStateChange : uint
 	//
 	// ESteamPartyBeaconLocationType
 	//
-	internal enum SteamPartyBeaconLocationType : uint
+	internal enum SteamPartyBeaconLocationType : int
 	{
 		Invalid = 0,
 		ChatGroup = 1,
@@ -839,7 +839,7 @@ internal enum SteamPartyBeaconLocationType : uint
 	//
 	// ESteamPartyBeaconLocationData
 	//
-	internal enum SteamPartyBeaconLocationData : uint
+	internal enum SteamPartyBeaconLocationData : int
 	{
 		Invalid = 0,
 		Name = 1,
@@ -851,7 +851,7 @@ internal enum SteamPartyBeaconLocationData : uint
 	//
 	// PlayerAcceptState_t
 	//
-	internal enum PlayerAcceptState_t : uint
+	internal enum PlayerAcceptState_t : int
 	{
 		Unknown = 0,
 		PlayerAccepted = 1,
@@ -877,7 +877,7 @@ internal enum RemoteStoragePlatform : uint
 	//
 	// ERemoteStoragePublishedFileVisibility
 	//
-	internal enum RemoteStoragePublishedFileVisibility : uint
+	internal enum RemoteStoragePublishedFileVisibility : int
 	{
 		Public = 0,
 		FriendsOnly = 1,
@@ -888,7 +888,7 @@ internal enum RemoteStoragePublishedFileVisibility : uint
 	//
 	// EWorkshopFileType
 	//
-	internal enum WorkshopFileType : uint
+	internal enum WorkshopFileType : int
 	{
 		First = 0,
 		Community = 0,
@@ -913,7 +913,7 @@ internal enum WorkshopFileType : uint
 	//
 	// EWorkshopVote
 	//
-	internal enum WorkshopVote : uint
+	internal enum WorkshopVote : int
 	{
 		Unvoted = 0,
 		For = 1,
@@ -924,7 +924,7 @@ internal enum WorkshopVote : uint
 	//
 	// EWorkshopFileAction
 	//
-	internal enum WorkshopFileAction : uint
+	internal enum WorkshopFileAction : int
 	{
 		Played = 0,
 		Completed = 1,
@@ -933,7 +933,7 @@ internal enum WorkshopFileAction : uint
 	//
 	// EWorkshopEnumerationType
 	//
-	internal enum WorkshopEnumerationType : uint
+	internal enum WorkshopEnumerationType : int
 	{
 		RankedByVote = 0,
 		Recent = 1,
@@ -947,7 +947,7 @@ internal enum WorkshopEnumerationType : uint
 	//
 	// EWorkshopVideoProvider
 	//
-	internal enum WorkshopVideoProvider : uint
+	internal enum WorkshopVideoProvider : int
 	{
 		None = 0,
 		Youtube = 1,
@@ -956,7 +956,7 @@ internal enum WorkshopVideoProvider : uint
 	//
 	// EUGCReadAction
 	//
-	internal enum UGCReadAction : uint
+	internal enum UGCReadAction : int
 	{
 		ontinueReadingUntilFinished = 0,
 		ontinueReading = 1,
@@ -966,7 +966,7 @@ internal enum UGCReadAction : uint
 	//
 	// ELeaderboardDataRequest
 	//
-	internal enum LeaderboardDataRequest : uint
+	internal enum LeaderboardDataRequest : int
 	{
 		Global = 0,
 		GlobalAroundUser = 1,
@@ -983,7 +983,7 @@ internal enum LeaderboardDataRequest : uint
 	//
 	// ELeaderboardUploadScoreMethod
 	//
-	internal enum LeaderboardUploadScoreMethod : uint
+	internal enum LeaderboardUploadScoreMethod : int
 	{
 		None = 0,
 		KeepBest = 1,
@@ -993,7 +993,7 @@ internal enum LeaderboardUploadScoreMethod : uint
 	//
 	// ERegisterActivationCodeResult
 	//
-	internal enum RegisterActivationCodeResult : uint
+	internal enum RegisterActivationCodeResult : int
 	{
 		ResultOK = 0,
 		ResultFail = 1,
@@ -1005,7 +1005,7 @@ internal enum RegisterActivationCodeResult : uint
 	//
 	// EP2PSessionError
 	//
-	public enum P2PSessionError : uint
+	public enum P2PSessionError : int
 	{
 		None = 0,
 		NotRunningApp = 1,
@@ -1018,7 +1018,7 @@ public enum P2PSessionError : uint
 	//
 	// EP2PSend
 	//
-	public enum P2PSend : uint
+	public enum P2PSend : int
 	{
 		Unreliable = 0,
 		UnreliableNoDelay = 1,
@@ -1029,7 +1029,7 @@ public enum P2PSend : uint
 	//
 	// ESNetSocketState
 	//
-	internal enum SNetSocketState : uint
+	internal enum SNetSocketState : int
 	{
 		Invalid = 0,
 		Connected = 1,
@@ -1047,7 +1047,7 @@ internal enum SNetSocketState : uint
 	//
 	// ESNetSocketConnectionType
 	//
-	internal enum SNetSocketConnectionType : uint
+	internal enum SNetSocketConnectionType : int
 	{
 		NotConnected = 0,
 		UDP = 1,
@@ -1057,7 +1057,7 @@ internal enum SNetSocketConnectionType : uint
 	//
 	// EVRScreenshotType
 	//
-	internal enum VRScreenshotType : uint
+	internal enum VRScreenshotType : int
 	{
 		None = 0,
 		Mono = 1,
@@ -1070,7 +1070,7 @@ internal enum VRScreenshotType : uint
 	//
 	// AudioPlayback_Status
 	//
-	public enum MusicStatus : uint
+	public enum MusicStatus : int
 	{
 		Undefined = 0,
 		Playing = 1,
@@ -1081,7 +1081,7 @@ public enum MusicStatus : uint
 	//
 	// EHTTPMethod
 	//
-	internal enum HTTPMethod : uint
+	internal enum HTTPMethod : int
 	{
 		Invalid = 0,
 		GET = 1,
@@ -1096,58 +1096,58 @@ internal enum HTTPMethod : uint
 	//
 	// EHTTPStatusCode
 	//
-	internal enum HTTPStatusCode : uint
+	internal enum HTTPStatusCode : int
 	{
 		Invalid = 0,
-		HTTPStatusCode100Continue = 100,
-		HTTPStatusCode101SwitchingProtocols = 101,
-		HTTPStatusCode200OK = 200,
-		HTTPStatusCode201Created = 201,
-		HTTPStatusCode202Accepted = 202,
-		HTTPStatusCode203NonAuthoritative = 203,
-		HTTPStatusCode204NoContent = 204,
-		HTTPStatusCode205ResetContent = 205,
-		HTTPStatusCode206PartialContent = 206,
-		HTTPStatusCode300MultipleChoices = 300,
-		HTTPStatusCode301MovedPermanently = 301,
-		HTTPStatusCode302Found = 302,
-		HTTPStatusCode303SeeOther = 303,
-		HTTPStatusCode304NotModified = 304,
-		HTTPStatusCode305UseProxy = 305,
-		HTTPStatusCode307TemporaryRedirect = 307,
-		HTTPStatusCode400BadRequest = 400,
-		HTTPStatusCode401Unauthorized = 401,
-		HTTPStatusCode402PaymentRequired = 402,
-		HTTPStatusCode403Forbidden = 403,
-		HTTPStatusCode404NotFound = 404,
-		HTTPStatusCode405MethodNotAllowed = 405,
-		HTTPStatusCode406NotAcceptable = 406,
-		HTTPStatusCode407ProxyAuthRequired = 407,
-		HTTPStatusCode408RequestTimeout = 408,
-		HTTPStatusCode409Conflict = 409,
-		HTTPStatusCode410Gone = 410,
-		HTTPStatusCode411LengthRequired = 411,
-		HTTPStatusCode412PreconditionFailed = 412,
-		HTTPStatusCode413RequestEntityTooLarge = 413,
-		HTTPStatusCode414RequestURITooLong = 414,
-		HTTPStatusCode415UnsupportedMediaType = 415,
-		HTTPStatusCode416RequestedRangeNotSatisfiable = 416,
-		HTTPStatusCode417ExpectationFailed = 417,
-		HTTPStatusCode4xxUnknown = 418,
-		HTTPStatusCode429TooManyRequests = 429,
-		HTTPStatusCode500InternalServerError = 500,
-		HTTPStatusCode501NotImplemented = 501,
-		HTTPStatusCode502BadGateway = 502,
-		HTTPStatusCode503ServiceUnavailable = 503,
-		HTTPStatusCode504GatewayTimeout = 504,
-		HTTPStatusCode505HTTPVersionNotSupported = 505,
-		HTTPStatusCode5xxUnknown = 599,
+		Code100Continue = 100,
+		Code101SwitchingProtocols = 101,
+		Code200OK = 200,
+		Code201Created = 201,
+		Code202Accepted = 202,
+		Code203NonAuthoritative = 203,
+		Code204NoContent = 204,
+		Code205ResetContent = 205,
+		Code206PartialContent = 206,
+		Code300MultipleChoices = 300,
+		Code301MovedPermanently = 301,
+		Code302Found = 302,
+		Code303SeeOther = 303,
+		Code304NotModified = 304,
+		Code305UseProxy = 305,
+		Code307TemporaryRedirect = 307,
+		Code400BadRequest = 400,
+		Code401Unauthorized = 401,
+		Code402PaymentRequired = 402,
+		Code403Forbidden = 403,
+		Code404NotFound = 404,
+		Code405MethodNotAllowed = 405,
+		Code406NotAcceptable = 406,
+		Code407ProxyAuthRequired = 407,
+		Code408RequestTimeout = 408,
+		Code409Conflict = 409,
+		Code410Gone = 410,
+		Code411LengthRequired = 411,
+		Code412PreconditionFailed = 412,
+		Code413RequestEntityTooLarge = 413,
+		Code414RequestURITooLong = 414,
+		Code415UnsupportedMediaType = 415,
+		Code416RequestedRangeNotSatisfiable = 416,
+		Code417ExpectationFailed = 417,
+		Code4xxUnknown = 418,
+		Code429TooManyRequests = 429,
+		Code500InternalServerError = 500,
+		Code501NotImplemented = 501,
+		Code502BadGateway = 502,
+		Code503ServiceUnavailable = 503,
+		Code504GatewayTimeout = 504,
+		Code505HTTPVersionNotSupported = 505,
+		Code5xxUnknown = 599,
 	}
 	
 	//
 	// EInputSourceMode
 	//
-	public enum InputSourceMode : uint
+	public enum InputSourceMode : int
 	{
 		None = 0,
 		Dpad = 1,
@@ -1171,7 +1171,7 @@ public enum InputSourceMode : uint
 	//
 	// EInputActionOrigin
 	//
-	internal enum InputActionOrigin : uint
+	internal enum InputActionOrigin : int
 	{
 		None = 0,
 		SteamController_A = 1,
@@ -1438,7 +1438,7 @@ internal enum InputActionOrigin : uint
 	//
 	// EXboxOrigin
 	//
-	internal enum XboxOrigin : uint
+	internal enum XboxOrigin : int
 	{
 		A = 0,
 		B = 1,
@@ -1474,7 +1474,7 @@ internal enum XboxOrigin : uint
 	//
 	// ESteamControllerPad
 	//
-	internal enum SteamControllerPad : uint
+	internal enum SteamControllerPad : int
 	{
 		Left = 0,
 		Right = 1,
@@ -1483,7 +1483,7 @@ internal enum SteamControllerPad : uint
 	//
 	// ESteamInputType
 	//
-	public enum InputType : uint
+	public enum InputType : int
 	{
 		Unknown = 0,
 		SteamController = 1,
@@ -1505,7 +1505,7 @@ public enum InputType : uint
 	//
 	// ESteamInputLEDFlag
 	//
-	internal enum SteamInputLEDFlag : uint
+	internal enum SteamInputLEDFlag : int
 	{
 		SetColor = 0,
 		RestoreUserDefault = 1,
@@ -1514,7 +1514,7 @@ internal enum SteamInputLEDFlag : uint
 	//
 	// EControllerActionOrigin
 	//
-	internal enum ControllerActionOrigin : uint
+	internal enum ControllerActionOrigin : int
 	{
 		None = 0,
 		A = 1,
@@ -1768,7 +1768,7 @@ internal enum ControllerActionOrigin : uint
 	//
 	// ESteamControllerLEDFlag
 	//
-	internal enum SteamControllerLEDFlag : uint
+	internal enum SteamControllerLEDFlag : int
 	{
 		SetColor = 0,
 		RestoreUserDefault = 1,
@@ -1777,7 +1777,7 @@ internal enum SteamControllerLEDFlag : uint
 	//
 	// EUGCMatchingUGCType
 	//
-	public enum UgcType : uint
+	public enum UgcType : int
 	{
 		Items = 0,
 		Items_Mtx = 1,
@@ -1798,7 +1798,7 @@ public enum UgcType : uint
 	//
 	// EUserUGCList
 	//
-	internal enum UserUGCList : uint
+	internal enum UserUGCList : int
 	{
 		Published = 0,
 		VotedOn = 1,
@@ -1814,7 +1814,7 @@ internal enum UserUGCList : uint
 	//
 	// EUserUGCListSortOrder
 	//
-	internal enum UserUGCListSortOrder : uint
+	internal enum UserUGCListSortOrder : int
 	{
 		CreationOrderDesc = 0,
 		CreationOrderAsc = 1,
@@ -1828,7 +1828,7 @@ internal enum UserUGCListSortOrder : uint
 	//
 	// EUGCQuery
 	//
-	internal enum UGCQuery : uint
+	internal enum UGCQuery : int
 	{
 		RankedByVote = 0,
 		RankedByPublicationDate = 1,
@@ -1854,7 +1854,7 @@ internal enum UGCQuery : uint
 	//
 	// EItemUpdateStatus
 	//
-	internal enum ItemUpdateStatus : uint
+	internal enum ItemUpdateStatus : int
 	{
 		Invalid = 0,
 		PreparingConfig = 1,
@@ -1867,7 +1867,7 @@ internal enum ItemUpdateStatus : uint
 	//
 	// EItemState
 	//
-	internal enum ItemState : uint
+	internal enum ItemState : int
 	{
 		None = 0,
 		Subscribed = 1,
@@ -1881,7 +1881,7 @@ internal enum ItemState : uint
 	//
 	// EItemStatistic
 	//
-	internal enum ItemStatistic : uint
+	internal enum ItemStatistic : int
 	{
 		NumSubscriptions = 0,
 		NumFavorites = 1,
@@ -1901,7 +1901,7 @@ internal enum ItemStatistic : uint
 	//
 	// EItemPreviewType
 	//
-	internal enum ItemPreviewType : uint
+	internal enum ItemPreviewType : int
 	{
 		Image = 0,
 		YouTubeVideo = 1,
@@ -1914,7 +1914,7 @@ internal enum ItemPreviewType : uint
 	//
 	// EHTMLMouseButton
 	//
-	internal enum HTMLMouseButton : uint
+	internal enum HTMLMouseButton : int
 	{
 		Left = 0,
 		Right = 1,
@@ -1924,7 +1924,7 @@ internal enum HTMLMouseButton : uint
 	//
 	// EMouseCursor
 	//
-	internal enum MouseCursor : uint
+	internal enum MouseCursor : int
 	{
 		user = 0,
 		none = 1,
@@ -1973,7 +1973,7 @@ internal enum MouseCursor : uint
 	//
 	// EHTMLKeyModifiers
 	//
-	internal enum HTMLKeyModifiers : uint
+	internal enum HTMLKeyModifiers : int
 	{
 		None = 0,
 		AltDown = 1,
@@ -1984,7 +1984,7 @@ internal enum HTMLKeyModifiers : uint
 	//
 	// ESteamItemFlags
 	//
-	internal enum SteamItemFlags : uint
+	internal enum SteamItemFlags : int
 	{
 		NoTrade = 1,
 		Removed = 256,
@@ -1994,7 +1994,7 @@ internal enum SteamItemFlags : uint
 	//
 	// ESteamTVRegionBehavior
 	//
-	internal enum SteamTVRegionBehavior : uint
+	internal enum SteamTVRegionBehavior : int
 	{
 		Invalid = -1,
 		Hover = 0,
@@ -2005,7 +2005,7 @@ internal enum SteamTVRegionBehavior : uint
 	//
 	// EParentalFeature
 	//
-	public enum ParentalFeature : uint
+	public enum ParentalFeature : int
 	{
 		Invalid = 0,
 		Store = 1,
@@ -2027,7 +2027,7 @@ public enum ParentalFeature : uint
 	//
 	// ESteamDeviceFormFactor
 	//
-	internal enum SteamDeviceFormFactor : uint
+	internal enum SteamDeviceFormFactor : int
 	{
 		Unknown = 0,
 		Phone = 1,
@@ -2039,7 +2039,7 @@ internal enum SteamDeviceFormFactor : uint
 	//
 	// ESteamNetworkingAvailability
 	//
-	internal enum SteamNetworkingAvailability : uint
+	internal enum SteamNetworkingAvailability : int
 	{
 		CannotTry = -102,
 		Failed = -101,
@@ -2056,7 +2056,7 @@ internal enum SteamNetworkingAvailability : uint
 	//
 	// ESteamNetworkingIdentityType
 	//
-	internal enum NetIdentityType : uint
+	internal enum NetIdentityType : int
 	{
 		Invalid = 0,
 		SteamID = 16,
@@ -2071,7 +2071,7 @@ internal enum NetIdentityType : uint
 	//
 	// ESteamNetworkingConnectionState
 	//
-	internal enum ConnectionState : uint
+	internal enum ConnectionState : int
 	{
 		None = 0,
 		Connecting = 1,
@@ -2088,7 +2088,7 @@ internal enum ConnectionState : uint
 	//
 	// ESteamNetConnectionEnd
 	//
-	internal enum SteamNetConnectionEnd : uint
+	internal enum SteamNetConnectionEnd : int
 	{
 		Invalid = 0,
 		App_Min = 1000,
@@ -2126,7 +2126,7 @@ internal enum SteamNetConnectionEnd : uint
 	//
 	// ESteamNetworkingConfigScope
 	//
-	internal enum NetScope : uint
+	internal enum NetScope : int
 	{
 		_Global = 1,
 		_SocketsInterface = 2,
@@ -2138,7 +2138,7 @@ internal enum NetScope : uint
 	//
 	// ESteamNetworkingConfigDataType
 	//
-	internal enum NetConfigType : uint
+	internal enum NetConfigType : int
 	{
 		_Int32 = 1,
 		_Int64 = 2,
@@ -2151,7 +2151,7 @@ internal enum NetConfigType : uint
 	//
 	// ESteamNetworkingConfigValue
 	//
-	internal enum NetConfig : uint
+	internal enum NetConfig : int
 	{
 		_Invalid = 0,
 		_FakePacketLoss_Send = 2,
@@ -2195,7 +2195,7 @@ internal enum NetConfig : uint
 	//
 	// ESteamNetworkingGetConfigValueResult
 	//
-	internal enum NetConfigResult : uint
+	internal enum NetConfigResult : int
 	{
 		_BadValue = -1,
 		_BadScopeObj = -2,
@@ -2208,7 +2208,7 @@ internal enum NetConfigResult : uint
 	//
 	// ESteamNetworkingSocketsDebugOutputType
 	//
-	internal enum DebugOutputType : uint
+	internal enum DebugOutputType : int
 	{
 		None = 0,
 		Bug = 1,
@@ -2225,7 +2225,7 @@ internal enum DebugOutputType : uint
 	//
 	// EServerMode
 	//
-	internal enum ServerMode : uint
+	internal enum ServerMode : int
 	{
 		Invalid = 0,
 		NoAuthentication = 1,
diff --git a/Generator/CodeWriter/Enums.cs b/Generator/CodeWriter/Enums.cs
index 1fbc975..533a5ae 100644
--- a/Generator/CodeWriter/Enums.cs
+++ b/Generator/CodeWriter/Enums.cs
@@ -30,7 +30,16 @@ private void Enums()
 				if ( !Cleanup.ShouldCreate( name ) )
 					continue;
 
-                StartBlock( $"{Cleanup.Expose( name )} enum {name} : uint" );
+                var lowest = o.Values.Min( x => long.Parse( x.Value ) );
+                var highest = o.Values.Max( x => long.Parse( x.Value ) );
+
+                var t = "int";
+
+                if ( highest > int.MaxValue )
+                    t = "uint";
+
+
+                StartBlock( $"{Cleanup.Expose( name )} enum {name} : {t}" );
                 {
                     //
                     // If all the enum values start with the same 
@@ -66,7 +75,14 @@ private void Enums()
                         // So just stick the enum name on the front
                         //
                         if ( char.IsNumber( ename[0] ) )
-                            ename = name + ename;
+                        {
+                            var p = name;
+
+                            if ( p == "HTTPStatusCode" ) p = "Code";
+                            if ( p == "SteamIPType" ) p = "Type";
+
+                            ename = p + ename;
+                        }
 
                         WriteLine( $"{ename} = {entry.Value}," );
                     }