diff --git a/spacemacs b/spacemacs
index 8e07a00..3896e5c 100644
--- a/spacemacs
+++ b/spacemacs
@@ -186,12 +186,8 @@ before layers configuration."
   "Configuration function.
  This function is called at the very end of Spacemacs initialization after
 layers configuration."
-  (defadvice evil-inner-word (around underscore-as-word activate)
-    (let ((table (copy-syntax-table (syntax-table))))
-      (modify-syntax-entry ?_ "w" table)
-      (modify-syntax-entry ?- "w" table)
-      (with-syntax-table table
-        ad-do-it)))
+  (with-eval-after-load 'evil
+    (defalias #'forward-evil-word #'forward-evil-symbol))
 
   (evil-set-initial-state 'term-mode 'emacs)