diff --git a/elisp/ghc-comp.el b/elisp/ghc-comp.el
index b83c4fd..eed65d3 100644
--- a/elisp/ghc-comp.el
+++ b/elisp/ghc-comp.el
@@ -273,7 +273,9 @@ unloaded modules are loaded")
 (ghc-defstruct buffer name file)
 
 (defun ghc-buffer-name-file (buf)
-  (ghc-make-buffer (buffer-name buf) (buffer-file-name buf)))
+  (ghc-make-buffer
+   :name (buffer-name buf)
+   :file (buffer-file-name buf)))
 
 (defun ghc-gather-import-modules-all-buffers ()
   (let ((bufs (mapcar 'ghc-buffer-name-file (buffer-list)))