diff --git a/panda/src/event/eventHandler.h b/panda/src/event/eventHandler.h
index e57f6c8ae4..b77ef5f2ab 100644
--- a/panda/src/event/eventHandler.h
+++ b/panda/src/event/eventHandler.h
@@ -72,11 +72,11 @@ public:
 
 protected:
 
-  typedef phash_set<EventFunction *, pointer_hash> Functions;
-  typedef phash_map<string, Functions, string_hash> Hooks;
+  typedef pset<EventFunction *> Functions;
+  typedef pmap<string, Functions> Hooks;
   typedef pair<EventCallbackFunction*, void*> CallbackFunction;
   typedef pset<CallbackFunction> CallbackFunctions;
-  typedef phash_map<string, CallbackFunctions, string_hash> CallbackHooks;
+  typedef pmap<string, CallbackFunctions> CallbackHooks;
 
   Hooks _hooks;
   CallbackHooks _cbhooks;