diff --git a/modules/app/twitter/autoload.el b/modules/app/twitter/autoload.el
index 7c6d7c065..6dc777f2b 100644
--- a/modules/app/twitter/autoload.el
+++ b/modules/app/twitter/autoload.el
@@ -6,7 +6,7 @@
 ;;;###autoload
 (defun +twitter-display-buffer-fn (buf)
   "A replacement display-buffer command for `twittering-pop-to-buffer-function'
-that works with the feature/popup module."
+that works with the ui/popup module."
   (let ((win (selected-window)))
     (display-buffer buf)
     ;; This is required because the new window generated by `pop-to-buffer'
diff --git a/modules/editor/evil/README.org b/modules/editor/evil/README.org
index b0affc699..c1417337d 100644
--- a/modules/editor/evil/README.org
+++ b/modules/editor/evil/README.org
@@ -1,4 +1,4 @@
-#+TITLE:   feature/evil
+#+TITLE:   editor/evil
 #+DATE:    February 2, 2017
 #+SINCE:   v2.0
 #+STARTUP: inlineimages nofold
diff --git a/modules/ui/workspaces/autoload/workspaces.el b/modules/ui/workspaces/autoload/workspaces.el
index e98639076..f43fd4ac7 100644
--- a/modules/ui/workspaces/autoload/workspaces.el
+++ b/modules/ui/workspaces/autoload/workspaces.el
@@ -1,4 +1,4 @@
-;;; feature/workspaces/autoload/workspaces.el -*- lexical-binding: t; -*-
+;;; ui/workspaces/autoload/workspaces.el -*- lexical-binding: t; -*-
 
 (defvar +workspace--last nil)
 (defvar +workspace--index 0)