diff --git a/misc/header.py b/misc/header.py
index 15b83ba..2bee413 100644
--- a/misc/header.py
+++ b/misc/header.py
@@ -5,17 +5,17 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 # 
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # 
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/morituri/command/accurip.py b/morituri/command/accurip.py
index 09ae087..e1b1868 100644
--- a/morituri/command/accurip.py
+++ b/morituri/command/accurip.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
 
diff --git a/morituri/command/cd.py b/morituri/command/cd.py
index 38e03e0..58a4f79 100644
--- a/morituri/command/cd.py
+++ b/morituri/command/cd.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
 import os
diff --git a/morituri/command/debug.py b/morituri/command/debug.py
index c6310db..5d2b57f 100644
--- a/morituri/command/debug.py
+++ b/morituri/command/debug.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
 import sys
diff --git a/morituri/command/drive.py b/morituri/command/drive.py
index e8d4498..af1a2ad 100644
--- a/morituri/command/drive.py
+++ b/morituri/command/drive.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
 
diff --git a/morituri/command/image.py b/morituri/command/image.py
index 606ed81..fde28f3 100644
--- a/morituri/command/image.py
+++ b/morituri/command/image.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import sys
diff --git a/morituri/command/offset.py b/morituri/command/offset.py
index 065f2ea..6fe9d75 100644
--- a/morituri/command/offset.py
+++ b/morituri/command/offset.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
 import os
diff --git a/morituri/common/accurip.py b/morituri/common/accurip.py
index e9fb31f..1c5e5d8 100644
--- a/morituri/common/accurip.py
+++ b/morituri/common/accurip.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import errno
 import os
diff --git a/morituri/common/cache.py b/morituri/common/cache.py
index 260abe1..d87de98 100644
--- a/morituri/common/cache.py
+++ b/morituri/common/cache.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import os.path
diff --git a/morituri/common/checksum.py b/morituri/common/checksum.py
index 9ed12a8..9a5de58 100644
--- a/morituri/common/checksum.py
+++ b/morituri/common/checksum.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import binascii
 import wave
diff --git a/morituri/common/common.py b/morituri/common/common.py
index 641720f..068dd25 100644
--- a/morituri/common/common.py
+++ b/morituri/common/common.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 
 import os
diff --git a/morituri/common/config.py b/morituri/common/config.py
index 66e2399..136e5e4 100644
--- a/morituri/common/config.py
+++ b/morituri/common/config.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import ConfigParser
 import codecs
diff --git a/morituri/common/directory.py b/morituri/common/directory.py
index a15041e..53e0e57 100644
--- a/morituri/common/directory.py
+++ b/morituri/common/directory.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2013 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 from os import getenv, makedirs
 from os.path import join, expanduser, exists
diff --git a/morituri/common/drive.py b/morituri/common/drive.py
index f0e5867..62b89e2 100644
--- a/morituri/common/drive.py
+++ b/morituri/common/drive.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 
diff --git a/morituri/common/encode.py b/morituri/common/encode.py
index 4d3b69a..28f489a 100644
--- a/morituri/common/encode.py
+++ b/morituri/common/encode.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 
 from mutagen.flac import FLAC
diff --git a/morituri/common/mbngs.py b/morituri/common/mbngs.py
index fb4d1e1..1b7751e 100644
--- a/morituri/common/mbngs.py
+++ b/morituri/common/mbngs.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009, 2010, 2011 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 Handles communication with the musicbrainz server using NGS.
diff --git a/morituri/common/path.py b/morituri/common/path.py
index cb595ae..56f775b 100644
--- a/morituri/common/path.py
+++ b/morituri/common/path.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
 
diff --git a/morituri/common/program.py b/morituri/common/program.py
index cc5bbaf..e69706e 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009, 2010, 2011 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 Common functionality and class for all programs using morituri.
diff --git a/morituri/common/renamer.py b/morituri/common/renamer.py
index 0373064..18ab98b 100644
--- a/morituri/common/renamer.py
+++ b/morituri/common/renamer.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import tempfile
diff --git a/morituri/extern/task/task.py b/morituri/extern/task/task.py
index da4639a..05f9f4c 100644
--- a/morituri/extern/task/task.py
+++ b/morituri/extern/task/task.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
 
diff --git a/morituri/image/cue.py b/morituri/image/cue.py
index c774ccf..934f0c5 100644
--- a/morituri/image/cue.py
+++ b/morituri/image/cue.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 Reading .cue files
diff --git a/morituri/image/image.py b/morituri/image/image.py
index d2f2b92..31f6beb 100644
--- a/morituri/image/image.py
+++ b/morituri/image/image.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 Wrap on-disk CD images based on the .cue file.
diff --git a/morituri/image/table.py b/morituri/image/table.py
index fbd7cc0..28e2aff 100644
--- a/morituri/image/table.py
+++ b/morituri/image/table.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 Wrap Table of Contents.
diff --git a/morituri/image/toc.py b/morituri/image/toc.py
index 45ae12f..2bf7304 100644
--- a/morituri/image/toc.py
+++ b/morituri/image/toc.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 Reading .toc files
diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
index b2321ad..b674461 100644
--- a/morituri/program/cdparanoia.py
+++ b/morituri/program/cdparanoia.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import errno
 import os
diff --git a/morituri/result/result.py b/morituri/result/result.py
index 52e5f47..1487677 100644
--- a/morituri/result/result.py
+++ b/morituri/result/result.py
@@ -5,20 +5,20 @@
 
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import pkg_resources
 import time