diff --git a/Main.hs b/Main.hs
index 0a24dba..8923555 100644
--- a/Main.hs
+++ b/Main.hs
@@ -31,7 +31,7 @@ main :: IO ()
 main = do
     handle (hPrint stderr) buildLaunch
     -- if buildLaunch returns, execute the trusted core
-    makeMain defaultConfig
+    xmonad defaultConfig
 
 -- | Build "~/.xmonad/Main.hs" with ghc, then execute it.  If there are no
 -- errors, this function does not return.  An exception is raised in any of
@@ -51,3 +51,4 @@ buildLaunch = do
     args <- getArgs
     executeFile (dir ++ "/Main") False args Nothing
     return ()
+
diff --git a/XMonad/Core.hs b/XMonad/Core.hs
index ff64457..edf7530 100644
--- a/XMonad/Core.hs
+++ b/XMonad/Core.hs
@@ -13,7 +13,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonad.Core (makeMain) where
+module XMonad.Core (xmonad) where
 
 import Data.Bits
 import qualified Data.Map as M
@@ -38,8 +38,8 @@ import System.IO
 -- |
 -- The main entry point
 --
-makeMain :: XConfig -> IO ()
-makeMain xmc = do
+xmonad :: XConfig -> IO ()
+xmonad xmc = do
     dpy   <- openDisplay ""
     let dflt = defaultScreen dpy