diff --git a/misc/fuel/factor-mode.el b/misc/fuel/factor-mode.el
index 65f46e9df7..7d2caa0a5a 100644
--- a/misc/fuel/factor-mode.el
+++ b/misc/fuel/factor-mode.el
@@ -307,10 +307,10 @@ source/docs/tests file. When set to false, you'll be asked only once."
   "<[^ >]+>")
 
 (defconst factor-getter-regex
-  "\\(^\\|\\_<\\)[^ ]+?>>\\_>")
+  "\\_<\\(?:\\sw\\|\\s_\\)+>>\\_>")
 
 (defconst factor-setter-regex
-  "\\_<>>.+?\\_>")
+  "\\_<>>\\(?:\\sw\\|\\s_\\)+\\_>")
 
 (defconst factor-symbol-definition-regex
   (factor-second-word-regex '("&:" "SYMBOL:" "VAR:" "CONSTANT:")))