diff --git a/src/Yi/Keymap/Emacs.hs b/src/Yi/Keymap/Emacs.hs
--- a/src/Yi/Keymap/Emacs.hs
+++ b/src/Yi/Keymap/Emacs.hs
@@ -19,7 +19,7 @@
 -- native names.
 
 module Yi.Keymap.Emacs ( keymap
-                       , mkKeymap
+                       , mkKeymapSet
                        , defKeymap
                        , ModeMap(..)
                        , eKeymap
@@ -27,13 +27,13 @@
                        ) where
 
 import Control.Applicative      (Alternative ((<|>), empty, some))
-import Lens.Micro.Platform      ((.=), makeLenses, (%=))
 import Control.Monad            (replicateM_, unless, void)
 import Control.Monad.State      (gets)
 import Data.Char                (digitToInt, isDigit)
 import Data.Maybe               (fromMaybe)
 import Data.Prototype           (Proto (Proto), extractValue)
 import Data.Text                ()
+import Lens.Micro.Platform      ((.=), makeLenses, (%=))
 import Yi.Buffer
 import Yi.Command               (shellCommandE)
 import Yi.Core
@@ -58,10 +58,10 @@
 $(makeLenses ''ModeMap)
 
 keymap :: KeymapSet
-keymap = mkKeymap defKeymap
+keymap = mkKeymapSet defKeymap
 
-mkKeymap :: Proto ModeMap -> KeymapSet
-mkKeymap = modelessKeymapSet . _eKeymap . extractValue
+mkKeymapSet :: Proto ModeMap -> KeymapSet
+mkKeymapSet = modelessKeymapSet . _eKeymap . extractValue
 
 defKeymap :: Proto ModeMap
 defKeymap = Proto template
diff --git a/yi-keymap-emacs.cabal b/yi-keymap-emacs.cabal
--- a/yi-keymap-emacs.cabal
+++ b/yi-keymap-emacs.cabal
@@ -3,7 +3,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           yi-keymap-emacs
-version:        0.13.0.1
+version:        0.13.0.2
 synopsis:       Emacs keymap for Yi editor
 category:       Yi
 homepage:       https://github.com/yi-editor/yi#readme