diff --git a/extensions/lisp-mode/repl.lisp b/extensions/lisp-mode/repl.lisp
index f674472cf..a2d906bb8 100644
--- a/extensions/lisp-mode/repl.lisp
+++ b/extensions/lisp-mode/repl.lisp
@@ -101,10 +101,10 @@
    :callback (lambda (&rest args)
                (declare (ignore args))
                (copy-down-to-repl 'pathname
-                                  (lem/directory-mode/buffer::get-pathname (current-point))))))
+                                  (lem/directory-mode/internal::get-pathname (current-point))))))
 
 (defun repl-compute-context-menu-items ()
-  (if (lem/directory-mode/buffer::get-pathname (current-point))
+  (if (lem/directory-mode/internal::get-pathname (current-point))
       (list (context-menu-copy-down-pathname-to-repl))
       (remove
        nil
@@ -612,7 +612,7 @@
 
 (define-repl-shortcut ls ()
   (insert-character (current-point) #\newline)
-  (lem/directory-mode/buffer::insert-directories-and-files (current-point)
+  (lem/directory-mode/internal::insert-directories-and-files (current-point)
                                                            (buffer-directory (current-buffer)))
   (lem/listener-mode:refresh-prompt (current-buffer)))
 
diff --git a/lem.asd b/lem.asd
index 53168320a..816080cd3 100644
--- a/lem.asd
+++ b/lem.asd
@@ -200,7 +200,7 @@
                               :components ((:file "file")
                                            (:file "attributes")
                                            (:file "mode")
-                                           (:file "buffer")
+                                           (:file "internal")
                                            (:file "commands")
                                            (:file "keybinds")
                                            (:file "main")))
diff --git a/src/ext/directory-mode/commands.lisp b/src/ext/directory-mode/commands.lisp
index 3415fc259..94d77053e 100644
--- a/src/ext/directory-mode/commands.lisp
+++ b/src/ext/directory-mode/commands.lisp
@@ -1,7 +1,7 @@
 (uiop:define-package :lem/directory-mode/commands
   (:use :cl
         :lem
-        :lem/directory-mode/buffer
+        :lem/directory-mode/internal
         :lem/directory-mode/attributes)
   (:import-from :lem/directory-mode/mode
                 :directory-mode)
diff --git a/src/ext/directory-mode/buffer.lisp b/src/ext/directory-mode/internal.lisp
similarity index 98%
rename from src/ext/directory-mode/buffer.lisp
rename to src/ext/directory-mode/internal.lisp
index e337ee0ba..b752bd88b 100644
--- a/src/ext/directory-mode/buffer.lisp
+++ b/src/ext/directory-mode/internal.lisp
@@ -1,4 +1,4 @@
-(uiop:define-package :lem/directory-mode/buffer
+(uiop:define-package :lem/directory-mode/internal
   (:use :cl
         :lem)
   (:import-from :lem/directory-mode/file
@@ -29,10 +29,10 @@
            :selected-files
            :update-all-buffers
            :update-highlight-line-overlay))
-(in-package :lem/directory-mode/buffer)
+(in-package :lem/directory-mode/internal)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (sb-ext:lock-package :lem/directory-mode/buffer))
+  (sb-ext:lock-package :lem/directory-mode/internal))
 
 (deftype sort-method ()
   '(member :pathname :mtime :size))
diff --git a/src/ext/directory-mode/main.lisp b/src/ext/directory-mode/main.lisp
index 688399494..a5976a085 100644
--- a/src/ext/directory-mode/main.lisp
+++ b/src/ext/directory-mode/main.lisp
@@ -2,7 +2,7 @@
   (:use :cl)
   (:use-reexport :lem/directory-mode/commands)
   (:use-reexport :lem/directory-mode/mode)
-  (:import-from :lem/directory-mode/buffer
+  (:import-from :lem/directory-mode/internal
                 :*default-sort-method*)
   (:export :*default-sort-method*
            :*directory-mode-keymap*))
@@ -11,4 +11,4 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (sb-ext:lock-package :lem/directory-mode))
 
-(setf lem:*find-directory-function* 'lem/directory-mode/buffer:directory-buffer)
+(setf lem:*find-directory-function* 'lem/directory-mode/internal:directory-buffer)
diff --git a/src/ext/filer.lisp b/src/ext/filer.lisp
index 7ae88852f..2e7c13c78 100644
--- a/src/ext/filer.lisp
+++ b/src/ext/filer.lisp
@@ -89,10 +89,10 @@
 (defun insert-item (point item)
   (with-point ((start point))
     (back-to-indentation start)
-    (lem/directory-mode/buffer::insert-icon point (item-pathname item))
+    (lem/directory-mode/internal::insert-icon point (item-pathname item))
     (insert-string point
                    (item-content item)
-                   :attribute (lem/directory-mode/buffer::get-file-attribute (item-pathname item)))
+                   :attribute (lem/directory-mode/internal::get-file-attribute (item-pathname item)))
     (put-text-property start point :item item)
     (lem-core::set-clickable start
                              point