diff --git a/evil-collection-ace-jump-mode.el b/evil-collection-ace-jump-mode.el
index dd4b80c..2febe81 100644
--- a/evil-collection-ace-jump-mode.el
+++ b/evil-collection-ace-jump-mode.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'ace-jump-mode nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (declare-function 'ace-jump-char-mode "ace-jump-mode")
 (declare-function 'ace-jump-word-mode "ace-jump-mode")
 (declare-function 'ace-jump-line-mode "ace-jump-mode")
diff --git a/evil-collection-ag.el b/evil-collection-ag.el
index 2e4b29e..89779e4 100644
--- a/evil-collection-ag.el
+++ b/evil-collection-ag.el
@@ -31,7 +31,7 @@
 (require 'evil)
 (require 'evil-collection-evil-search)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-ag-maps '(ag-mode-map))
 
 (defun evil-collection-ag-setup ()
diff --git a/evil-collection-alchemist.el b/evil-collection-alchemist.el
index be9d117..472d053 100644
--- a/evil-collection-alchemist.el
+++ b/evil-collection-alchemist.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'alchemist nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-alchemist-maps '(alchemist-compile-mode-map
                                            alchemist-eval-mode-map
diff --git a/evil-collection-anaconda-mode.el b/evil-collection-anaconda-mode.el
index 4828171..e9910d7 100644
--- a/evil-collection-anaconda-mode.el
+++ b/evil-collection-anaconda-mode.el
@@ -29,7 +29,7 @@
 (require 'anaconda-mode nil t)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-anaconda-mode-maps '(anaconda-mode-view-mode-map
                                                anaconda-mode-map))
diff --git a/evil-collection-arc-mode.el b/evil-collection-arc-mode.el
index 01e6cba..cc8aa2f 100644
--- a/evil-collection-arc-mode.el
+++ b/evil-collection-arc-mode.el
@@ -30,7 +30,7 @@
 (require 'arc-mode)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-arc-mode-maps '(archive-mode-map))
 
 (defun evil-collection-arc-mode-setup ()
diff --git a/evil-collection-avy.el b/evil-collection-avy.el
index 77e2505..d817062 100644
--- a/evil-collection-avy.el
+++ b/evil-collection-avy.el
@@ -29,7 +29,7 @@
 ;;; Code:
 (require 'avy nil t)
 (require 'evil)
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (declare-function 'avy-goto-word-or-subword-1 "avy")
 (declare-function 'avy-goto-line "avy")
diff --git a/evil-collection-bookmark.el b/evil-collection-bookmark.el
index 9337148..396de4c 100644
--- a/evil-collection-bookmark.el
+++ b/evil-collection-bookmark.el
@@ -29,7 +29,7 @@
 ;;; Code:
 (require 'bookmark)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-bookmark-maps '(bookmark-bmenu-mode-map))
 
 (defun evil-collection-bookmark-setup ()
diff --git a/evil-collection-buff-menu.el b/evil-collection-buff-menu.el
index 63dd808..bb501da 100644
--- a/evil-collection-buff-menu.el
+++ b/evil-collection-buff-menu.el
@@ -34,7 +34,7 @@
 (require 'evil)
 (require 'tabulated-list)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-buff-menu-maps '(Buffer-menu-mode-map))
 
 ;; This is for `evil-collection-Buffer-menu-unmark-all-buffers.'
diff --git a/evil-collection-calc.el b/evil-collection-calc.el
index 35db78d..93d0133 100644
--- a/evil-collection-calc.el
+++ b/evil-collection-calc.el
@@ -29,7 +29,7 @@
 (require 'evil-collection-util)
 (require 'calc)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-calc-maps '(calc-mode-map))
 
 (defun evil-collection-calc-setup ()
diff --git a/evil-collection-calendar.el b/evil-collection-calendar.el
index d1aab75..659b4db 100644
--- a/evil-collection-calendar.el
+++ b/evil-collection-calendar.el
@@ -30,7 +30,7 @@
 (require 'calendar)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-calendar-maps '(calendar-mode-map))
 
 (defun evil-collection-calendar-setup ()
diff --git a/evil-collection-cider.el b/evil-collection-cider.el
index 0e321ec..8371643 100644
--- a/evil-collection-cider.el
+++ b/evil-collection-cider.el
@@ -32,7 +32,7 @@
 (require 'evil)
 (require 'evil-collection-settings)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (declare-function cider-debug-mode-send-reply "cider-debug")
 
 (defconst evil-collection-cider-maps '(cider-mode-map
diff --git a/evil-collection-comint.el b/evil-collection-comint.el
index 1f2df1f..29b738d 100644
--- a/evil-collection-comint.el
+++ b/evil-collection-comint.el
@@ -30,7 +30,7 @@
 (require 'comint)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-comint-maps '(comint-mode-map))
 
 (defun evil-collection-comint-setup ()
diff --git a/evil-collection-company.el b/evil-collection-company.el
index e4b0e97..e2f0949 100644
--- a/evil-collection-company.el
+++ b/evil-collection-company.el
@@ -30,7 +30,7 @@
 (require 'company nil t)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (declare-function company-tng-configure-default "company-tng")
 
 (defgroup evil-collection-company nil
diff --git a/evil-collection-compile.el b/evil-collection-compile.el
index 5f35705..cf9ed2c 100644
--- a/evil-collection-compile.el
+++ b/evil-collection-compile.el
@@ -31,7 +31,7 @@
 (require 'compile)
 (require 'evil-collection-evil-search)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-compile-maps '(compilation-mode-map))
 
 (defun evil-collection-compile-setup ()
diff --git a/evil-collection-cus-theme.el b/evil-collection-cus-theme.el
index 8614241..72475c5 100644
--- a/evil-collection-cus-theme.el
+++ b/evil-collection-cus-theme.el
@@ -30,7 +30,7 @@
 (require 'cus-theme)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-cus-theme-maps '(custom-theme-choose-mode-map
                                            custom-new-theme-mode-map))
 
diff --git a/evil-collection-custom.el b/evil-collection-custom.el
index c5ed756..260577c 100644
--- a/evil-collection-custom.el
+++ b/evil-collection-custom.el
@@ -30,7 +30,7 @@
 (require 'cus-edit)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-custom-maps '(custom-mode-map))
 
 (defun evil-collection-custom-setup ()
diff --git a/evil-collection-daemons.el b/evil-collection-daemons.el
index 3513bbe..8a0fc5e 100644
--- a/evil-collection-daemons.el
+++ b/evil-collection-daemons.el
@@ -30,7 +30,7 @@
 (require 'daemons nil t)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-daemons-maps '(daemons-mode-map
                                          daemons-output-mode-map))
 
diff --git a/evil-collection-debbugs.el b/evil-collection-debbugs.el
index ac7349a..5d9b7d1 100644
--- a/evil-collection-debbugs.el
+++ b/evil-collection-debbugs.el
@@ -30,7 +30,7 @@
 (require 'debbugs nil t)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-debbugs-maps '(debbugs-gnu-mode-map))
 
 (defun evil-collection-debbugs-setup ()
diff --git a/evil-collection-debug.el b/evil-collection-debug.el
index 39c8707..4328df8 100644
--- a/evil-collection-debug.el
+++ b/evil-collection-debug.el
@@ -31,7 +31,7 @@
 (require 'evil)
 (require 'debug)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-debug-maps '(debugger-mode-map))
 
 (defun evil-collection-debug-setup ()
diff --git a/evil-collection-diff-mode.el b/evil-collection-diff-mode.el
index a402c9b..19a753e 100644
--- a/evil-collection-diff-mode.el
+++ b/evil-collection-diff-mode.el
@@ -38,7 +38,7 @@
 (require 'evil)
 (require 'diff-mode)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-diff-mode-maps '(diff-mode-map))
 
 (defun evil-collection-diff-read-only-state-switch ()
diff --git a/evil-collection-dired.el b/evil-collection-dired.el
index 596237a..369fe0e 100644
--- a/evil-collection-dired.el
+++ b/evil-collection-dired.el
@@ -30,7 +30,7 @@
 (require 'dired)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-dired-maps '(dired-mode-map))
 
 (defun evil-collection-dired-setup ()
diff --git a/evil-collection-doc-view.el b/evil-collection-doc-view.el
index 5a84ab9..673ea35 100644
--- a/evil-collection-doc-view.el
+++ b/evil-collection-doc-view.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'doc-view)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-doc-view-maps '(doc-view-mode-map))
 
 (defun evil-collection-doc-view-setup ()
diff --git a/evil-collection-edebug.el b/evil-collection-edebug.el
index 76d3b67..6e1a515 100644
--- a/evil-collection-edebug.el
+++ b/evil-collection-edebug.el
@@ -30,7 +30,7 @@
 (require 'edebug)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-edebug-maps
   '(edebug-mode-map
diff --git a/evil-collection-elfeed.el b/evil-collection-elfeed.el
index 7964e7f..642b47c 100644
--- a/evil-collection-elfeed.el
+++ b/evil-collection-elfeed.el
@@ -30,7 +30,7 @@
 (require 'elfeed nil t)
 (require 'evil-collection-util)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defvar elfeed-search-mode-map)
 (defvar elfeed-show-mode-map)
diff --git a/evil-collection-elisp-mode.el b/evil-collection-elisp-mode.el
index 8b4ef35..c62622c 100644
--- a/evil-collection-elisp-mode.el
+++ b/evil-collection-elisp-mode.el
@@ -30,7 +30,7 @@
 (require 'elisp-mode)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-elisp-mode-maps nil)
 
diff --git a/evil-collection-elisp-refs.el b/evil-collection-elisp-refs.el
index 888ec02..06fc19f 100644
--- a/evil-collection-elisp-refs.el
+++ b/evil-collection-elisp-refs.el
@@ -31,7 +31,7 @@
 (require 'evil)
 (require 'elisp-refs nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-elisp-refs-maps '(elisp-refs-mode-map))
 
 (defun evil-collection-elisp-refs-setup ()
diff --git a/evil-collection-emms.el b/evil-collection-emms.el
index 2575e31..ed0f498 100644
--- a/evil-collection-emms.el
+++ b/evil-collection-emms.el
@@ -30,7 +30,7 @@
 (require 'emms nil t)
 (require 'evil-collection-util)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (declare-function emms-with-inhibit-read-only-t "emms")
 (declare-function emms-playlist-mode-correct-previous-yank "emms-playlist-mode")
 
diff --git a/evil-collection-epa.el b/evil-collection-epa.el
index e0bb285..1455449 100644
--- a/evil-collection-epa.el
+++ b/evil-collection-epa.el
@@ -31,7 +31,7 @@
 (require 'evil)
 (require 'epa nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-epa-maps '(epa-key-list-mode-map
                                      epa-key-mode-map
                                      epa-info-mode-map))
diff --git a/evil-collection-ert.el b/evil-collection-ert.el
index e25dd88..da64a7f 100644
--- a/evil-collection-ert.el
+++ b/evil-collection-ert.el
@@ -30,7 +30,7 @@
 (require 'ert)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-ert-maps '(ert-results-mode-map))
 
 (defun evil-collection-ert-setup ()
diff --git a/evil-collection-eshell.el b/evil-collection-eshell.el
index 6060c36..1cf3431 100644
--- a/evil-collection-eshell.el
+++ b/evil-collection-eshell.el
@@ -31,7 +31,7 @@
 (require 'eshell)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-eshell-maps '(eshell-mode-map))
 
 (defun evil-collection-eshell-next-prompt ()
diff --git a/evil-collection-etags-select.el b/evil-collection-etags-select.el
index bff00c9..edcbb1e 100644
--- a/evil-collection-etags-select.el
+++ b/evil-collection-etags-select.el
@@ -28,7 +28,7 @@
 (require 'evil)
 (require 'etags-select nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 ;;; Code:
 (defun evil-collection-etags-select-setup ()
diff --git a/evil-collection-eval-sexp-fu.el b/evil-collection-eval-sexp-fu.el
index c90e5ad..c8b58c2 100644
--- a/evil-collection-eval-sexp-fu.el
+++ b/evil-collection-eval-sexp-fu.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'eval-sexp-fu nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-eval-sexp-fu-maps nil)
 
diff --git a/evil-collection-eww.el b/evil-collection-eww.el
index 6e9ff24..486db54 100644
--- a/evil-collection-eww.el
+++ b/evil-collection-eww.el
@@ -30,7 +30,7 @@
 (require 'eww)
 (require 'evil-collection-util)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defvar evil-collection-eww-maps '(eww-mode-map
                                    eww-history-mode-map
diff --git a/evil-collection-flycheck.el b/evil-collection-flycheck.el
index bafb21e..5e19171 100644
--- a/evil-collection-flycheck.el
+++ b/evil-collection-flycheck.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'flycheck nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defvar flycheck-error-list-mode-map)
 
 (defconst evil-collection-flycheck-maps '(flycheck-error-list-mode-map))
diff --git a/evil-collection-free-keys.el b/evil-collection-free-keys.el
index e73afd7..ff206aa 100644
--- a/evil-collection-free-keys.el
+++ b/evil-collection-free-keys.el
@@ -28,7 +28,7 @@
 (require 'evil)
 (require 'free-keys nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 ;;; Code:
 (defvar free-keys-mode-map)
diff --git a/evil-collection-geiser.el b/evil-collection-geiser.el
index 2c32ce6..7535d48 100644
--- a/evil-collection-geiser.el
+++ b/evil-collection-geiser.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'geiser nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defvar geiser-debug-mode-map)
 (defvar geiser-doc-mode-map)
diff --git a/evil-collection-ggtags.el b/evil-collection-ggtags.el
index e4a3d1a..1cffe72 100644
--- a/evil-collection-ggtags.el
+++ b/evil-collection-ggtags.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'ggtags nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defvar ggtags-global-mode-map)
 (defvar ggtags-mode-map)
diff --git a/evil-collection-git-timemachine.el b/evil-collection-git-timemachine.el
index ab222e8..e8775c9 100644
--- a/evil-collection-git-timemachine.el
+++ b/evil-collection-git-timemachine.el
@@ -29,7 +29,7 @@
 (require 'evil)
 (require 'git-timemachine nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defvar git-timemachine-mode-map)
 (defconst evil-collection-git-timemachine-map '(git-timemachine-mode-map))
diff --git a/evil-collection-go-mode.el b/evil-collection-go-mode.el
index 2666a1d..9c89fb4 100644
--- a/evil-collection-go-mode.el
+++ b/evil-collection-go-mode.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'go-mode nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-go-mode-maps '(go-mode-map
                                          godoc-mode-map))
 
diff --git a/evil-collection-guix.el b/evil-collection-guix.el
index 7524519..cb534b7 100644
--- a/evil-collection-guix.el
+++ b/evil-collection-guix.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'guix nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-guix-maps '(guix-output-list-mode-map
                                       guix-package-info-mode-map
                                       guix-profile-list-mode-map
diff --git a/evil-collection-helm.el b/evil-collection-helm.el
index 0077254..8d412ae 100644
--- a/evil-collection-helm.el
+++ b/evil-collection-helm.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'helm-files nil t) ; TODO: Check if this is the ideal requirement and if we are not loading too much.
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 ;; To navigate Helm entries with <hjkl> in insert state, we need a modifier.
 ;; Using the C- modifier would conflict with the help prefix "C-h".  So we use
diff --git a/evil-collection-help.el b/evil-collection-help.el
index 3cbd1f4..d873c22 100644
--- a/evil-collection-help.el
+++ b/evil-collection-help.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'help-mode)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-help-maps '(help-mode-map))
 
 (defun evil-collection-help-setup ()
diff --git a/evil-collection-ibuffer.el b/evil-collection-ibuffer.el
index 8482c99..ee7f29f 100644
--- a/evil-collection-ibuffer.el
+++ b/evil-collection-ibuffer.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'ibuffer)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-ibuffer-maps '(ibuffer-mode-map))
 
 (defun evil-collection-ibuffer-setup ()
diff --git a/evil-collection-image+.el b/evil-collection-image+.el
index 1d2cdc7..a916877 100644
--- a/evil-collection-image+.el
+++ b/evil-collection-image+.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'image+ nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-image+-maps '(image-mode-map))
 
 (defun evil-collection-image+-setup ()
diff --git a/evil-collection-image.el b/evil-collection-image.el
index 1fcc604..0b56498 100644
--- a/evil-collection-image.el
+++ b/evil-collection-image.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'image-mode)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 ;; TODO: pdf and doc-view conflict with image.
 ;; See https://github.com/emacs-evil/evil-collection/issues/23.
diff --git a/evil-collection-indium.el b/evil-collection-indium.el
index 55d4f95..bad1de7 100644
--- a/evil-collection-indium.el
+++ b/evil-collection-indium.el
@@ -30,7 +30,7 @@
 (require 'evil-collection-settings)
 (require 'indium nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-indium-maps '(indium-debugger-mode-map
                                         indium-inspector-mode-map
                                         indium-debugger-locals-mode-map
diff --git a/evil-collection-info.el b/evil-collection-info.el
index e735128..a1b0fe4 100644
--- a/evil-collection-info.el
+++ b/evil-collection-info.el
@@ -32,7 +32,7 @@
 (require 'evil-collection-evil-search)
 (require 'info)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-info-maps '(Info-mode-map))
 
 (defun evil-collection-info-setup ()
diff --git a/evil-collection-ivy.el b/evil-collection-ivy.el
index 33c2727..229019f 100644
--- a/evil-collection-ivy.el
+++ b/evil-collection-ivy.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'ivy nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-ivy-maps '(ivy-occur-mode-map
                                      ivy-occur-grep-mode-map
                                      ivy-minibuffer-map))
diff --git a/evil-collection-js2-mode.el b/evil-collection-js2-mode.el
index b813544..1abdf7a 100644
--- a/evil-collection-js2-mode.el
+++ b/evil-collection-js2-mode.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'js2-mode nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defvar js-indent-level)
 
 (defun evil-collection-js2-set-evil-shift-width ()
diff --git a/evil-collection-kotlin-mode.el b/evil-collection-kotlin-mode.el
index cf87f9d..a5539b2 100644
--- a/evil-collection-kotlin-mode.el
+++ b/evil-collection-kotlin-mode.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'kotlin-mode nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-kotlin-maps '(kotlin-mode-map))
 
 (defun evil-collection-kotlin-mode-setup ()
diff --git a/evil-collection-log-view.el b/evil-collection-log-view.el
index 2e20bd4..79bb48f 100644
--- a/evil-collection-log-view.el
+++ b/evil-collection-log-view.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'log-view)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-log-view-maps '(log-view-mode-map))
 
 (defun evil-collection-log-view-setup ()
diff --git a/evil-collection-lsp-ui-imenu.el b/evil-collection-lsp-ui-imenu.el
index 29dc3e5..72cc57c 100644
--- a/evil-collection-lsp-ui-imenu.el
+++ b/evil-collection-lsp-ui-imenu.el
@@ -30,7 +30,7 @@
 (require 'lsp-ui nil t)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-lsp-ui-imenu-mode-maps '(lsp-ui-imenu-mode-map))
 
 (defun evil-collection-lsp-ui-imenu-setup ()
diff --git a/evil-collection-lua-mode.el b/evil-collection-lua-mode.el
index baa3cc1..2b337a4 100644
--- a/evil-collection-lua-mode.el
+++ b/evil-collection-lua-mode.el
@@ -31,7 +31,7 @@
 (require 'lua-mode nil t)
 
 (defvar lua-indent-level)
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-lua-mode-maps '(lua-mode-map))
 
 (defun evil-collection-lua-mode-set-evil-shift-width ()
diff --git a/evil-collection-macrostep.el b/evil-collection-macrostep.el
index a3d94e7..de1bbc4 100644
--- a/evil-collection-macrostep.el
+++ b/evil-collection-macrostep.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'macrostep nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-macrostep-maps '(macrostep-keymap))
 
 (defun evil-collection-macrostep-setup ()
diff --git a/evil-collection-magit.el b/evil-collection-magit.el
index b71cd0d..258db11 100644
--- a/evil-collection-magit.el
+++ b/evil-collection-magit.el
@@ -35,7 +35,7 @@
 (require 'magit nil t)
 
 (defvar magit-blame-mode-map)
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-magit-maps '(magit-blame-mode-map))
 
diff --git a/evil-collection-man.el b/evil-collection-man.el
index 9d0093d..f23b479 100644
--- a/evil-collection-man.el
+++ b/evil-collection-man.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'man)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-man-maps '(Man-mode-map))
 
 (defun evil-collection-man-setup ()
diff --git a/evil-collection-minibuffer.el b/evil-collection-minibuffer.el
index 9fdc8cc..81ae891 100644
--- a/evil-collection-minibuffer.el
+++ b/evil-collection-minibuffer.el
@@ -29,7 +29,7 @@
 ;;; Code:
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-minibuffer-maps '(minibuffer-local-map
                                             minibuffer-local-ns-map
diff --git a/evil-collection-neotree.el b/evil-collection-neotree.el
index 2f82c15..35ce07f 100644
--- a/evil-collection-neotree.el
+++ b/evil-collection-neotree.el
@@ -31,7 +31,7 @@
 (require 'evil)
 (require 'neotree nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (declare-function neotree-make-executor "neotree.el")
 (defconst evil-collection-neotree-maps '(neotree-mode-map))
 
diff --git a/evil-collection-notmuch.el b/evil-collection-notmuch.el
index 2610bfb..347b6d3 100644
--- a/evil-collection-notmuch.el
+++ b/evil-collection-notmuch.el
@@ -30,7 +30,7 @@
 (require 'notmuch nil t)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (declare-function notmuch-show-get-tags "notmuch-show")
 (declare-function notmuch-show-tag "notmuch-show")
diff --git a/evil-collection-nov.el b/evil-collection-nov.el
index 67a71c1..6955754 100644
--- a/evil-collection-nov.el
+++ b/evil-collection-nov.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'nov nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defvar nov-mode-map)
 
 (defconst evil-collection-nov-maps '(nov-mode-map))
diff --git a/evil-collection-occur.el b/evil-collection-occur.el
index 4e2f410..febd7fa 100644
--- a/evil-collection-occur.el
+++ b/evil-collection-occur.el
@@ -29,7 +29,7 @@
 ;;; Code:
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (when (> emacs-major-version 25)
   (require 'replace))
diff --git a/evil-collection-outline.el b/evil-collection-outline.el
index 3d189a6..79bb3a7 100644
--- a/evil-collection-outline.el
+++ b/evil-collection-outline.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'outline)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defcustom evil-collection-outline-bind-tab-p t
   "Enable <tab>-based bindings in Outline mode.
diff --git a/evil-collection-p4.el b/evil-collection-p4.el
index bbd33ae..a38fb9c 100644
--- a/evil-collection-p4.el
+++ b/evil-collection-p4.el
@@ -29,7 +29,7 @@
 ;;; Code:
 (require 'p4 nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defvar p4-basic-mode-map)
 
 (defconst evil-collection-p4-maps '(p4-basic-mode-map))
diff --git a/evil-collection-package-menu.el b/evil-collection-package-menu.el
index f537613..4755db0 100644
--- a/evil-collection-package-menu.el
+++ b/evil-collection-package-menu.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'package)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-package-menu-maps '(package-menu-mode-map))
 
 (defun evil-collection-package-menu-setup ()
diff --git a/evil-collection-paren.el b/evil-collection-paren.el
index cbe0c58..cf0e63a 100644
--- a/evil-collection-paren.el
+++ b/evil-collection-paren.el
@@ -28,7 +28,7 @@
 (require 'evil)
 (require 'paren)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defun evil-collection-paren-show-paren-function (f &rest args)
   "Integrate `show-paren-function' with `evil'."
diff --git a/evil-collection-pass.el b/evil-collection-pass.el
index 1a5360f..923ce8a 100644
--- a/evil-collection-pass.el
+++ b/evil-collection-pass.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'pass nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defvar pass-mode-map)
 
 (defconst evil-collection-pass-maps '(pass-mode-map))
diff --git a/evil-collection-pdf.el b/evil-collection-pdf.el
index 6199600..db101a1 100644
--- a/evil-collection-pdf.el
+++ b/evil-collection-pdf.el
@@ -31,7 +31,7 @@
 (require 'pdf-tools nil t)
 (require 'pdf-view nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-pdf-maps '(pdf-view-mode-map
                                      pdf-outline-buffer-mode-map
diff --git a/evil-collection-popup.el b/evil-collection-popup.el
index 6d8afc7..5c3d8ab 100644
--- a/evil-collection-popup.el
+++ b/evil-collection-popup.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'popup nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-popup-maps '(popup-menu-keymap))
 
diff --git a/evil-collection-proced.el b/evil-collection-proced.el
index 51b1f2a..fb679af 100644
--- a/evil-collection-proced.el
+++ b/evil-collection-proced.el
@@ -30,7 +30,7 @@
 (require 'evil-collection-util)
 (require 'proced)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-proced-maps '(proced-mode-map))
 
diff --git a/evil-collection-prodigy.el b/evil-collection-prodigy.el
index c94ade5..c9993c2 100644
--- a/evil-collection-prodigy.el
+++ b/evil-collection-prodigy.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'prodigy nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-prodigy-maps '(prodigy-mode-map
                                          prodigy-view-mode-map))
 
diff --git a/evil-collection-profiler.el b/evil-collection-profiler.el
index d83eb3f..0e34082 100644
--- a/evil-collection-profiler.el
+++ b/evil-collection-profiler.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'profiler)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-profiler-maps '(profiler-report-mode-map))
 
diff --git a/evil-collection-python.el b/evil-collection-python.el
index 340096a..04abe71 100644
--- a/evil-collection-python.el
+++ b/evil-collection-python.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'python)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-python-maps '(python-mode-map))
 
diff --git a/evil-collection-quickrun.el b/evil-collection-quickrun.el
index 04e5d7c..e08b172 100644
--- a/evil-collection-quickrun.el
+++ b/evil-collection-quickrun.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'quickrun nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-quickrun-maps '(quickrun--mode-map))
 
diff --git a/evil-collection-racer.el b/evil-collection-racer.el
index 22ee8bb..09cfc68 100644
--- a/evil-collection-racer.el
+++ b/evil-collection-racer.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'racer nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-racer-maps '(racer-mode-map
                                        racer-help-mode-map))
diff --git a/evil-collection-realgud.el b/evil-collection-realgud.el
index 3f3442e..378ccc7 100644
--- a/evil-collection-realgud.el
+++ b/evil-collection-realgud.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'realgud nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-realgud-maps '(realgud:shortkey-mode-map))
 
diff --git a/evil-collection-reftex.el b/evil-collection-reftex.el
index 22fe609..bb04db4 100644
--- a/evil-collection-reftex.el
+++ b/evil-collection-reftex.el
@@ -32,7 +32,7 @@
 (require 'reftex-ref nil t)
 (require 'reftex-cite nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-reftex-maps '(reftex-select-shared-map
                                         reftex-toc-mode-map))
diff --git a/evil-collection-rjsx-mode.el b/evil-collection-rjsx-mode.el
index 3b5d9b2..64b86ae 100644
--- a/evil-collection-rjsx-mode.el
+++ b/evil-collection-rjsx-mode.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'rjsx-mode nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defvar rjsx-mode-map)
 
diff --git a/evil-collection-robe.el b/evil-collection-robe.el
index 73be9b1..589b861 100644
--- a/evil-collection-robe.el
+++ b/evil-collection-robe.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'robe nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-robe-maps '(robe-mode-map))
 
diff --git a/evil-collection-rtags.el b/evil-collection-rtags.el
index 920cbce..545ee4e 100644
--- a/evil-collection-rtags.el
+++ b/evil-collection-rtags.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'rtags nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defvar rtags-mode-map)
 (defvar rtags-dependency-tree-mode-map)
diff --git a/evil-collection-ruby-mode.el b/evil-collection-ruby-mode.el
index 5b44f72..5725e78 100644
--- a/evil-collection-ruby-mode.el
+++ b/evil-collection-ruby-mode.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'ruby-mode)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-ruby-mode-maps nil)
 
diff --git a/evil-collection-simple.el b/evil-collection-simple.el
index 188a387..9661ebf 100644
--- a/evil-collection-simple.el
+++ b/evil-collection-simple.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'simple)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defvar special-mode-map)
 
diff --git a/evil-collection-slime.el b/evil-collection-slime.el
index 130eb29..9bc20a0 100644
--- a/evil-collection-slime.el
+++ b/evil-collection-slime.el
@@ -37,7 +37,7 @@
 (defvar slime-popup-buffer-mode-map)
 (defvar slime-xref-mode-map)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-slime-maps '(slime-parent-map
                                        sldb-mode-map
diff --git a/evil-collection-term.el b/evil-collection-term.el
index 4d6fd39..d9f8272 100644
--- a/evil-collection-term.el
+++ b/evil-collection-term.el
@@ -34,7 +34,7 @@
 (require 'evil)
 (require 'term)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defcustom evil-collection-term-sync-state-and-mode-p t
   "Synchronize insert/normal state with char/line-mode respectively.
diff --git a/evil-collection-tide.el b/evil-collection-tide.el
index 946c1b7..d6095a6 100644
--- a/evil-collection-tide.el
+++ b/evil-collection-tide.el
@@ -30,7 +30,7 @@
 (require 'tide nil t)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defconst evil-collection-tide-maps '(tide-mode-map
                                       tide-references-mode-map
diff --git a/evil-collection-transmission.el b/evil-collection-transmission.el
index e03dec4..d48bc68 100644
--- a/evil-collection-transmission.el
+++ b/evil-collection-transmission.el
@@ -31,7 +31,7 @@
 (require 'evil-collection-util)
 (require 'transmission nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defvar transmission-mode-map)
 (defvar transmission-files-mode-map)
 (defvar transmission-info-mode-map)
diff --git a/evil-collection-typescript-mode.el b/evil-collection-typescript-mode.el
index 90f7bce..592d084 100644
--- a/evil-collection-typescript-mode.el
+++ b/evil-collection-typescript-mode.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'typescript-mode nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defvar typescript-indent-level)
 
diff --git a/evil-collection-util.el b/evil-collection-util.el
index 759aa42..9a06ecf 100644
--- a/evil-collection-util.el
+++ b/evil-collection-util.el
@@ -29,7 +29,7 @@
 ;;; Code:
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defmacro evil-collection-util-inhibit-insert-state (map)
   "Unmap insertion keys from normal state.
diff --git a/evil-collection-vc-annotate.el b/evil-collection-vc-annotate.el
index f368336..9656834 100644
--- a/evil-collection-vc-annotate.el
+++ b/evil-collection-vc-annotate.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'vc-annotate)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-vc-annotate-maps '(vc-annotate-mode-map))
 
 (defun evil-collection-vc-annotate-setup ()
diff --git a/evil-collection-vdiff.el b/evil-collection-vdiff.el
index 84a549d..3a9c505 100644
--- a/evil-collection-vdiff.el
+++ b/evil-collection-vdiff.el
@@ -30,7 +30,7 @@
 (require 'vdiff nil t)
 (require 'evil)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defun evil-collection-vdiff-setup ()
   "Set up `evil' bindings for `vdiff-mode'."
diff --git a/evil-collection-view.el b/evil-collection-view.el
index 58f1c5c..535f577 100644
--- a/evil-collection-view.el
+++ b/evil-collection-view.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'view)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-view-maps '(view-mode-map))
 
 (defun evil-collection-view-setup ()
diff --git a/evil-collection-vlf.el b/evil-collection-vlf.el
index 7d1bfa1..1fb87c7 100644
--- a/evil-collection-vlf.el
+++ b/evil-collection-vlf.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'vlf nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defvar vlf-mode-map)
 (declare-function vlf-change-batch-size "vlf")
diff --git a/evil-collection-wdired.el b/evil-collection-wdired.el
index d26ce43..efb8d29 100644
--- a/evil-collection-wdired.el
+++ b/evil-collection-wdired.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'wdired)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-wdired-maps '(wdired-mode-map))
 
 (defun evil-collection-wdired-setup ()
diff --git a/evil-collection-wgrep.el b/evil-collection-wgrep.el
index 371184c..92782a1 100644
--- a/evil-collection-wgrep.el
+++ b/evil-collection-wgrep.el
@@ -32,7 +32,7 @@
 
 (defvar wgrep-mode-map)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-wgrep-maps '(wgrep-mode-map))
 
 (defun evil-collection-wgrep-setup ()
diff --git a/evil-collection-which-key.el b/evil-collection-which-key.el
index 88cd460..e87dc74 100644
--- a/evil-collection-which-key.el
+++ b/evil-collection-which-key.el
@@ -33,7 +33,7 @@
 
 (defvar which-key-C-h-map)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-which-key-maps '(which-key-C-h-map))
 
 ;; `which-key'is coded so that the prompt properly shows j and k as
diff --git a/evil-collection-woman.el b/evil-collection-woman.el
index 3c9c675..026c666 100644
--- a/evil-collection-woman.el
+++ b/evil-collection-woman.el
@@ -31,7 +31,7 @@
 (require 'evil-collection-man) ; WoMan's keymap inherits from Man.
 (require 'woman)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-woman-maps '(woman-mode-map))
 
 (defun evil-collection-woman-setup ()
diff --git a/evil-collection-xref.el b/evil-collection-xref.el
index fa15bc4..f2e9945 100644
--- a/evil-collection-xref.el
+++ b/evil-collection-xref.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'xref)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 (defconst evil-collection-xref-maps '(xref--xref-buffer-mode-map))
 
 (defun evil-collection-xref-setup ()
diff --git a/evil-collection-ztree.el b/evil-collection-ztree.el
index 14b925a..0e52a10 100644
--- a/evil-collection-ztree.el
+++ b/evil-collection-ztree.el
@@ -29,7 +29,7 @@
 (require 'evil-collection-util)
 (require 'ztree nil t)
 
-(declare-function evil-collection-define-key "evil-collection.el")
+(declare-function evil-collection-define-key "evil-collection")
 
 (defvar ztree-mode-map)
 (defvar ztreediff-mode-map)