diff --git a/core/ChatTriggers.h b/core/ChatTriggers.h
index a715ab44..c968b773 100644
--- a/core/ChatTriggers.h
+++ b/core/ChatTriggers.h
@@ -68,7 +68,7 @@ private:
 	bool ClientIsFlooding(int client);
 	cell_t CallOnClientSayCommand(int client);
 private:
-	ke::Vector<ke::Ref<CommandHook>> hooks_;
+	ke::Vector<ke::RefPtr<CommandHook>> hooks_;
 	ke::AString m_PubTrigger;
 	ke::AString m_PrivTrigger;
 	bool m_bWillProcessInPost;
diff --git a/core/ConCmdManager.cpp b/core/ConCmdManager.cpp
index 41762ae5..cbdaea2f 100644
--- a/core/ConCmdManager.cpp
+++ b/core/ConCmdManager.cpp
@@ -356,7 +356,7 @@ bool ConCmdManager::AddAdminCommand(IPluginFunction *pFunction,
 			return false;
 		i->value = new CommandGroup();
 	}
-	Ref<CommandGroup> cmdgroup = i->value;
+	RefPtr<CommandGroup> cmdgroup = i->value;
 
 	CmdHook *pHook = new CmdHook(CmdHook::Client, pInfo, pFunction, description);
 	pHook->admin = new AdminCmdInfo(cmdgroup, adminflags);
@@ -488,7 +488,7 @@ void ConCmdManager::UpdateAdminCmdFlags(const char *cmd, OverrideType type, Flag
 		if (!r.found())
 			return;
 
-		Ref<CommandGroup> group(r->value);
+		RefPtr<CommandGroup> group(r->value);
 
 		for (PluginHookList::iterator iter = group->hooks.begin(); iter != group->hooks.end(); iter++)
 		{
diff --git a/core/ConCmdManager.h b/core/ConCmdManager.h
index 55be1912..32ba4051 100644
--- a/core/ConCmdManager.h
+++ b/core/ConCmdManager.h
@@ -59,13 +59,13 @@ struct CommandGroup : public ke::Refcounted<CommandGroup>
 
 struct AdminCmdInfo
 {
-	AdminCmdInfo(const ke::Ref<CommandGroup> &group, FlagBits flags)
+	AdminCmdInfo(const ke::RefPtr<CommandGroup> &group, FlagBits flags)
 		: group(group),
 		  flags(flags),
 		  eflags(0)
 	{
 	}
-	ke::Ref<CommandGroup> group;
+	ke::RefPtr<CommandGroup> group;
 	FlagBits flags;			/* default flags */
 	FlagBits eflags;		/* effective flags */
 };
@@ -106,7 +106,7 @@ struct ConCmdInfo
 	ConCommand *pCmd;				/**< Pointer to the command itself */
 	CmdHookList hooks;				/**< Hook list */
 	FlagBits eflags;				/**< Effective admin flags */
-	ke::Ref<CommandHook> sh_hook;   /**< SourceHook hook, if any. */
+	ke::RefPtr<CommandHook> sh_hook;   /**< SourceHook hook, if any. */
 };
 
 typedef List<ConCmdInfo *> ConCmdList;
@@ -161,7 +161,7 @@ public:
 		return m_CmdList;
 	}
 private:
-	typedef StringHashMap<ke::Ref<CommandGroup> > GroupMap;
+	typedef StringHashMap<ke::RefPtr<CommandGroup> > GroupMap;
 
 	StringHashMap<ConCmdInfo *> m_Cmds; /* command lookup */
 	GroupMap m_CmdGrps;				/* command group map */
diff --git a/core/HalfLife2.cpp b/core/HalfLife2.cpp
index 80fe15b3..405360ee 100644
--- a/core/HalfLife2.cpp
+++ b/core/HalfLife2.cpp
@@ -226,7 +226,7 @@ void CHalfLife2::InitCommandLine()
 #if SOURCE_ENGINE != SE_DARKMESSIAH
 	if (g_SMAPI->GetSourceEngineBuild() != SOURCE_ENGINE_ORIGINAL)
 	{
-		ke::Ref<ke::SharedLib> lib = ke::SharedLib::Open(TIER0_NAME, error, sizeof(error));
+		ke::RefPtr<ke::SharedLib> lib = ke::SharedLib::Open(TIER0_NAME, error, sizeof(error));
 		if (!lib) {
 			logger->LogError("Could not load %s: %s", TIER0_NAME, error);
 			return;
@@ -243,7 +243,7 @@ void CHalfLife2::InitCommandLine()
 	else
 #endif
 	{
-		ke::Ref<ke::SharedLib> lib = ke::SharedLib::Open(VSTDLIB_NAME, error, sizeof(error));
+		ke::RefPtr<ke::SharedLib> lib = ke::SharedLib::Open(VSTDLIB_NAME, error, sizeof(error));
 		if (!lib) {
 			logger->LogError("Could not load %s: %s", VSTDLIB_NAME, error);
 			return;
diff --git a/core/logic/LibrarySys.cpp b/core/logic/LibrarySys.cpp
index 69f2077c..c0a383e1 100644
--- a/core/logic/LibrarySys.cpp
+++ b/core/logic/LibrarySys.cpp
@@ -41,7 +41,7 @@
 
 LibrarySystem g_LibSys;
 
-CLibrary::CLibrary(ke::Ref<ke::SharedLib> lib)
+CLibrary::CLibrary(ke::RefPtr<ke::SharedLib> lib)
  : lib_(lib)
 {
 }
@@ -241,7 +241,7 @@ void LibrarySystem::CloseDirectory(IDirectory *dir)
 
 ILibrary *LibrarySystem::OpenLibrary(const char *path, char *error, size_t maxlength)
 {
-	ke::Ref<ke::SharedLib> lib = ke::SharedLib::Open(path, error, maxlength);
+	ke::RefPtr<ke::SharedLib> lib = ke::SharedLib::Open(path, error, maxlength);
 	if (!lib)
 		return nullptr;
 	return new CLibrary(lib);
diff --git a/core/logic/LibrarySys.h b/core/logic/LibrarySys.h
index bdb48774..50bff3d4 100644
--- a/core/logic/LibrarySys.h
+++ b/core/logic/LibrarySys.h
@@ -66,12 +66,12 @@ private:
 class CLibrary : public ILibrary
 {
 public:
-	CLibrary(ke::Ref<ke::SharedLib> lib);
+	CLibrary(ke::RefPtr<ke::SharedLib> lib);
 public:
 	void CloseLibrary() override;
 	void *GetSymbolAddress(const char *symname) override;
 private:
-	ke::Ref<ke::SharedLib> lib_;
+	ke::RefPtr<ke::SharedLib> lib_;
 };
 
 class LibrarySystem : public ILibrarySys
diff --git a/core/logic/Native.h b/core/logic/Native.h
index cd86f528..3ac2aa9a 100644
--- a/core/logic/Native.h
+++ b/core/logic/Native.h
@@ -89,7 +89,7 @@ struct Native : public ke::Refcounted<Native>
 		return fake->name.chars();
 	}
 
-	static inline bool matches(const char *name, const ke::Ref<Native> &entry)
+	static inline bool matches(const char *name, const ke::RefPtr<Native> &entry)
 	{
 		return strcmp(name, entry->name()) == 0;
 	}
diff --git a/core/logic/NativeOwner.h b/core/logic/NativeOwner.h
index f55d954b..b09350cd 100644
--- a/core/logic/NativeOwner.h
+++ b/core/logic/NativeOwner.h
@@ -81,7 +81,7 @@ protected:
 	unsigned int m_nMarkSerial;
 	List<WeakNative> m_WeakRefs;
 	ke::Vector<const sp_nativeinfo_t *> m_natives;
-	ke::Vector<ke::Ref<Native> > m_fakes;
+	ke::Vector<ke::RefPtr<Native> > m_fakes;
 };
 
 extern CNativeOwner g_CoreNatives;
diff --git a/core/logic/PluginSys.cpp b/core/logic/PluginSys.cpp
index dd5d3f46..c820ddf8 100644
--- a/core/logic/PluginSys.cpp
+++ b/core/logic/PluginSys.cpp
@@ -676,7 +676,7 @@ void CPlugin::DependencyDropped(CPlugin *pOwner)
 	unsigned int unbound = 0;
 	for (size_t i = 0; i < pOwner->m_fakes.length(); i++)
 	{
-		ke::Ref<Native> entry(pOwner->m_fakes[i]);
+		ke::RefPtr<Native> entry(pOwner->m_fakes[i]);
 
 		uint32_t idx;
 		if (m_pRuntime->FindNativeByName(entry->name(), &idx) != SP_ERROR_NONE)
@@ -769,7 +769,7 @@ void CPlugin::DropEverything()
 
 bool CPlugin::AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func)
 {
-	ke::Ref<Native> entry = g_ShareSys.AddFakeNative(pFunc, name, func);
+	ke::RefPtr<Native> entry = g_ShareSys.AddFakeNative(pFunc, name, func);
 	if (!entry)
 		return false;
 
@@ -2319,7 +2319,7 @@ public:
 
 	void AddPluginsListener_V1(IPluginsListener_V1 *listener) override
 	{
-		ke::Ref<PluginsListenerV1Wrapper> wrapper = new PluginsListenerV1Wrapper(listener);
+		ke::RefPtr<PluginsListenerV1Wrapper> wrapper = new PluginsListenerV1Wrapper(listener);
 
 		v1_wrappers_.append(wrapper);
 		g_PluginSys.AddPluginsListener(wrapper);
@@ -2327,7 +2327,7 @@ public:
 
 	void RemovePluginsListener_V1(IPluginsListener_V1 *listener) override
 	{
-		ke::Ref<PluginsListenerV1Wrapper> wrapper;
+		ke::RefPtr<PluginsListenerV1Wrapper> wrapper;
 
 		// Find which wrapper has this listener.
 		for (decltype(v1_wrappers_)::iterator iter(v1_wrappers_); !iter.done(); iter.next()) {
@@ -2356,7 +2356,7 @@ public:
 	}
 
 private:
-	ReentrantList<ke::Ref<PluginsListenerV1Wrapper>> v1_wrappers_;
+	ReentrantList<ke::RefPtr<PluginsListenerV1Wrapper>> v1_wrappers_;
 };
 
 static OldPluginAPI sOldPluginAPI;
diff --git a/core/logic/ShareSys.cpp b/core/logic/ShareSys.cpp
index 3119f36c..1d38ebcb 100644
--- a/core/logic/ShareSys.cpp
+++ b/core/logic/ShareSys.cpp
@@ -292,7 +292,7 @@ void ShareSystem::BindNativesToPlugin(CPlugin *pPlugin, bool bCoreOnly)
 			continue;
 
 		/* Otherwise, the native must be in our cache. */
-		Ref<Native> pEntry = FindNative(native->name);
+		RefPtr<Native> pEntry = FindNative(native->name);
 		if (!pEntry)
 			continue;
 
@@ -303,7 +303,7 @@ void ShareSystem::BindNativesToPlugin(CPlugin *pPlugin, bool bCoreOnly)
 	}
 }
 
-void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, const Ref<Native> &entry)
+void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, const RefPtr<Native> &entry)
 {
 	if (!entry->owner)
 		return;
@@ -325,7 +325,7 @@ void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, const Ref<Native> &entry)
 }
 
 void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, const sp_native_t *native, uint32_t index,
-                                     const Ref<Native> &pEntry)
+                                     const RefPtr<Native> &pEntry)
 {
 	uint32_t flags = 0;
 	if (pEntry->fake)
@@ -374,7 +374,7 @@ PassRef<Native> ShareSystem::AddNativeToCache(CNativeOwner *pOwner, const sp_nat
 	if (i.found())
 		return NULL;
 
-	Ref<Native> entry = new Native(pOwner, ntv);
+	RefPtr<Native> entry = new Native(pOwner, ntv);
 	m_NtvCache.insert(ntv->name, entry);
 	return entry;
 }
@@ -390,7 +390,7 @@ void ShareSystem::ClearNativeFromCache(CNativeOwner *pOwner, const char *name)
 	if (!r.found())
 		return;
 
-	Ref<Native> entry(*r);
+	RefPtr<Native> entry(*r);
 	if (entry->owner != pOwner)
 		return;
 
@@ -402,7 +402,7 @@ void ShareSystem::ClearNativeFromCache(CNativeOwner *pOwner, const char *name)
 
 PassRef<Native> ShareSystem::AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func)
 {
-	Ref<Native> entry(FindNative(name));
+	RefPtr<Native> entry(FindNative(name));
 	if (entry)
 		return NULL;
 
@@ -475,7 +475,7 @@ FeatureStatus ShareSystem::TestNative(IPluginRuntime *pRuntime, const char *name
 		}
 	}
 
-	Ref<Native> entry = FindNative(name);
+	RefPtr<Native> entry = FindNative(name);
 	if (!entry)
 		return FeatureStatus_Unknown;
 
diff --git a/core/logic/ShareSys.h b/core/logic/ShareSys.h
index 18eaf956..11c7f3b1 100644
--- a/core/logic/ShareSys.h
+++ b/core/logic/ShareSys.h
@@ -121,15 +121,15 @@ public:
 public:
 	void BeginBindingFor(CPlugin *pPlugin);
 	void BindNativesToPlugin(CPlugin *pPlugin, bool bCoreOnly);
-	void BindNativeToPlugin(CPlugin *pPlugin, const ke::Ref<Native> &pEntry);
+	void BindNativeToPlugin(CPlugin *pPlugin, const ke::RefPtr<Native> &pEntry);
 	ke::PassRef<Native> AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func);
 	ke::PassRef<Native> FindNative(const char *name);
 private:
 	ke::PassRef<Native> AddNativeToCache(CNativeOwner *pOwner, const sp_nativeinfo_t *ntv);
 	void ClearNativeFromCache(CNativeOwner *pOwner, const char *name);
-	void BindNativeToPlugin(CPlugin *pPlugin, const sp_native_t *ntv,  uint32_t index, const ke::Ref<Native> &pEntry);
+	void BindNativeToPlugin(CPlugin *pPlugin, const sp_native_t *ntv,  uint32_t index, const ke::RefPtr<Native> &pEntry);
 private:
-	typedef NameHashSet<ke::Ref<Native>, Native> NativeCache;
+	typedef NameHashSet<ke::RefPtr<Native>, Native> NativeCache;
 
 	List<IfaceInfo> m_Interfaces;
 	HandleType_t m_TypeRoot;
diff --git a/core/logic/smn_database.cpp b/core/logic/smn_database.cpp
index 410cb5db..735d5210 100644
--- a/core/logic/smn_database.cpp
+++ b/core/logic/smn_database.cpp
@@ -1716,7 +1716,7 @@ public:
 	}
 
 private:
-	ke::Ref<IDatabase> db_;
+	ke::RefPtr<IDatabase> db_;
 	Transaction *txn_;
 	IdentityToken_t *ident_;
 	IPluginFunction *success_;
diff --git a/core/logic_bridge.cpp b/core/logic_bridge.cpp
index fcfe9499..6689fd9f 100644
--- a/core/logic_bridge.cpp
+++ b/core/logic_bridge.cpp
@@ -689,7 +689,7 @@ void CoreProviderImpl::InitializeBridge()
                      MATCHMAKINGDS_SUFFIX,
                      MATCHMAKINGDS_EXT);
 
-	if (ke::Ref<ke::SharedLib> mmlib = ke::SharedLib::Open(path, NULL, 0)) {
+	if (ke::RefPtr<ke::SharedLib> mmlib = ke::SharedLib::Open(path, NULL, 0)) {
 		this->matchmakingDSFactory =
 		  mmlib->get<decltype(sCoreProviderImpl.matchmakingDSFactory)>("CreateInterface");
 	}
@@ -789,9 +789,9 @@ CoreProviderImpl::DefineCommand(const char *name, const char *help, const Comman
 	};
 
 	ConCommand *cmd = new ConCommand(new_name, ignore_callback, new_help, flags);
-	ke::Ref<CommandHook> hook = AddCommandHook(cmd, callback);
+	ke::RefPtr<CommandHook> hook = AddCommandHook(cmd, callback);
 
-	ke::Ref<CommandImpl> impl = new CommandImpl(cmd, hook);
+	ke::RefPtr<CommandImpl> impl = new CommandImpl(cmd, hook);
 	commands_.append(impl);
 }
 
diff --git a/core/provider.h b/core/provider.h
index 8199a820..0152eda1 100644
--- a/core/provider.h
+++ b/core/provider.h
@@ -75,7 +75,7 @@ public:
 	}
 
 private:
-	ke::Ref<ke::SharedLib> logic_;
+	ke::RefPtr<ke::SharedLib> logic_;
 	LogicInitFunction logic_init_;
 	GameHooks hooks_;
 
@@ -87,9 +87,9 @@ private:
 
 	private:
 		ConCommand *cmd_;
-		ke::Ref<CommandHook> hook_;
+		ke::RefPtr<CommandHook> hook_;
 	};
-	ke::Vector<ke::Ref<CommandImpl>> commands_;
+	ke::Vector<ke::RefPtr<CommandImpl>> commands_;
 };
 
 extern CoreProviderImpl sCoreProviderImpl;
diff --git a/core/sourcemod.cpp b/core/sourcemod.cpp
index c9d9d231..5522a7ec 100644
--- a/core/sourcemod.cpp
+++ b/core/sourcemod.cpp
@@ -57,7 +57,7 @@ SH_DECL_HOOK1_void(IVEngineServer, ServerCommand, SH_NOATTRIB, false, const char
 
 SourceModBase g_SourceMod;
 
-ke::Ref<ke::SharedLib> g_JIT;
+ke::RefPtr<ke::SharedLib> g_JIT;
 SourceHook::String g_BaseDir;
 ISourcePawnEngine *g_pSourcePawn = NULL;
 ISourcePawnEngine2 *g_pSourcePawn2 = NULL;
diff --git a/extensions/clientprefs/extension.h b/extensions/clientprefs/extension.h
index 9e916ba6..1ca81950 100644
--- a/extensions/clientprefs/extension.h
+++ b/extensions/clientprefs/extension.h
@@ -151,7 +151,7 @@ public:
 	IdentityToken_t *GetIdentity() const;
 public:
 	IDBDriver *Driver;
-	ke::Ref<IDatabase> Database;
+	ke::RefPtr<IDatabase> Database;
 	IPhraseCollection *phrases;
 	const DatabaseInfo *DBInfo;
 
diff --git a/extensions/mysql/mysql/MyBasicResults.h b/extensions/mysql/mysql/MyBasicResults.h
index 1a14a19e..d06c0f68 100644
--- a/extensions/mysql/mysql/MyBasicResults.h
+++ b/extensions/mysql/mysql/MyBasicResults.h
@@ -91,7 +91,7 @@ public: // Used by the driver to implement GetInsertIDForQuery()/GetAffectedRows
 	unsigned int GetInsertID();
 	unsigned int GetAffectedRows();
 private:
-	ke::Ref<MyDatabase> m_pParent;
+	ke::RefPtr<MyDatabase> m_pParent;
 	MyBasicResults m_rs;
 	unsigned int m_InsertID;
 	unsigned int m_AffectedRows;
diff --git a/extensions/mysql/mysql/MyStatement.h b/extensions/mysql/mysql/MyStatement.h
index 2064b643..c6e5ba82 100644
--- a/extensions/mysql/mysql/MyStatement.h
+++ b/extensions/mysql/mysql/MyStatement.h
@@ -69,7 +69,7 @@ private:
 	void *CopyBlob(unsigned int param, const void *blobptr, size_t length);
 private:
 	MYSQL *m_mysql;
-	ke::Ref<MyDatabase> m_pParent;
+	ke::RefPtr<MyDatabase> m_pParent;
 	MYSQL_STMT *m_stmt;
 	MYSQL_BIND *m_bind;
 	MYSQL_RES *m_pRes;
diff --git a/extensions/sqlite/driver/SqQuery.h b/extensions/sqlite/driver/SqQuery.h
index ca726091..2881d2d6 100644
--- a/extensions/sqlite/driver/SqQuery.h
+++ b/extensions/sqlite/driver/SqQuery.h
@@ -82,7 +82,7 @@ public: //IResultRow
 public:
 	sqlite3_stmt *GetStmt();
 private:
-	ke::Ref<SqDatabase> m_pParent;
+	ke::RefPtr<SqDatabase> m_pParent;
 	sqlite3_stmt *m_pStmt;
 	SqResults *m_pResults;
 	unsigned int m_ParamCount;
diff --git a/public/amtl b/public/amtl
index c35532ce..50de9b83 160000
--- a/public/amtl
+++ b/public/amtl
@@ -1 +1 @@
-Subproject commit c35532ced5e7e4f882106857bfae8f3db0fbacf0
+Subproject commit 50de9b831e1691cb513b6e18a49cdf5b4d73c5cb
diff --git a/sourcepawn b/sourcepawn
index 451affdd..028d9335 160000
--- a/sourcepawn
+++ b/sourcepawn
@@ -1 +1 @@
-Subproject commit 451affdd4e6f5f43381d53f0293df335930b64a4
+Subproject commit 028d93357d452906aac2a5bbfb3284682b5b1173