diff --git a/core/AdminCache.cpp b/core/AdminCache.cpp
index 688549bc1..fdc844f87 100644
--- a/core/AdminCache.cpp
+++ b/core/AdminCache.cpp
@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
diff --git a/core/AdminCache.h b/core/AdminCache.h
index c7d21da1a..3d08089b3 100644
--- a/core/AdminCache.h
+++ b/core/AdminCache.h
@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
diff --git a/extensions/clientprefs/cookie.cpp b/extensions/clientprefs/cookie.cpp
index ca38de5b2..f8a092ac5 100644
--- a/extensions/clientprefs/cookie.cpp
+++ b/extensions/clientprefs/cookie.cpp
@@ -67,12 +67,10 @@ void CookieManager::Unload()
 
 Cookie *CookieManager::FindCookie(const char *name)
 {
-	Cookie **pCookie = cookieTrie.retrieve(name);
-
-	if (pCookie == NULL)
+	Cookie *cookie;
+	if (!cookieFinder.retrieve(name, &cookie))
 		return NULL;
-
-	return *pCookie;
+	return cookie;
 }
 
 Cookie *CookieManager::CreateCookie(const char *name, const char *description, CookieAccess access)
@@ -96,7 +94,7 @@ Cookie *CookieManager::CreateCookie(const char *name, const char *description, C
 	TQueryOp *op = new TQueryOp(Query_InsertCookie, pCookie);
 	op->m_params.cookie = pCookie;
 	
-	cookieTrie.insert(name, pCookie);
+	cookieFinder.insert(name, pCookie);
 	cookieList.push_back(pCookie);
 
 	g_ClientPrefs.AddQueryToQueue(op);
diff --git a/extensions/clientprefs/cookie.h b/extensions/clientprefs/cookie.h
index c678d3923..d8916c96a 100644
--- a/extensions/clientprefs/cookie.h
+++ b/extensions/clientprefs/cookie.h
@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod Client Preferences Extension
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -34,8 +34,7 @@
 
 #include "extension.h"
 #include "sh_list.h"
-#include "sm_trie_tpl.h"
-
+#include <sm_namehashset.h>
 
 #define MAX_NAME_LENGTH 30
 #define MAX_DESC_LENGTH 255
@@ -92,6 +91,11 @@ struct Cookie
 	int dbid;
 	CookieData *data[MAXCLIENTS+1];
 	CookieAccess access;
+
+	static inline bool matches(const char *name, const Cookie *cookie)
+	{
+		return strcmp(name, cookie->name) == 0;
+	}
 };
 
 class CookieManager : public IClientListener, public IPluginsListener
@@ -128,7 +132,7 @@ public:
 	IBaseMenu *clientMenu;
 
 private:
-	KTrie<Cookie *> cookieTrie;
+	NameHashSet<Cookie *> cookieFinder;
 	SourceHook::List<CookieData *> clientData[MAXCLIENTS+1];
 
 	bool connected[MAXCLIENTS+1];