diff --git a/modules/authcache_enum/authcache_enum.api.php b/modules/authcache_enum/authcache_enum.api.php
index 12a898d..a506361 100644
--- a/modules/authcache_enum/authcache_enum.api.php
+++ b/modules/authcache_enum/authcache_enum.api.php
@@ -35,18 +35,26 @@ function hook_authcache_enum_anonymous_keys_alter(&$keys) {
 function hook_authcache_enum_key_properties() {
   return array(
     'js' => array(
       'name' => t('Browser supports JavaScript'),
       'choices' => array(TRUE, FALSE),
     ),
   );
 }
 
 /**
+ * Modify the key properties used for authcache key enumeration.
+ *
+ * @see hook_authcache_enum_key_properties().
+ */
+function hook_authcache_enum_key_properties_alter(&$properties) {
+}
+
+/**
  * Modify available keys and property info records.
  *
- * @param array &$properties_info
+ * @param array &$info
  *   An associative array where keys correspond to authcache keys and values
  *   represent the property record the key is derived from.
  */
-function hook_authcache_enum_key_properties_alter(&$properties_info) {
+function hook_authcache_enum_user_keys_alter(&$info) {
 }
diff --git a/modules/authcache_enum/authcache_enum.module b/modules/authcache_enum/authcache_enum.module
index eb6940d..cad809b 100644
--- a/modules/authcache_enum/authcache_enum.module
+++ b/modules/authcache_enum/authcache_enum.module
@@ -81,27 +81,28 @@
 function authcache_enum_user_keys() {
   $info = &drupal_static(__FUNCTION__);
 
   if (!isset($info)) {
     $properties_info = module_invoke_all('authcache_enum_key_properties');
+    drupal_alter('authcache_enum_key_properties', $properties_info);
 
     $sets = array();
     foreach ($properties_info as $key => $definition) {
       $sets[$key] = $definition['choices'];
     }
 
     $info = array();
     module_load_include('inc', 'authcache_enum', 'authcache_enum.comb');
     foreach (_authcache_enum_cartesian($sets) as $properties) {
       $authcache_key = authcache_user_key($properties);
       $info[$authcache_key] = $properties;
     }
 
-    drupal_alter('authcache_enum_key_properties', $info);
+    drupal_alter('authcache_enum_user_keys', $info);
   }
 
   return $info;
 }
 
 /**
  * Return a list of cache-keys used by anonymous users.
  */