diff --git a/ChangeLog b/ChangeLog
index d944022..caf2446 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-04  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* examples/ARcalibrate.py:
+	* examples/readhtoa.py:
+	* examples/readtoc.py:
+	* morituri/program/cdrdao.py:
+	  Rename ReadTOCTask to ReadIndexTableTask.
+	  Rename ReadTableTask to ReadTOCTask.
+
 2009-05-04  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/program/cdrdao.py:
diff --git a/examples/ARcalibrate.py b/examples/ARcalibrate.py
index 24baa2a..f01b6eb 100644
--- a/examples/ARcalibrate.py
+++ b/examples/ARcalibrate.py
@@ -107,7 +107,7 @@ def main(argv):
             offsets.append(int(b))
 
     # first get the Table Of Contents of the CD
-    t = cdrdao.ReadTableTask()
+    t = cdrdao.ReadTOCTask()
 
     if options.runner == 'cli':
         runner = task.SyncRunner()
diff --git a/examples/readhtoa.py b/examples/readhtoa.py
index c63dc78..a71579d 100644
--- a/examples/readhtoa.py
+++ b/examples/readhtoa.py
@@ -14,7 +14,7 @@ gobject.threads_init()
 def main():
     log.init()
     runner = task.SyncRunner()
-    t = cdrdao.ReadTOCTask()
+    t = cdrdao.ReadIndexTableTask()
     runner.run(t)
 
     # now check if we have a hidden track one audio
diff --git a/examples/readtoc.py b/examples/readtoc.py
index 21866e7..8494512 100644
--- a/examples/readtoc.py
+++ b/examples/readtoc.py
@@ -7,7 +7,7 @@ from morituri.program import cdrdao
 def main():
     log.init()
     runner = task.SyncRunner()
-    t = cdrdao.ReadTOCTask()
+    t = cdrdao.ReadIndexTableTask()
     runner.run(t)
     print 'runner done', t.toc
 
diff --git a/morituri/program/cdrdao.py b/morituri/program/cdrdao.py
index b2985b7..70abab7 100644
--- a/morituri/program/cdrdao.py
+++ b/morituri/program/cdrdao.py
@@ -234,7 +234,7 @@ class CDRDAOTask(task.Task):
         raise NotImplentedError
 
 
-class ReadTOCTask(CDRDAOTask):
+class ReadIndexTableTask(CDRDAOTask):
     """
     I am a task that reads all indexes of a CD.
 
@@ -264,7 +264,7 @@ class ReadTOCTask(CDRDAOTask):
         self.toc.parse()
         os.unlink(self._toc)
 
-class ReadTableTask(CDRDAOTask):
+class ReadTOCTask(CDRDAOTask):
     """
     I am a task that reads the TOC of a CD, without pregaps.
     """