diff --git a/core/Database.h b/core/Database.h
index f330f505f..a79085e7a 100644
--- a/core/Database.h
+++ b/core/Database.h
@@ -41,7 +41,7 @@
 #include "sm_memtable.h"
 #include <IThreader.h>
 #include <IPluginSys.h>
-#include <ke_thread_utils.h>
+#include <am-thread-utils.h>
 #include "sm_simple_prioqueue.h"
 
 using namespace SourceHook;
diff --git a/core/logic/ThreadSupport.h b/core/logic/ThreadSupport.h
index 9ee90e2d4..907c1d3fc 100644
--- a/core/logic/ThreadSupport.h
+++ b/core/logic/ThreadSupport.h
@@ -33,8 +33,8 @@
 #define _INCLUDE_SOURCEMOD_THREAD_SUPPORT_H
 
 #include <IThreader.h>
-#include <ke_thread_utils.h>
-#include <ke_utility.h>
+#include <am-thread-utils.h>
+#include <am-utility.h>
 
 using namespace SourceMod;
 
diff --git a/core/logic/thread/PosixThreads.h b/core/logic/thread/PosixThreads.h
index 824bdbc01..927bc11e5 100644
--- a/core/logic/thread/PosixThreads.h
+++ b/core/logic/thread/PosixThreads.h
@@ -33,7 +33,7 @@
 #define _INCLUDE_POSIXTHREADS_H_
 
 #include <pthread.h>
-#include <ke_thread_utils.h>
+#include <am-thread-utils.h>
 #include "IThreader.h"
 
 using namespace SourceMod;
diff --git a/extensions/clientprefs/extension.h b/extensions/clientprefs/extension.h
index 4fad5e18b..262d9c43b 100644
--- a/extensions/clientprefs/extension.h
+++ b/extensions/clientprefs/extension.h
@@ -39,7 +39,7 @@
 #include "smsdk_ext.h"
 #include "sh_list.h"
 
-#include <ke_thread_utils.h>
+#include <am-thread-utils.h>
 
 char * UTIL_strncpy(char * destination, const char * source, size_t num);
 
diff --git a/public/IThreader.h b/public/IThreader.h
index 684312175..ed9cb1aee 100644
--- a/public/IThreader.h
+++ b/public/IThreader.h
@@ -34,11 +34,12 @@
 
 /**
  * @file IThreader.h
- * @brief Contains platform independent routines for threading.
+ *
+ * @brief Contains platform independent routines for threading. These tools
+ * should be considered deprecated. Use public/amtl/am-thread-utils.h.
  */
 
 #include <IShareSys.h>
-#include <ke_thread_utils.h>
 
 #define SMINTERFACE_THREADER_NAME		"IThreader"
 #define SMINTERFACE_THREADER_VERSION	3
diff --git a/public/amtl/ke_allocator_policies.h b/public/amtl/am-allocator-policies.h
similarity index 100%
rename from public/amtl/ke_allocator_policies.h
rename to public/amtl/am-allocator-policies.h
diff --git a/public/amtl/ke_inline_list.h b/public/amtl/am-inline-list.h
similarity index 100%
rename from public/amtl/ke_inline_list.h
rename to public/amtl/am-inline-list.h
diff --git a/public/amtl/ke_thread_posix.h b/public/amtl/am-thread-posix.h
similarity index 100%
rename from public/amtl/ke_thread_posix.h
rename to public/amtl/am-thread-posix.h
diff --git a/public/amtl/ke_thread_utils.h b/public/amtl/am-thread-utils.h
similarity index 96%
rename from public/amtl/ke_thread_utils.h
rename to public/amtl/am-thread-utils.h
index 676c1ee5d..f8c55d138 100644
--- a/public/amtl/ke_thread_utils.h
+++ b/public/amtl/am-thread-utils.h
@@ -24,10 +24,16 @@
 #else
 # include <pthread.h>
 #endif
-#include <ke_utility.h>
+#include <am-utility.h>
 
 // Thread primitives for SourcePawn.
 //
+// Linking Requirements:
+// 
+// OS X: None (-lpthread and -ldl are optional)
+// Windows: None
+// Linux: -lpthread -lrt required
+//
 // -- Mutexes --
 //
 // A Lockable is a mutual exclusion primitive. It can be owned by at most one
@@ -238,9 +244,9 @@ class IRunnable
 
 // Include the actual thread implementations.
 #if defined(_MSC_VER)
-# include "ke_thread_windows.h"
+# include "am-thread-windows.h"
 #else
-# include "ke_thread_posix.h"
+# include "am-thread-posix.h"
 #endif
 
 #endif // _include_sourcepawn_threads_
diff --git a/public/amtl/ke_thread_windows.h b/public/amtl/am-thread-windows.h
similarity index 100%
rename from public/amtl/ke_thread_windows.h
rename to public/amtl/am-thread-windows.h
diff --git a/public/amtl/ke_utility.h b/public/amtl/am-utility.h
similarity index 100%
rename from public/amtl/ke_utility.h
rename to public/amtl/am-utility.h
diff --git a/public/amtl/ke_vector.h b/public/amtl/am-vector.h
similarity index 98%
rename from public/amtl/ke_vector.h
rename to public/amtl/am-vector.h
index c5ad0d40a..e028c5b21 100644
--- a/public/amtl/ke_vector.h
+++ b/public/amtl/am-vector.h
@@ -21,8 +21,8 @@
 
 #include <new>
 #include <stdlib.h>
-#include <ke_allocator_policies.h>
-#include <ke_utility.h>
+#include <am-allocator-policies.h>
+#include <am-utility.h>
 
 namespace ke {
 
diff --git a/public/jit/x86/assembler-x86.h b/public/jit/x86/assembler-x86.h
index 86f252056..2fa1a3800 100644
--- a/public/jit/x86/assembler-x86.h
+++ b/public/jit/x86/assembler-x86.h
@@ -32,7 +32,7 @@
 #define _include_sourcepawn_assembler_x86_h__
 
 #include <assembler.h>
-#include <ke_vector.h>
+#include <am-vector.h>
 #include <string.h>
 
 struct Register
diff --git a/public/jit/x86/macro-assembler-x86.h b/public/jit/x86/macro-assembler-x86.h
index 734018ca4..4d67c74c1 100644
--- a/public/jit/x86/macro-assembler-x86.h
+++ b/public/jit/x86/macro-assembler-x86.h
@@ -32,7 +32,7 @@
 #define _include_sourcepawn_macroassembler_x86h__
 
 #include <assembler.h>
-#include <ke_vector.h>
+#include <am-vector.h>
 #include <string.h>
 #include <assembler-x86.h>
 
diff --git a/sourcepawn/jit/BaseRuntime.h b/sourcepawn/jit/BaseRuntime.h
index 4c2f42540..c2fb4bf06 100644
--- a/sourcepawn/jit/BaseRuntime.h
+++ b/sourcepawn/jit/BaseRuntime.h
@@ -3,8 +3,8 @@
 #define _INCLUDE_SOURCEPAWN_JIT_RUNTIME_H_
 
 #include <sp_vm_api.h>
-#include <ke_vector.h>
-#include <ke_inline_list.h>
+#include <am-vector.h>
+#include <am-inline-list.h>
 #include "jit_shared.h"
 #include "sp_vm_function.h"
 
diff --git a/sourcepawn/jit/jit_function.h b/sourcepawn/jit/jit_function.h
index 5c6949c7e..814654251 100644
--- a/sourcepawn/jit/jit_function.h
+++ b/sourcepawn/jit/jit_function.h
@@ -3,7 +3,7 @@
 #define _INCLUDE_SOURCEPAWN_JIT2_FUNCTION_H_
 
 #include <sp_vm_types.h>
-#include <ke_vector.h>
+#include <am-vector.h>
 
 struct LoopEdge
 {
diff --git a/sourcepawn/jit/watchdog_timer.h b/sourcepawn/jit/watchdog_timer.h
index 67cd587bb..45d57eea3 100644
--- a/sourcepawn/jit/watchdog_timer.h
+++ b/sourcepawn/jit/watchdog_timer.h
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <ke_thread_utils.h>
+#include <am-thread-utils.h>
 
 typedef bool (*WatchdogCallback)();
 
diff --git a/sourcepawn/jit/x86/jit_x86.h b/sourcepawn/jit/x86/jit_x86.h
index fec3c4b82..bb308d0c7 100644
--- a/sourcepawn/jit/x86/jit_x86.h
+++ b/sourcepawn/jit/x86/jit_x86.h
@@ -21,13 +21,13 @@
 #include <sp_vm_api.h>
 #include <KeCodeAllocator.h>
 #include <macro-assembler-x86.h>
-#include <ke_vector.h>
+#include <am-vector.h>
 #include "jit_shared.h"
 #include "BaseRuntime.h"
 #include "sp_vm_basecontext.h"
 #include "jit_function.h"
 #include "opcodes.h"
-#include <ke_thread_utils.h>
+#include <am-thread-utils.h>
 
 using namespace SourcePawn;