diff --git a/amxmodx/CDataPack.h b/amxmodx/CDataPack.h
index 76a65418..bd2c249a 100644
--- a/amxmodx/CDataPack.h
+++ b/amxmodx/CDataPack.h
@@ -175,7 +175,7 @@ private:
 	};
 };
 
-extern Handle<CDataPack> DataPackHandles;
+extern NativeHandle<CDataPack> DataPackHandles;
 extern AMX_NATIVE_INFO g_DatapackNatives[];
 
 #endif //_INCLUDE_SOURCEMOD_CDATAPACK_H_
diff --git a/amxmodx/CEvent.cpp b/amxmodx/CEvent.cpp
index 41b88aa8..5cd32e86 100755
--- a/amxmodx/CEvent.cpp
+++ b/amxmodx/CEvent.cpp
@@ -14,7 +14,7 @@
 // class ClEvent
 // *****************************************************
 
-Handle<EventHook> EventHandles;
+NativeHandle<EventHook> EventHandles;
 
 EventsMngr::ClEvent::ClEvent(CPluginMngr::CPlugin* plugin, int func, int flags)
 {
diff --git a/amxmodx/CEvent.h b/amxmodx/CEvent.h
index c406252f..d94b7c2d 100755
--- a/amxmodx/CEvent.h
+++ b/amxmodx/CEvent.h
@@ -158,6 +158,6 @@ struct EventHook
 	EventsMngr::ClEvent *m_event;
 };
 
-extern Handle<EventHook> EventHandles;
+extern NativeHandle<EventHook> EventHandles;
 
 #endif //__CEVENTS_H__
diff --git a/amxmodx/datapacks.cpp b/amxmodx/datapacks.cpp
index 64ef6369..a525e752 100644
--- a/amxmodx/datapacks.cpp
+++ b/amxmodx/datapacks.cpp
@@ -29,7 +29,7 @@
 
 #include "CDataPack.h"
 
-Handle<CDataPack> DataPackHandles;
+NativeHandle<CDataPack> DataPackHandles;
 
 static cell AMX_NATIVE_CALL CreateDataPack(AMX* amx, cell* params)
 {
diff --git a/amxmodx/datastructs.cpp b/amxmodx/datastructs.cpp
index 9e38cd06..bb752fe3 100644
--- a/amxmodx/datastructs.cpp
+++ b/amxmodx/datastructs.cpp
@@ -11,7 +11,7 @@
 #include "datastructs.h"
 #include <am-utility.h>
 
-Handle<CellArray> ArrayHandles;
+NativeHandle<CellArray> ArrayHandles;
 
 // Array:ArrayCreate(cellsize=1, reserved=32);
 static cell AMX_NATIVE_CALL ArrayCreate(AMX* amx, cell* params)
diff --git a/amxmodx/datastructs.h b/amxmodx/datastructs.h
index f15041ec..ef855701 100644
--- a/amxmodx/datastructs.h
+++ b/amxmodx/datastructs.h
@@ -185,6 +185,6 @@ private:
 	size_t m_Size;
 };
 
-extern Handle<CellArray> ArrayHandles;
+extern NativeHandle<CellArray> ArrayHandles;
 
 #endif
diff --git a/amxmodx/gameconfigs.cpp b/amxmodx/gameconfigs.cpp
index b8768c82..d374f6d2 100644
--- a/amxmodx/gameconfigs.cpp
+++ b/amxmodx/gameconfigs.cpp
@@ -11,7 +11,7 @@
 #include "amxmodx.h"
 #include "CGameConfigs.h"
 
-Handle<GameConfigNative> GameConfigHandle;
+NativeHandle<GameConfigNative> GameConfigHandle;
 
 // native GameConfig:LoadGameConfigFile(const file[]);
 static cell AMX_NATIVE_CALL LoadGameConfigFile(AMX *amx, cell *params)
diff --git a/amxmodx/gameconfigs.h b/amxmodx/gameconfigs.h
index aed9434f..44e08ac0 100644
--- a/amxmodx/gameconfigs.h
+++ b/amxmodx/gameconfigs.h
@@ -15,4 +15,4 @@ struct GameConfigNative
 	IGameConfig *m_config;
 };
 
-extern Handle<GameConfigNative> GameConfigHandle;
+extern NativeHandle<GameConfigNative> GameConfigHandle;
diff --git a/amxmodx/natives_handles.h b/amxmodx/natives_handles.h
index 2e84030d..bd586c00 100644
--- a/amxmodx/natives_handles.h
+++ b/amxmodx/natives_handles.h
@@ -7,8 +7,8 @@
 // Additional exceptions apply. For full license details, see LICENSE.txt or visit:
 //     https://alliedmods.net/amxmodx-license
 
-#ifndef _NATIVES_HANDLES_H_
-#define _NATIVES_HANDLES_H_
+#ifndef _NATIVES_NATIVES_HANDLES_H_
+#define _NATIVES_NATIVES_HANDLES_H_
 
 #include <am-vector.h>
 
@@ -18,7 +18,7 @@
 //       on accident.
 
 template <typename T>
-class Handle
+class NativeHandle
 {
 	private:
 
@@ -26,8 +26,8 @@ class Handle
 
 	public:
 
-		Handle() {}
-		~Handle()
+		NativeHandle() {}
+		~NativeHandle()
 		{
 			this->clear();
 		}
@@ -113,4 +113,4 @@ class Handle
 		}
 };
 
-#endif // _NATIVE_HANDLES_H_
+#endif // _NATIVES_NATIVES_HANDLES_H_
diff --git a/amxmodx/textparse.cpp b/amxmodx/textparse.cpp
index 22b86e82..588f6a61 100644
--- a/amxmodx/textparse.cpp
+++ b/amxmodx/textparse.cpp
@@ -11,7 +11,7 @@
 
 #include "textparse.h"
 
-Handle<ParseInfo> TextParsersHandles;
+NativeHandle<ParseInfo> TextParsersHandles;
 
 cell createParser()
 {
diff --git a/amxmodx/textparse.h b/amxmodx/textparse.h
index 81347232..9e5e37c8 100644
--- a/amxmodx/textparse.h
+++ b/amxmodx/textparse.h
@@ -132,6 +132,6 @@ public:
 	int handle;
 };
 
-extern Handle<ParseInfo> TextParsersHandles;
+extern NativeHandle<ParseInfo> TextParsersHandles;
 
 #endif // _INCLUDE_TEXTPARSE_H_
\ No newline at end of file
diff --git a/amxmodx/trie_natives.cpp b/amxmodx/trie_natives.cpp
index e36432f6..b1af84ad 100644
--- a/amxmodx/trie_natives.cpp
+++ b/amxmodx/trie_natives.cpp
@@ -9,8 +9,8 @@
 
 #include "trie_natives.h"
 
-Handle<CellTrie> TrieHandles;
-Handle<TrieSnapshot> TrieSnapshotHandles;
+NativeHandle<CellTrie> TrieHandles;
+NativeHandle<TrieSnapshot> TrieSnapshotHandles;
 
 // native Trie:TrieCreate();
 static cell AMX_NATIVE_CALL TrieCreate(AMX *amx, cell *params)
diff --git a/amxmodx/trie_natives.h b/amxmodx/trie_natives.h
index 4ef51cd3..668f1a1b 100644
--- a/amxmodx/trie_natives.h
+++ b/amxmodx/trie_natives.h
@@ -159,8 +159,8 @@ struct TrieSnapshot
 	BaseStringTable strings;
 };
 
-extern Handle<CellTrie> TrieHandles;
-extern Handle<TrieSnapshot> TrieSnapshotHandles;
+extern NativeHandle<CellTrie> TrieHandles;
+extern NativeHandle<TrieSnapshot> TrieSnapshotHandles;
 extern AMX_NATIVE_INFO trie_Natives[];
 
 #endif