diff --git a/meow-var.el b/meow-var.el
index 3b4c0f9..4f46a80 100644
--- a/meow-var.el
+++ b/meow-var.el
@@ -55,7 +55,7 @@ This will affect how selection is displayed."
   "Fallback commands for selection commands when there is no available selection."
   :group 'meow
   :type '(alist :key-type (function :tag "Command")
-                :key-value (function :tag "Fallback")))
+                :value-type (function :tag "Fallback")))
 
 (defcustom meow-replace-state-name-list
   '((normal . "NORMAL")
@@ -66,7 +66,7 @@ This will affect how selection is displayed."
   "A list of mappings for how to display state in indicator."
   :group 'meow
   :type '(alist :key-type (symbol :tag "Meow state")
-                :key-value (string :tag "Indicator")))
+                :value-type (string :tag "Indicator")))
 
 (defvar meow-indicator-face-alist
   '((normal . meow-normal-indicator)
@@ -96,7 +96,7 @@ This will affect how selection is displayed."
   "The maximum numbers for expand hints of each type."
   :group 'meow
   :type '(alist :key-type (symbol :tag "Hint type")
-                :key-value (integer :tag "Value")))
+                :value-type (integer :tag "Value")))
 
 (defcustom meow-keypad-message t
   "Whether to log keypad messages in minibuffer."
@@ -124,7 +124,7 @@ This will affect how selection is displayed."
   "Mapping from char to thing."
   :group 'meow
   :type '(alist :key-type (character :tag "Char")
-                :key-value (symbol :tag "Thing")))
+                :value-type (symbol :tag "Thing")))
 
 (defcustom meow-thing-selection-directions
   '((inner . forward)
@@ -134,35 +134,17 @@ This will affect how selection is displayed."
   "Selection directions for each thing command."
   :group 'meow
   :type '(alist :key-type (symbol :tag "Command")
-                :key-value (symbol :tag "Direction")))
+                :value-type (symbol :tag "Direction")))
 
-(defvar meow-word-thing 'word
+(defvar meow--word-thing 'word
   "The \\='thing\\=' used for marking and movement by words.
 
-The values is a \\='thing\\=' as understood by `thingatpt' - a symbol that will
-be passed to `forward-thing' and `bounds-of-thing-at-point', which see.
+A symbol representing a thing usable by `forward-thing', which see.")
 
-This means that they must, at minimum, have a function as the value of their
-`forward-op' symbol property (or the function should be defined as
-`forward-SYMBOLNAME'). This function should accept a single argument, a number
-N, and should move over the next N things, in either the forward or backward
-direction depending on the sign of N. Examples of such functions include
-`forward-word', `forward-symbol' and `forward-sexp', which `thingatpt' uses for
-the `word', `symbol' and `sexp' things, respectively.")
-
-(defvar meow-symbol-thing 'symbol
+(defvar meow--symbol-thing 'symbol
   "The \\='thing\\=' used for marking and movement by symbols.
 
-The values is a \\='thing\\=' as understood by `thingatpt' - a symbol that will
-be passed to `forward-thing' and `bounds-of-thing-at-point', which see.
-
-This means that they must, at minimum, have a function as the value of their
-`forward-op' symbol property (or the function should be defined as
-`forward-SYMBOLNAME'). This function should accept a single argument, a number
-N, and should move over the next N things, in either the forward or backward
-direction depending on the sign of N. Examples of such functions include
-`forward-word', `forward-symbol' and `forward-sexp', which `thingatpt' uses for
-the `word', `symbol' and `sexp' things, respectively.")
+A symbol representing a thing usable by `forward-thing', which see.")
 
 (defcustom meow-display-thing-help t
   "Whether to display the help prompt for meow-inner/bounds/begin/end-of-thing."