diff --git a/whipper/command/cd.py b/whipper/command/cd.py
index c01fb3a..7ec864f 100644
--- a/whipper/command/cd.py
+++ b/whipper/command/cd.py
@@ -257,7 +257,7 @@ Log files will log the path to tracks relative to this directory.
         _CD.add_arguments(self.parser)
 
         self.parser.add_argument('-L', '--logger',
-            action="store", dest="logger", default='morituri',
+            action="store", dest="logger", default='whipper',
             help="logger to use (choose from '" + "', '".join(loggers) + "')")
         # FIXME: get from config
         self.parser.add_argument('-o', '--offset',
diff --git a/whipper/command/debug.py b/whipper/command/debug.py
index e02e31c..e9683f6 100644
--- a/whipper/command/debug.py
+++ b/whipper/command/debug.py
@@ -89,7 +89,7 @@ class RCLog(BaseCommand):
         self.parser.add_argument(
             '-L', '--logger',
             action="store", dest="logger",
-            default='morituri',
+            default='whipper',
             help="logger to use (choose from '" + "', '".join(loggers) + "')"
         )
 
diff --git a/whipper/result/logger.py b/whipper/result/logger.py
index 3379264..9adfebf 100644
--- a/whipper/result/logger.py
+++ b/whipper/result/logger.py
@@ -7,7 +7,7 @@ from whipper.common import common
 from whipper.result import result
 
 
-class MorituriLogger(result.Logger):
+class WhipperLogger(result.Logger):
 
     _accuratelyRipped = 0
     _inARDatabase = 0
diff --git a/whipper/result/result.py b/whipper/result/result.py
index 5b9a395..6dcbe9a 100644
--- a/whipper/result/result.py
+++ b/whipper/result/result.py
@@ -153,7 +153,7 @@ class EntryPoint(object):
 
     def load(self):
         from whipper.result import logger
-        return logger.MorituriLogger
+        return logger.WhipperLogger
 
 
 def getLoggers():