diff --git a/include/exiv2/bmffimage.hpp b/include/exiv2/bmffimage.hpp
index cfefea13..67e09e3e 100644
--- a/include/exiv2/bmffimage.hpp
+++ b/include/exiv2/bmffimage.hpp
@@ -75,7 +75,7 @@ namespace Exiv2
         //@{
         /*!
           @brief parse embedded tiff file
-          @param root_tag root of parse tree Tag::root, Tag::cr3_exif etc.
+          @param root_tag root of parse tree Tag::root, Tag::cmt2 etc.
           @param length tiff block length
           @param start offset in file (default, io_->tell())
          @
diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
index 595ccf7d..b99f7dee 100644
--- a/src/bmffimage.cpp
+++ b/src/bmffimage.cpp
@@ -354,13 +354,13 @@ namespace Exiv2
                 parseTiff(Internal::Tag::root, box.length);
                 break;
             case TAG_cmt2:
-                parseTiff(Internal::Tag::cr3_exif, box.length);
+                parseTiff(Internal::Tag::cmt2, box.length);
                 break;
             case TAG_cmt3:
-                parseTiff(Internal::Tag::cr3_mn, box.length);
+                parseTiff(Internal::Tag::cmt3, box.length);
                 break;
             case TAG_cmt4:
-                parseTiff(Internal::Tag::cr3_gps, box.length);
+                parseTiff(Internal::Tag::cmt4, box.length);
                 break;
 
             default: break ; /* do nothing */
diff --git a/src/tiffcomposite_int.hpp b/src/tiffcomposite_int.hpp
index b23f4dd9..f51bbbf3 100644
--- a/src/tiffcomposite_int.hpp
+++ b/src/tiffcomposite_int.hpp
@@ -82,9 +82,9 @@ namespace Exiv2 {
         const uint32_t all       =  0x40000; //!< Special tag: all tags in a group
         const uint32_t pana      =  0x80000; //!< Special tag: root IFD of Panasonic RAW images
         const uint32_t fuji      = 0x100000; //!< Special tag: root IFD of Fujifilm RAF images
-        const uint32_t cr3_exif  = 0x110000; //!< Special tag: root IFD of CR3 images
-        const uint32_t cr3_mn    = 0x120000; //!< Special tag: root IFD of CR3 images
-        const uint32_t cr3_gps   = 0x130000; //!< Special tag: root IFD of CR3 images
+        const uint32_t cmt2      = 0x110000; //!< Special tag: root IFD of CR3 images
+        const uint32_t cmt3      = 0x120000; //!< Special tag: root IFD of CR3 images
+        const uint32_t cmt4      = 0x130000; //!< Special tag: root IFD of CR3 images
     }
 
     /*!
diff --git a/src/tiffimage_int.cpp b/src/tiffimage_int.cpp
index 05d32621..c31ed754 100644
--- a/src/tiffimage_int.cpp
+++ b/src/tiffimage_int.cpp
@@ -1126,11 +1126,11 @@ namespace Exiv2 {
         { Tag::fuji, ifdIdNotSet,      newTiffDirectory<fujiId>                  },
         {    0xf000, fujiId,           newTiffSubIfd<fujiId>                     },
 
+        // CR3 images #1475
+        { Tag::cmt2, ifdIdNotSet,      newTiffDirectory<exifId>                  },
+        { Tag::cmt3, ifdIdNotSet,      newTiffDirectory<canonId>                 },
+        { Tag::cmt4, ifdIdNotSet,      newTiffDirectory<gpsId>                   },
 
-        // CR3 images
-        { Tag::cr3_exif, ifdIdNotSet,  newTiffDirectory<exifId>                  },
-        { Tag::cr3_mn, ifdIdNotSet,    newTiffDirectory<canonId>                  },
-        { Tag::cr3_gps, ifdIdNotSet,   newTiffDirectory<gpsId>                  },
         // IFD0
         {    0x8769, ifd0Id,           newTiffSubIfd<exifId>                     },
         {    0x8825, ifd0Id,           newTiffSubIfd<gpsId>                      },