diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamGameSearch.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamGameSearch.cs
index 7b7511c..f8428f1 100644
--- a/Facepunch.Steamworks/Generated/Interfaces/ISteamGameSearch.cs
+++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamGameSearch.cs
@@ -19,10 +19,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_AddGameSearchParams")]
-		private static extern EGameSearchErrorCode_t _AddGameSearchParams( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKeyToFind, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchValuesToFind );
+		private static extern GameSearchErrorCode_t _AddGameSearchParams( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKeyToFind, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchValuesToFind );
 		
 		#endregion
-		internal EGameSearchErrorCode_t AddGameSearchParams( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKeyToFind, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchValuesToFind )
+		internal GameSearchErrorCode_t AddGameSearchParams( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKeyToFind, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchValuesToFind )
 		{
 			var returnValue = _AddGameSearchParams( Self, pchKeyToFind, pchValuesToFind );
 			return returnValue;
@@ -30,10 +30,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_SearchForGameWithLobby")]
-		private static extern EGameSearchErrorCode_t _SearchForGameWithLobby( IntPtr self, SteamId steamIDLobby, int nPlayerMin, int nPlayerMax );
+		private static extern GameSearchErrorCode_t _SearchForGameWithLobby( IntPtr self, SteamId steamIDLobby, int nPlayerMin, int nPlayerMax );
 		
 		#endregion
-		internal EGameSearchErrorCode_t SearchForGameWithLobby( SteamId steamIDLobby, int nPlayerMin, int nPlayerMax )
+		internal GameSearchErrorCode_t SearchForGameWithLobby( SteamId steamIDLobby, int nPlayerMin, int nPlayerMax )
 		{
 			var returnValue = _SearchForGameWithLobby( Self, steamIDLobby, nPlayerMin, nPlayerMax );
 			return returnValue;
@@ -41,10 +41,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_SearchForGameSolo")]
-		private static extern EGameSearchErrorCode_t _SearchForGameSolo( IntPtr self, int nPlayerMin, int nPlayerMax );
+		private static extern GameSearchErrorCode_t _SearchForGameSolo( IntPtr self, int nPlayerMin, int nPlayerMax );
 		
 		#endregion
-		internal EGameSearchErrorCode_t SearchForGameSolo( int nPlayerMin, int nPlayerMax )
+		internal GameSearchErrorCode_t SearchForGameSolo( int nPlayerMin, int nPlayerMax )
 		{
 			var returnValue = _SearchForGameSolo( Self, nPlayerMin, nPlayerMax );
 			return returnValue;
@@ -52,10 +52,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_AcceptGame")]
-		private static extern EGameSearchErrorCode_t _AcceptGame( IntPtr self );
+		private static extern GameSearchErrorCode_t _AcceptGame( IntPtr self );
 		
 		#endregion
-		internal EGameSearchErrorCode_t AcceptGame()
+		internal GameSearchErrorCode_t AcceptGame()
 		{
 			var returnValue = _AcceptGame( Self );
 			return returnValue;
@@ -63,10 +63,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_DeclineGame")]
-		private static extern EGameSearchErrorCode_t _DeclineGame( IntPtr self );
+		private static extern GameSearchErrorCode_t _DeclineGame( IntPtr self );
 		
 		#endregion
-		internal EGameSearchErrorCode_t DeclineGame()
+		internal GameSearchErrorCode_t DeclineGame()
 		{
 			var returnValue = _DeclineGame( Self );
 			return returnValue;
@@ -74,10 +74,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_RetrieveConnectionDetails")]
-		private static extern EGameSearchErrorCode_t _RetrieveConnectionDetails( IntPtr self, SteamId steamIDHost, IntPtr pchConnectionDetails, int cubConnectionDetails );
+		private static extern GameSearchErrorCode_t _RetrieveConnectionDetails( IntPtr self, SteamId steamIDHost, IntPtr pchConnectionDetails, int cubConnectionDetails );
 		
 		#endregion
-		internal EGameSearchErrorCode_t RetrieveConnectionDetails( SteamId steamIDHost, out string pchConnectionDetails )
+		internal GameSearchErrorCode_t RetrieveConnectionDetails( SteamId steamIDHost, out string pchConnectionDetails )
 		{
 			IntPtr mempchConnectionDetails = Helpers.TakeMemory();
 			var returnValue = _RetrieveConnectionDetails( Self, steamIDHost, mempchConnectionDetails, (1024 * 32) );
@@ -87,10 +87,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_EndGameSearch")]
-		private static extern EGameSearchErrorCode_t _EndGameSearch( IntPtr self );
+		private static extern GameSearchErrorCode_t _EndGameSearch( IntPtr self );
 		
 		#endregion
-		internal EGameSearchErrorCode_t EndGameSearch()
+		internal GameSearchErrorCode_t EndGameSearch()
 		{
 			var returnValue = _EndGameSearch( Self );
 			return returnValue;
@@ -98,10 +98,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_SetGameHostParams")]
-		private static extern EGameSearchErrorCode_t _SetGameHostParams( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchValue );
+		private static extern GameSearchErrorCode_t _SetGameHostParams( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchValue );
 		
 		#endregion
-		internal EGameSearchErrorCode_t SetGameHostParams( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchValue )
+		internal GameSearchErrorCode_t SetGameHostParams( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchKey, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchValue )
 		{
 			var returnValue = _SetGameHostParams( Self, pchKey, pchValue );
 			return returnValue;
@@ -109,10 +109,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_SetConnectionDetails")]
-		private static extern EGameSearchErrorCode_t _SetConnectionDetails( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchConnectionDetails, int cubConnectionDetails );
+		private static extern GameSearchErrorCode_t _SetConnectionDetails( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchConnectionDetails, int cubConnectionDetails );
 		
 		#endregion
-		internal EGameSearchErrorCode_t SetConnectionDetails( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchConnectionDetails, int cubConnectionDetails )
+		internal GameSearchErrorCode_t SetConnectionDetails( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchConnectionDetails, int cubConnectionDetails )
 		{
 			var returnValue = _SetConnectionDetails( Self, pchConnectionDetails, cubConnectionDetails );
 			return returnValue;
@@ -120,10 +120,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_RequestPlayersForGame")]
-		private static extern EGameSearchErrorCode_t _RequestPlayersForGame( IntPtr self, int nPlayerMin, int nPlayerMax, int nMaxTeamSize );
+		private static extern GameSearchErrorCode_t _RequestPlayersForGame( IntPtr self, int nPlayerMin, int nPlayerMax, int nMaxTeamSize );
 		
 		#endregion
-		internal EGameSearchErrorCode_t RequestPlayersForGame( int nPlayerMin, int nPlayerMax, int nMaxTeamSize )
+		internal GameSearchErrorCode_t RequestPlayersForGame( int nPlayerMin, int nPlayerMax, int nMaxTeamSize )
 		{
 			var returnValue = _RequestPlayersForGame( Self, nPlayerMin, nPlayerMax, nMaxTeamSize );
 			return returnValue;
@@ -131,10 +131,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_HostConfirmGameStart")]
-		private static extern EGameSearchErrorCode_t _HostConfirmGameStart( IntPtr self, ulong ullUniqueGameID );
+		private static extern GameSearchErrorCode_t _HostConfirmGameStart( IntPtr self, ulong ullUniqueGameID );
 		
 		#endregion
-		internal EGameSearchErrorCode_t HostConfirmGameStart( ulong ullUniqueGameID )
+		internal GameSearchErrorCode_t HostConfirmGameStart( ulong ullUniqueGameID )
 		{
 			var returnValue = _HostConfirmGameStart( Self, ullUniqueGameID );
 			return returnValue;
@@ -142,10 +142,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_CancelRequestPlayersForGame")]
-		private static extern EGameSearchErrorCode_t _CancelRequestPlayersForGame( IntPtr self );
+		private static extern GameSearchErrorCode_t _CancelRequestPlayersForGame( IntPtr self );
 		
 		#endregion
-		internal EGameSearchErrorCode_t CancelRequestPlayersForGame()
+		internal GameSearchErrorCode_t CancelRequestPlayersForGame()
 		{
 			var returnValue = _CancelRequestPlayersForGame( Self );
 			return returnValue;
@@ -153,10 +153,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_SubmitPlayerResult")]
-		private static extern EGameSearchErrorCode_t _SubmitPlayerResult( IntPtr self, ulong ullUniqueGameID, SteamId steamIDPlayer, EPlayerResult_t EPlayerResult );
+		private static extern GameSearchErrorCode_t _SubmitPlayerResult( IntPtr self, ulong ullUniqueGameID, SteamId steamIDPlayer, PlayerResult_t EPlayerResult );
 		
 		#endregion
-		internal EGameSearchErrorCode_t SubmitPlayerResult( ulong ullUniqueGameID, SteamId steamIDPlayer, EPlayerResult_t EPlayerResult )
+		internal GameSearchErrorCode_t SubmitPlayerResult( ulong ullUniqueGameID, SteamId steamIDPlayer, PlayerResult_t EPlayerResult )
 		{
 			var returnValue = _SubmitPlayerResult( Self, ullUniqueGameID, steamIDPlayer, EPlayerResult );
 			return returnValue;
@@ -164,10 +164,10 @@ namespace Steamworks
 		
 		#region FunctionMeta
 		[DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameSearch_EndGame")]
-		private static extern EGameSearchErrorCode_t _EndGame( IntPtr self, ulong ullUniqueGameID );
+		private static extern GameSearchErrorCode_t _EndGame( IntPtr self, ulong ullUniqueGameID );
 		
 		#endregion
-		internal EGameSearchErrorCode_t EndGame( ulong ullUniqueGameID )
+		internal GameSearchErrorCode_t EndGame( ulong ullUniqueGameID )
 		{
 			var returnValue = _EndGame( Self, ullUniqueGameID );
 			return returnValue;
diff --git a/Generator/CodeWriter/Types/BaseType.cs b/Generator/CodeWriter/Types/BaseType.cs
index 991941e..2f34140 100644
--- a/Generator/CodeWriter/Types/BaseType.cs
+++ b/Generator/CodeWriter/Types/BaseType.cs
@@ -53,7 +53,6 @@ internal class BaseType
 		if ( basicType == "int64" ) return new LongType { NativeType = type, VarName = varname };
 		if ( basicType == "bool" ) return new BoolType { NativeType = type, VarName = varname };
 
-		if ( basicType.EndsWith( "_t" ) ) return new StructType { NativeType = type, VarName = varname, StructName = basicType };
 		if ( basicType == "InventoryItemId" ) return new StructType { NativeType = type, VarName = varname, StructName = basicType };
 		if ( basicType == "InventoryDefId" ) return new StructType { NativeType = type, VarName = varname, StructName = basicType };
 		if ( basicType == "PingLocation" ) return new StructType { NativeType = type, VarName = varname, StructName = basicType };
@@ -64,6 +63,7 @@ internal class BaseType
 		if ( basicType == "AnalogState" ) return new StructType { NativeType = type, VarName = varname, StructName = basicType };
 		if ( basicType == "MotionState" ) return new StructType { NativeType = type, VarName = varname, StructName = basicType };
 		if ( basicType.StartsWith( "E" ) && char.IsUpper( basicType[1] ) ) return new EnumType { NativeType = type.Substring( 1 ), VarName = varname };
+		if ( basicType.EndsWith( "_t" ) ) return new StructType { NativeType = type, VarName = varname, StructName = basicType };
 
 		return new BaseType { NativeType = type, VarName = varname };
 	}