diff --git a/test/check_opts0.right b/test/check_opts0.right
index 18458186..5c5c7585 100644
--- a/test/check_opts0.right
+++ b/test/check_opts0.right
@@ -3,7 +3,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 
-Disc mode is listed as: CD-DATA Form 1
+Disc mode is listed as: CD-DATA (Mode 1)
 Media Catalog Number (MCN): not available
 __________________________________
 CD Analysis Report
diff --git a/test/check_opts1.right b/test/check_opts1.right
index 18458186..5c5c7585 100644
--- a/test/check_opts1.right
+++ b/test/check_opts1.right
@@ -3,7 +3,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 
-Disc mode is listed as: CD-DATA Form 1
+Disc mode is listed as: CD-DATA (Mode 1)
 Media Catalog Number (MCN): not available
 __________________________________
 CD Analysis Report
diff --git a/test/check_opts2.right b/test/check_opts2.right
index 96c905ed..deed4039 100644
--- a/test/check_opts2.right
+++ b/test/check_opts2.right
@@ -3,7 +3,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 
-Disc mode is listed as: CD-DATA Form 1
+Disc mode is listed as: CD-DATA (Mode 1)
 CD-ROM Track List (1 - 1)
   #: MSF       LSN     Type  Green?
   1: 00:02:00  000000  data  false
diff --git a/test/check_opts3.right b/test/check_opts3.right
index 96c905ed..deed4039 100644
--- a/test/check_opts3.right
+++ b/test/check_opts3.right
@@ -3,7 +3,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 
-Disc mode is listed as: CD-DATA Form 1
+Disc mode is listed as: CD-DATA (Mode 1)
 CD-ROM Track List (1 - 1)
   #: MSF       LSN     Type  Green?
   1: 00:02:00  000000  data  false
diff --git a/test/check_opts4.right b/test/check_opts4.right
index 8e75b2bd..29b507a9 100644
--- a/test/check_opts4.right
+++ b/test/check_opts4.right
@@ -3,7 +3,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 
-Disc mode is listed as: CD-DATA Form 1
+Disc mode is listed as: CD-DATA (Mode 1)
 CD-ROM Track List (1 - 1)
   #: MSF       LSN     Type  Green?
   1: 00:02:00  000000  data  false
diff --git a/test/check_opts5.right b/test/check_opts5.right
index 8e75b2bd..29b507a9 100644
--- a/test/check_opts5.right
+++ b/test/check_opts5.right
@@ -3,7 +3,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 
-Disc mode is listed as: CD-DATA Form 1
+Disc mode is listed as: CD-DATA (Mode 1)
 CD-ROM Track List (1 - 1)
   #: MSF       LSN     Type  Green?
   1: 00:02:00  000000  data  false
diff --git a/test/check_opts6.right b/test/check_opts6.right
index 8e75b2bd..29b507a9 100644
--- a/test/check_opts6.right
+++ b/test/check_opts6.right
@@ -3,7 +3,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 
-Disc mode is listed as: CD-DATA Form 1
+Disc mode is listed as: CD-DATA (Mode 1)
 CD-ROM Track List (1 - 1)
   #: MSF       LSN     Type  Green?
   1: 00:02:00  000000  data  false
diff --git a/test/check_opts7.right b/test/check_opts7.right
index 8e75b2bd..29b507a9 100644
--- a/test/check_opts7.right
+++ b/test/check_opts7.right
@@ -3,7 +3,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 
-Disc mode is listed as: CD-DATA Form 1
+Disc mode is listed as: CD-DATA (Mode 1)
 CD-ROM Track List (1 - 1)
   #: MSF       LSN     Type  Green?
   1: 00:02:00  000000  data  false
diff --git a/test/monvoisin.right b/test/monvoisin.right
index 24582f38..f741a9ce 100644
--- a/test/monvoisin.right
+++ b/test/monvoisin.right
@@ -3,7 +3,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 
-Disc mode is listed as: CD DATA Form 2
+Disc mode is listed as: CD DATA (Mode 2)
 CD-ROM Track List (1 - 2)
   #: MSF       LSN     Type  Green?
   1: 00:02:00  000000  XA    true
diff --git a/test/svcdgs.right b/test/svcdgs.right
index 289fecac..591de2fc 100644
--- a/test/svcdgs.right
+++ b/test/svcdgs.right
@@ -3,7 +3,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 
-Disc mode is listed as: CD DATA Form 2
+Disc mode is listed as: CD DATA (Mode 2)
 CD-ROM Track List (1 - 2)
   #: MSF       LSN     Type  Green?
   1: 00:02:00  000000  XA    true
diff --git a/test/videocd.right b/test/videocd.right
index 007a4372..24d7077d 100644
--- a/test/videocd.right
+++ b/test/videocd.right
@@ -3,7 +3,7 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
 __________________________________
 
-Disc mode is listed as: CD DATA Form 2
+Disc mode is listed as: CD DATA (Mode 2)
 CD-ROM Track List (1 - 5)
   #: MSF       LSN     Type  Green?
   1: 00:02:00  000000  XA    true