diff --git a/TODO.org b/TODO.org
index 05ebfabd8..07ac5fe41 100644
--- a/TODO.org
+++ b/TODO.org
@@ -1,6 +1,6 @@
 #+TITLE: DOOM Emacs Changelog
 
-** Unreleased [36/48]
+** Unreleased [37/49]
 + [-] app/finance
 + [-] app/crm
 + [-] Improve send-to-REPL workflow
@@ -12,6 +12,7 @@
 + [ ] New (tools/upload): add ~+upload/open-remote-file~ command
 + [ ] Fix 0/0 modeline display (caused by leftover anzu state)
 + [ ] Fix snippet-mode detection in snippets
++ [X] lang/web: fix HTML encode/decode entities commands
 + [X] Fix ~+vcs/git-browse~ & ~+vcs/git-browse-issues~
 + [7/9] lang/org
   + [ ] Add bootstrap to install latex tools :new:
diff --git a/modules/lang/web/autoload/evil.el b/modules/lang/web/autoload/evil.el
index debb4d680..0b26b11e6 100644
--- a/modules/lang/web/autoload/evil.el
+++ b/modules/lang/web/autoload/evil.el
@@ -1,20 +1,20 @@
 ;;; lang/html/autoload/evil.el
 
-;;;###autoload (autoload '+html:encode-html-entities "lang/html/autoload/evil" nil t)
-(evil-define-operator +html:encode-html-entities (beg end &optional input)
+;;;###autoload (autoload '+web:encode-html-entities "lang/web/autoload/evil" nil t)
+(evil-define-operator +web:encode-html-entities (beg end &optional input)
   "Encodes HTML entities in the selected region."
   (interactive "<r><a>")
   (cond (input
-         (insert (+html-encode-entities input)))
+         (insert (+web-encode-entities input)))
         ((and beg end)
-         (+html/encode-entities-region beg end))))
+         (+web/encode-entities-region beg end))))
 
-;;;###autoload (autoload '+html:decode-html-entities "lang/html/autoload/evil" nil t)
-(evil-define-operator +html:decode-html-entities (beg end &optional input)
+;;;###autoload (autoload '+web:decode-html-entities "lang/web/autoload/evil" nil t)
+(evil-define-operator +web:decode-html-entities (beg end &optional input)
   "Decodes HTML entities in the selected region."
   (interactive "<r><a>")
   (cond (input
-         (insert (+html-decode-entities input)))
+         (insert (+web-decode-entities input)))
         ((and beg end)
-         (+html/decode-entities-region beg end))))
+         (+web/decode-entities-region beg end))))
 
diff --git a/modules/private/hlissner/+commands.el b/modules/private/hlissner/+commands.el
index e8e3a4700..53b90aeae 100644
--- a/modules/private/hlissner/+commands.el
+++ b/modules/private/hlissner/+commands.el
@@ -11,8 +11,8 @@
 ;; Editing
 (ex! "@"            '+evil:macro-on-all-lines)   ; TODO Test me
 (ex! "date"         '+text:insert-date)
-(ex! "enhtml"       '+hlissner:encode-html-entities)
-(ex! "dehtml"       '+hlissner:decode-html-entities)
+(ex! "enhtml"       '+web:encode-html-entities)
+(ex! "dehtml"       '+web:decode-html-entities)
 (ex! "ie[dit]"      'evil-multiedit-ex-match)
 (ex! "na[rrow]"     '+hlissner:narrow-buffer)
 (ex! "ref[actor]"   'emr-show-refactor-menu)