diff --git a/3gp/metadata/diff/sample.3gp.txt b/3gp/metadata/diff/sample.3gp.txt
index 4c19dd11..3e5303df 100644
--- a/3gp/metadata/diff/sample.3gp.txt
+++ b/3gp/metadata/diff/sample.3gp.txt
@@ -1,13 +1,24 @@
        FILE: sample.3gp
-       TYPE: QUICKTIME
+       TYPE: MP4
        
-JAVA   [ERROR: QuickTime] End of data reached.
-JAVA   [ERROR: QuickTime] End of data reached.
-JAVA   [ERROR: QuickTime] End of data reached.
+JAVA   [ERROR: MP4] End of data reached.
 DOTNET [QuickTime File Type - 0x0001] Major Brand = 3gp5
 DOTNET [QuickTime File Type - 0x0002] Minor Version = 256
 DOTNET [QuickTime File Type - 0x0003] Compatible Brands = 3gp5, 3gp4
-DOTNET 
+       
+JAVA   [MP4 - 0x0001] Major Brand = 3GPP Media (.3GP) Release 5
+JAVA   [MP4 - 0x0002] Minor Version = 256
+JAVA   [MP4 - 0x0003] Compatible Brands = [3GPP Media (.3GP) Release 5, 3GPP Media (.3GP) Release 4]
+JAVA   [MP4 - 0x0100] Creation Time = Sat Oct 29 03:36:40 AEST 2005
+JAVA   [MP4 - 0x0101] Modification Time = Sat Oct 29 03:36:40 AEST 2005
+JAVA   [MP4 - 0x0103] Duration = 2960
+JAVA   [MP4 - 0x0102] Media Time Scale = 600
+JAVA   [MP4 - 0x0104] Duration in Seconds = 00:00:05
+JAVA   [MP4 - 0x010f] Transformation Matrix = 65536 0 0 0 65536 0 0 0 1073741824
+JAVA   [MP4 - 0x0105] Preferred Rate = 1
+JAVA   [MP4 - 0x0106] Preferred Volume = 1
+JAVA   [MP4 - 0x010e] Next Track ID = 3
+JAVA   [MP4 - 0x0200] Rotation = 0
 DOTNET [QuickTime Movie Header - 0x0001] Version = 0
 DOTNET [QuickTime Movie Header - 0x0002] Flags = 0 0 0
 DOTNET [QuickTime Movie Header - 0x0003] Created = Fri Oct 28 17:36:40 2005
@@ -24,7 +35,15 @@ DOTNET [QuickTime Movie Header - 0x000d] Selection Time = 0
 DOTNET [QuickTime Movie Header - 0x000e] Selection Duration = 0
 DOTNET [QuickTime Movie Header - 0x000f] Current Time = 0
 DOTNET [QuickTime Movie Header - 0x0010] Next Track Id = 3
-DOTNET 
+       
+JAVA   [MP4 Sound - 0x0065] Creation Time = Sat Oct 29 03:36:40 +10:00 2005
+JAVA   [MP4 Sound - 0x0066] Modification Time = Sat Oct 29 03:36:40 +10:00 2005
+JAVA   [MP4 Sound - 0x0068] ISO 639-2 Language Code = eng
+JAVA   [MP4 Sound - 0x0131] Balance = 0
+JAVA   [MP4 Sound - 0x012d] Format = Unknown
+JAVA   [MP4 Sound - 0x012e] Number of Channels = 2
+JAVA   [MP4 Sound - 0x012f] Sample Size = 16
+JAVA   [MP4 Sound - 0x0130] Sample Rate = 8000
 DOTNET [QuickTime Track Header - 0x0001] Version = 0
 DOTNET [QuickTime Track Header - 0x0002] Flags = 0 0 1
 DOTNET [QuickTime Track Header - 0x0003] Created = Fri Oct 28 17:36:40 2005
@@ -38,19 +57,18 @@ DOTNET [QuickTime Track Header - 0x000c] Matrix = 1 0 0 0 1 0 0 0 1
 DOTNET [QuickTime Track Header - 0x000a] Width = 0
 DOTNET [QuickTime Track Header - 0x000b] Height = 0
        
-JAVA   [QuickTime - 0x1000] Major Brand = 3GPP Media (.3GP) Release 5
-JAVA   [QuickTime - 0x1001] Minor Version = 256
-JAVA   [QuickTime - 0x1002] Compatible Brands = [3GPP Media (.3GP) Release 5, 3GPP Media (.3GP) Release 4]
-JAVA   [QuickTime - 0x0100] Creation Time = Sat Oct 29 03:36:40 +10:00 2005
-JAVA   [QuickTime - 0x0101] Modification Time = Sat Oct 29 03:36:40 +10:00 2005
-JAVA   [QuickTime - 0x0103] Duration = 2960
-JAVA   [QuickTime - 0x0102] Media Time Scale = 600
-JAVA   [QuickTime - 0x0104] Duration in Seconds = 00:00:05
-JAVA   [QuickTime - 0x0105] Preferred Rate = 1
-JAVA   [QuickTime - 0x0106] Preferred Volume = 1
-JAVA   [QuickTime - 0x0107] Preview Time = 0
-JAVA   [QuickTime - 0x0108] Preview Duration = 0
-JAVA   [QuickTime - 0x0109] Poster Time = 0
+JAVA   [MP4 Video - 0x0065] Creation Time = Sat Oct 29 03:36:40 +10:00 2005
+JAVA   [MP4 Video - 0x0066] Modification Time = Sat Oct 29 03:36:40 +10:00 2005
+JAVA   [MP4 Video - 0x0068] ISO 639-2 Language Code = eng
+JAVA   [MP4 Video - 0x00d4] Opcolor = 0 0 0
+JAVA   [MP4 Video - 0x00d3] Graphics Mode = Copy
+JAVA   [MP4 Video - 0x00d2] Compression Type = MPEG-4
+JAVA   [MP4 Video - 0x00cc] Width = 176 pixels
+JAVA   [MP4 Video - 0x00cd] Height = 144 pixels
+JAVA   [MP4 Video - 0x00d1] Depth = 24-bit color
+JAVA   [MP4 Video - 0x00ce] Horizontal Resolution = 72
+JAVA   [MP4 Video - 0x00cf] Vertical Resolution = 72
+JAVA   [MP4 Video - 0x00d6] Frame Rate = 15
 DOTNET [QuickTime Track Header - 0x0001] Version = 0
 DOTNET [QuickTime Track Header - 0x0002] Flags = 0 0 1
 DOTNET [QuickTime Track Header - 0x0003] Created = Fri Oct 28 17:36:40 2005
@@ -64,24 +82,19 @@ DOTNET [QuickTime Track Header - 0x000c] Matrix = 1 0 0 0 1 0 0 0 1
 DOTNET [QuickTime Track Header - 0x000a] Width = 176
 DOTNET [QuickTime Track Header - 0x000b] Height = 144
 DOTNET [QuickTime Track Header - 0x000d] Rotation = 0
-JAVA   [QuickTime - 0x010a] Selection Time = 0
-JAVA   [QuickTime - 0x010b] Selection Duration = 0
-JAVA   [QuickTime - 0x010c] Current Time = 0
-JAVA   [QuickTime - 0x010d] Next Track ID = 3
-JAVA   [QuickTime - 0x010e] Rotation = 0
        
-JAVA   [File Type - 0x0001] Detected File Type Name = MOV
-JAVA   [File Type - 0x0002] Detected File Type Long Name = QuickTime Movie
-DOTNET [File Type - 0x0001] Detected File Type Name = QuickTime
-DOTNET [File Type - 0x0002] Detected File Type Long Name = QuickTime
-       [File Type - 0x0003] Detected MIME Type = video/quicktime
-       [File Type - 0x0004] Expected File Name Extension = mov
+       [File Type - 0x0001] Detected File Type Name = MP4
+       [File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+       [File Type - 0x0003] Detected MIME Type = video/mp4
+       [File Type - 0x0004] Expected File Name Extension = mp4
        
        [File - 0x0001] File Name = sample.3gp
        [File - 0x0002] File Size = 28561 bytes
        [File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
        
-JAVA   - QuickTime
+JAVA   - MP4
+JAVA   - MP4 Sound
+JAVA   - MP4 Video
 DOTNET - QuickTime File Type
 DOTNET - QuickTime Movie Header
 DOTNET - QuickTime Track Header
diff --git a/3gp/metadata/dotnet/sample.3gp.txt b/3gp/metadata/dotnet/sample.3gp.txt
index 31700fdd..f17e110c 100644
--- a/3gp/metadata/dotnet/sample.3gp.txt
+++ b/3gp/metadata/dotnet/sample.3gp.txt
@@ -1,5 +1,5 @@
 FILE: sample.3gp
-TYPE: QUICKTIME
+TYPE: MP4
 
 [QuickTime File Type - 0x0001] Major Brand = 3gp5
 [QuickTime File Type - 0x0002] Minor Version = 256
@@ -49,10 +49,10 @@ TYPE: QUICKTIME
 [QuickTime Track Header - 0x000b] Height = 144
 [QuickTime Track Header - 0x000d] Rotation = 0
 
-[File Type - 0x0001] Detected File Type Name = QuickTime
-[File Type - 0x0002] Detected File Type Long Name = QuickTime
-[File Type - 0x0003] Detected MIME Type = video/quicktime
-[File Type - 0x0004] Expected File Name Extension = mov
+[File Type - 0x0001] Detected File Type Name = MP4
+[File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+[File Type - 0x0003] Detected MIME Type = video/mp4
+[File Type - 0x0004] Expected File Name Extension = mp4
 
 [File - 0x0001] File Name = sample.3gp
 [File - 0x0002] File Size = 28561 bytes
diff --git a/3gp/metadata/java/sample.3gp.txt b/3gp/metadata/java/sample.3gp.txt
index 96a78a5e..3dc1a0ed 100644
--- a/3gp/metadata/java/sample.3gp.txt
+++ b/3gp/metadata/java/sample.3gp.txt
@@ -1,39 +1,56 @@
 FILE: sample.3gp
-TYPE: QUICKTIME
-
-[ERROR: QuickTime] End of data reached.
-[ERROR: QuickTime] End of data reached.
-[ERROR: QuickTime] End of data reached.
-
-[QuickTime - 0x1000] Major Brand = 3GPP Media (.3GP) Release 5
-[QuickTime - 0x1001] Minor Version = 256
-[QuickTime - 0x1002] Compatible Brands = [3GPP Media (.3GP) Release 5, 3GPP Media (.3GP) Release 4]
-[QuickTime - 0x0100] Creation Time = Sat Oct 29 03:36:40 +10:00 2005
-[QuickTime - 0x0101] Modification Time = Sat Oct 29 03:36:40 +10:00 2005
-[QuickTime - 0x0103] Duration = 2960
-[QuickTime - 0x0102] Media Time Scale = 600
-[QuickTime - 0x0104] Duration in Seconds = 00:00:05
-[QuickTime - 0x0105] Preferred Rate = 1
-[QuickTime - 0x0106] Preferred Volume = 1
-[QuickTime - 0x0107] Preview Time = 0
-[QuickTime - 0x0108] Preview Duration = 0
-[QuickTime - 0x0109] Poster Time = 0
-[QuickTime - 0x010a] Selection Time = 0
-[QuickTime - 0x010b] Selection Duration = 0
-[QuickTime - 0x010c] Current Time = 0
-[QuickTime - 0x010d] Next Track ID = 3
-[QuickTime - 0x010e] Rotation = 0
-
-[File Type - 0x0001] Detected File Type Name = MOV
-[File Type - 0x0002] Detected File Type Long Name = QuickTime Movie
-[File Type - 0x0003] Detected MIME Type = video/quicktime
-[File Type - 0x0004] Expected File Name Extension = mov
+TYPE: MP4
+
+[ERROR: MP4] End of data reached.
+
+[MP4 - 0x0001] Major Brand = 3GPP Media (.3GP) Release 5
+[MP4 - 0x0002] Minor Version = 256
+[MP4 - 0x0003] Compatible Brands = [3GPP Media (.3GP) Release 5, 3GPP Media (.3GP) Release 4]
+[MP4 - 0x0100] Creation Time = Sat Oct 29 03:36:40 AEST 2005
+[MP4 - 0x0101] Modification Time = Sat Oct 29 03:36:40 AEST 2005
+[MP4 - 0x0103] Duration = 2960
+[MP4 - 0x0102] Media Time Scale = 600
+[MP4 - 0x0104] Duration in Seconds = 00:00:05
+[MP4 - 0x010f] Transformation Matrix = 65536 0 0 0 65536 0 0 0 1073741824
+[MP4 - 0x0105] Preferred Rate = 1
+[MP4 - 0x0106] Preferred Volume = 1
+[MP4 - 0x010e] Next Track ID = 3
+[MP4 - 0x0200] Rotation = 0
+
+[MP4 Sound - 0x0065] Creation Time = Sat Oct 29 03:36:40 +10:00 2005
+[MP4 Sound - 0x0066] Modification Time = Sat Oct 29 03:36:40 +10:00 2005
+[MP4 Sound - 0x0068] ISO 639-2 Language Code = eng
+[MP4 Sound - 0x0131] Balance = 0
+[MP4 Sound - 0x012d] Format = Unknown
+[MP4 Sound - 0x012e] Number of Channels = 2
+[MP4 Sound - 0x012f] Sample Size = 16
+[MP4 Sound - 0x0130] Sample Rate = 8000
+
+[MP4 Video - 0x0065] Creation Time = Sat Oct 29 03:36:40 +10:00 2005
+[MP4 Video - 0x0066] Modification Time = Sat Oct 29 03:36:40 +10:00 2005
+[MP4 Video - 0x0068] ISO 639-2 Language Code = eng
+[MP4 Video - 0x00d4] Opcolor = 0 0 0
+[MP4 Video - 0x00d3] Graphics Mode = Copy
+[MP4 Video - 0x00d2] Compression Type = MPEG-4
+[MP4 Video - 0x00cc] Width = 176 pixels
+[MP4 Video - 0x00cd] Height = 144 pixels
+[MP4 Video - 0x00d1] Depth = 24-bit color
+[MP4 Video - 0x00ce] Horizontal Resolution = 72
+[MP4 Video - 0x00cf] Vertical Resolution = 72
+[MP4 Video - 0x00d6] Frame Rate = 15
+
+[File Type - 0x0001] Detected File Type Name = MP4
+[File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+[File Type - 0x0003] Detected MIME Type = video/mp4
+[File Type - 0x0004] Expected File Name Extension = mp4
 
 [File - 0x0001] File Name = sample.3gp
 [File - 0x0002] File Size = 28561 bytes
 [File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
 
-- QuickTime
+- MP4
+- MP4 Sound
+- MP4 Video
 - File Type
 - File
 
diff --git a/mp4/metadata/diff/ftyp3gp5.mp4.txt b/mp4/metadata/diff/ftyp3gp5.mp4.txt
index ec59dc9a..853c11ea 100644
--- a/mp4/metadata/diff/ftyp3gp5.mp4.txt
+++ b/mp4/metadata/diff/ftyp3gp5.mp4.txt
@@ -1,7 +1,7 @@
        FILE: ftyp3gp5.mp4
-       TYPE: QUICKTIME
+       TYPE: MP4
        
-JAVA   [ERROR: QuickTime] End of data reached.
+JAVA   [ERROR: MP4] End of data reached.
 DOTNET [QuickTime File Type - 0x0001] Major Brand = 3gp5
 DOTNET [QuickTime File Type - 0x0002] Minor Version = 0
 DOTNET [QuickTime File Type - 0x0003] Compatible Brands = 3gp5, isom
@@ -23,19 +23,19 @@ DOTNET [QuickTime Movie Header - 0x000e] Selection Duration = 0
 DOTNET [QuickTime Movie Header - 0x000f] Current Time = 0
 DOTNET [QuickTime Movie Header - 0x0010] Next Track Id = 65738
        
-JAVA   [QuickTime - 0x1000] Major Brand = 3GPP Media (.3GP) Release 5
-JAVA   [QuickTime - 0x1001] Minor Version = 0
-JAVA   [QuickTime - 0x1002] Compatible Brands = [3GPP Media (.3GP) Release 5, MP4  Base Media v1 [IS0 14496-12:2003]]
-JAVA   [QuickTime - 0x0100] Creation Time = Sat Oct 24 07:27:29 +11:00 2020
-JAVA   [QuickTime - 0x0101] Modification Time = Sat Oct 24 07:27:29 +11:00 2020
-JAVA   [QuickTime - 0x0103] Duration = 1300
-JAVA   [QuickTime - 0x0102] Media Time Scale = 1000
-JAVA   [QuickTime - 0x0104] Duration in Seconds = 00:00:02
-JAVA   [QuickTime - 0x0105] Preferred Rate = 1
-JAVA   [QuickTime - 0x0106] Preferred Volume = 1
-JAVA   [QuickTime - 0x0107] Preview Time = 0
-JAVA   [QuickTime - 0x0108] Preview Duration = 0
-JAVA   [QuickTime - 0x0109] Poster Time = 0
+JAVA   [MP4 - 0x0001] Major Brand = 3GPP Media (.3GP) Release 5
+JAVA   [MP4 - 0x0002] Minor Version = 0
+JAVA   [MP4 - 0x0003] Compatible Brands = [3GPP Media (.3GP) Release 5, MP4  Base Media v1 [IS0 14496-12:2003]]
+JAVA   [MP4 - 0x0100] Creation Time = Sat Oct 24 07:27:29 AEDT 2020
+JAVA   [MP4 - 0x0101] Modification Time = Sat Oct 24 07:27:29 AEDT 2020
+JAVA   [MP4 - 0x0103] Duration = 1300
+JAVA   [MP4 - 0x0102] Media Time Scale = 1000
+JAVA   [MP4 - 0x0104] Duration in Seconds = 00:00:02
+JAVA   [MP4 - 0x010f] Transformation Matrix = 65536 0 0 0 65536 0 0 0 1073741824
+JAVA   [MP4 - 0x0105] Preferred Rate = 1
+JAVA   [MP4 - 0x0106] Preferred Volume = 1
+JAVA   [MP4 - 0x010e] Next Track ID = 65738
+JAVA   [MP4 - 0x0200] Rotation = 90
 DOTNET [QuickTime Track Header - 0x0001] Version = 0
 DOTNET [QuickTime Track Header - 0x0002] Flags = 0 0 1
 DOTNET [QuickTime Track Header - 0x0003] Created = Fri Oct 23 20:27:29 2020
@@ -49,24 +49,21 @@ DOTNET [QuickTime Track Header - 0x000c] Matrix = 0 1 0 -1 0 0 0 0 1
 DOTNET [QuickTime Track Header - 0x000a] Width = 1280
 DOTNET [QuickTime Track Header - 0x000b] Height = 720
 DOTNET [QuickTime Track Header - 0x000d] Rotation = 90
-JAVA   [QuickTime - 0x010a] Selection Time = 0
-JAVA   [QuickTime - 0x010b] Selection Duration = 0
-JAVA   [QuickTime - 0x010c] Current Time = 0
-JAVA   [QuickTime - 0x010d] Next Track ID = 65738
-JAVA   [QuickTime - 0x010e] Rotation = -90
+JAVA   [MP4 - 0x2001] Latitude = 0
+JAVA   [MP4 - 0x2002] Longitude = 0
        
-JAVA   [QuickTime Video - 0x5001] Creation Time = Sat Oct 24 07:27:29 +11:00 2020
-JAVA   [QuickTime Video - 0x5002] Modification Time = Sat Oct 24 07:27:29 +11:00 2020
-JAVA   [QuickTime Video - 0x000c] Opcolor = 0 0 0
-JAVA   [QuickTime Video - 0x000b] Graphics Mode = Copy
-JAVA   [QuickTime Video - 0x0001] Vendor = Unknown
-JAVA   [QuickTime Video - 0x000a] Compression Type = H.264
-JAVA   [QuickTime Video - 0x0002] Temporal Quality = 0
-JAVA   [QuickTime Video - 0x0003] Spatial Quality = 0
-JAVA   [QuickTime Video - 0x0004] Width = 1280 pixels
-JAVA   [QuickTime Video - 0x0005] Height = 720 pixels
-JAVA   [QuickTime Video - 0x0009] Depth = 24-bit color
-JAVA   [QuickTime Video - 0x000d] Color Table = None
+JAVA   [MP4 Video - 0x0065] Creation Time = Sat Oct 24 07:27:29 +11:00 2020
+JAVA   [MP4 Video - 0x0066] Modification Time = Sat Oct 24 07:27:29 +11:00 2020
+JAVA   [MP4 Video - 0x0068] ISO 639-2 Language Code = und
+JAVA   [MP4 Video - 0x00d4] Opcolor = 0 0 0
+JAVA   [MP4 Video - 0x00d3] Graphics Mode = Copy
+JAVA   [MP4 Video - 0x00d2] Compression Type = H.264
+JAVA   [MP4 Video - 0x00cc] Width = 1280 pixels
+JAVA   [MP4 Video - 0x00cd] Height = 720 pixels
+JAVA   [MP4 Video - 0x00d1] Depth = 24-bit color
+JAVA   [MP4 Video - 0x00ce] Horizontal Resolution = 72
+JAVA   [MP4 Video - 0x00cf] Vertical Resolution = 72
+JAVA   [MP4 Video - 0x00d6] Frame Rate = 30
 DOTNET [QuickTime Track Header - 0x0001] Version = 0
 DOTNET [QuickTime Track Header - 0x0002] Flags = 0 0 1
 DOTNET [QuickTime Track Header - 0x0003] Created = Fri Oct 23 20:27:29 2020
@@ -79,33 +76,29 @@ DOTNET [QuickTime Track Header - 0x0009] Volume = 1
 DOTNET [QuickTime Track Header - 0x000c] Matrix = 1 0 0 0 1 0 0 0 1
 DOTNET [QuickTime Track Header - 0x000a] Width = 0
 DOTNET [QuickTime Track Header - 0x000b] Height = 0
-JAVA   [QuickTime Video - 0x0006] Horizontal Resolution = 72
-JAVA   [QuickTime Video - 0x0007] Vertical Resolution = 72
-JAVA   [QuickTime Video - 0x000e] Frame Rate = 30.303
        
-JAVA   [QuickTime Sound - 0x5001] Creation Time = Sat Oct 24 07:27:29 +11:00 2020
+JAVA   [MP4 Sound - 0x0065] Creation Time = Sat Oct 24 07:27:29 +11:00 2020
 DOTNET [QuickTime Metadata Header - 0x000e] GPS Location = +00.0000+000.0000/
-JAVA   [QuickTime Sound - 0x5002] Modification Time = Sat Oct 24 07:27:29 +11:00 2020
-JAVA   [QuickTime Sound - 0x0305] Balance = 0
-JAVA   [QuickTime Sound - 0x0301] Format = MPEG-4, Advanced Audio Coding (AAC)
-JAVA   [QuickTime Sound - 0x0302] Number of Channels = 2
-JAVA   [QuickTime Sound - 0x0303] Sample Size = 16
-JAVA   [QuickTime Sound - 0x0304] Sample Rate = 48000
+JAVA   [MP4 Sound - 0x0066] Modification Time = Sat Oct 24 07:27:29 +11:00 2020
+JAVA   [MP4 Sound - 0x0068] ISO 639-2 Language Code = und
+JAVA   [MP4 Sound - 0x0131] Balance = 0
+JAVA   [MP4 Sound - 0x012d] Format = MPEG-4, Advanced Audio Coding (AAC)
+JAVA   [MP4 Sound - 0x012e] Number of Channels = 2
+JAVA   [MP4 Sound - 0x012f] Sample Size = 16
+JAVA   [MP4 Sound - 0x0130] Sample Rate = 48000
        
-JAVA   [File Type - 0x0001] Detected File Type Name = MOV
-JAVA   [File Type - 0x0002] Detected File Type Long Name = QuickTime Movie
-DOTNET [File Type - 0x0001] Detected File Type Name = QuickTime
-DOTNET [File Type - 0x0002] Detected File Type Long Name = QuickTime
-       [File Type - 0x0003] Detected MIME Type = video/quicktime
-       [File Type - 0x0004] Expected File Name Extension = mov
+       [File Type - 0x0001] Detected File Type Name = MP4
+       [File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+       [File Type - 0x0003] Detected MIME Type = video/mp4
+       [File Type - 0x0004] Expected File Name Extension = mp4
        
        [File - 0x0001] File Name = ftyp3gp5.mp4
        [File - 0x0002] File Size = 1372726 bytes
        [File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
        
-JAVA   - QuickTime
-JAVA   - QuickTime Video
-JAVA   - QuickTime Sound
+JAVA   - MP4
+JAVA   - MP4 Video
+JAVA   - MP4 Sound
 DOTNET - QuickTime File Type
 DOTNET - QuickTime Movie Header
 DOTNET - QuickTime Track Header
diff --git a/mp4/metadata/dotnet/ftyp3gp5.mp4.txt b/mp4/metadata/dotnet/ftyp3gp5.mp4.txt
index 89d62210..6b4c1da4 100644
--- a/mp4/metadata/dotnet/ftyp3gp5.mp4.txt
+++ b/mp4/metadata/dotnet/ftyp3gp5.mp4.txt
@@ -1,5 +1,5 @@
 FILE: ftyp3gp5.mp4
-TYPE: QUICKTIME
+TYPE: MP4
 
 [QuickTime File Type - 0x0001] Major Brand = 3gp5
 [QuickTime File Type - 0x0002] Minor Version = 0
@@ -51,10 +51,10 @@ TYPE: QUICKTIME
 
 [QuickTime Metadata Header - 0x000e] GPS Location = +00.0000+000.0000/
 
-[File Type - 0x0001] Detected File Type Name = QuickTime
-[File Type - 0x0002] Detected File Type Long Name = QuickTime
-[File Type - 0x0003] Detected MIME Type = video/quicktime
-[File Type - 0x0004] Expected File Name Extension = mov
+[File Type - 0x0001] Detected File Type Name = MP4
+[File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+[File Type - 0x0003] Detected MIME Type = video/mp4
+[File Type - 0x0004] Expected File Name Extension = mp4
 
 [File - 0x0001] File Name = ftyp3gp5.mp4
 [File - 0x0002] File Size = 1372726 bytes
diff --git a/mp4/metadata/java/ftyp3gp5.mp4.txt b/mp4/metadata/java/ftyp3gp5.mp4.txt
index 69022bf9..c01d5dd9 100644
--- a/mp4/metadata/java/ftyp3gp5.mp4.txt
+++ b/mp4/metadata/java/ftyp3gp5.mp4.txt
@@ -1,63 +1,58 @@
 FILE: ftyp3gp5.mp4
-TYPE: QUICKTIME
-
-[ERROR: QuickTime] End of data reached.
-
-[QuickTime - 0x1000] Major Brand = 3GPP Media (.3GP) Release 5
-[QuickTime - 0x1001] Minor Version = 0
-[QuickTime - 0x1002] Compatible Brands = [3GPP Media (.3GP) Release 5, MP4  Base Media v1 [IS0 14496-12:2003]]
-[QuickTime - 0x0100] Creation Time = Sat Oct 24 07:27:29 +11:00 2020
-[QuickTime - 0x0101] Modification Time = Sat Oct 24 07:27:29 +11:00 2020
-[QuickTime - 0x0103] Duration = 1300
-[QuickTime - 0x0102] Media Time Scale = 1000
-[QuickTime - 0x0104] Duration in Seconds = 00:00:02
-[QuickTime - 0x0105] Preferred Rate = 1
-[QuickTime - 0x0106] Preferred Volume = 1
-[QuickTime - 0x0107] Preview Time = 0
-[QuickTime - 0x0108] Preview Duration = 0
-[QuickTime - 0x0109] Poster Time = 0
-[QuickTime - 0x010a] Selection Time = 0
-[QuickTime - 0x010b] Selection Duration = 0
-[QuickTime - 0x010c] Current Time = 0
-[QuickTime - 0x010d] Next Track ID = 65738
-[QuickTime - 0x010e] Rotation = -90
-
-[QuickTime Video - 0x5001] Creation Time = Sat Oct 24 07:27:29 +11:00 2020
-[QuickTime Video - 0x5002] Modification Time = Sat Oct 24 07:27:29 +11:00 2020
-[QuickTime Video - 0x000c] Opcolor = 0 0 0
-[QuickTime Video - 0x000b] Graphics Mode = Copy
-[QuickTime Video - 0x0001] Vendor = Unknown
-[QuickTime Video - 0x000a] Compression Type = H.264
-[QuickTime Video - 0x0002] Temporal Quality = 0
-[QuickTime Video - 0x0003] Spatial Quality = 0
-[QuickTime Video - 0x0004] Width = 1280 pixels
-[QuickTime Video - 0x0005] Height = 720 pixels
-[QuickTime Video - 0x0009] Depth = 24-bit color
-[QuickTime Video - 0x000d] Color Table = None
-[QuickTime Video - 0x0006] Horizontal Resolution = 72
-[QuickTime Video - 0x0007] Vertical Resolution = 72
-[QuickTime Video - 0x000e] Frame Rate = 30.303
-
-[QuickTime Sound - 0x5001] Creation Time = Sat Oct 24 07:27:29 +11:00 2020
-[QuickTime Sound - 0x5002] Modification Time = Sat Oct 24 07:27:29 +11:00 2020
-[QuickTime Sound - 0x0305] Balance = 0
-[QuickTime Sound - 0x0301] Format = MPEG-4, Advanced Audio Coding (AAC)
-[QuickTime Sound - 0x0302] Number of Channels = 2
-[QuickTime Sound - 0x0303] Sample Size = 16
-[QuickTime Sound - 0x0304] Sample Rate = 48000
-
-[File Type - 0x0001] Detected File Type Name = MOV
-[File Type - 0x0002] Detected File Type Long Name = QuickTime Movie
-[File Type - 0x0003] Detected MIME Type = video/quicktime
-[File Type - 0x0004] Expected File Name Extension = mov
+TYPE: MP4
+
+[ERROR: MP4] End of data reached.
+
+[MP4 - 0x0001] Major Brand = 3GPP Media (.3GP) Release 5
+[MP4 - 0x0002] Minor Version = 0
+[MP4 - 0x0003] Compatible Brands = [3GPP Media (.3GP) Release 5, MP4  Base Media v1 [IS0 14496-12:2003]]
+[MP4 - 0x0100] Creation Time = Sat Oct 24 07:27:29 AEDT 2020
+[MP4 - 0x0101] Modification Time = Sat Oct 24 07:27:29 AEDT 2020
+[MP4 - 0x0103] Duration = 1300
+[MP4 - 0x0102] Media Time Scale = 1000
+[MP4 - 0x0104] Duration in Seconds = 00:00:02
+[MP4 - 0x010f] Transformation Matrix = 65536 0 0 0 65536 0 0 0 1073741824
+[MP4 - 0x0105] Preferred Rate = 1
+[MP4 - 0x0106] Preferred Volume = 1
+[MP4 - 0x010e] Next Track ID = 65738
+[MP4 - 0x0200] Rotation = 90
+[MP4 - 0x2001] Latitude = 0
+[MP4 - 0x2002] Longitude = 0
+
+[MP4 Video - 0x0065] Creation Time = Sat Oct 24 07:27:29 +11:00 2020
+[MP4 Video - 0x0066] Modification Time = Sat Oct 24 07:27:29 +11:00 2020
+[MP4 Video - 0x0068] ISO 639-2 Language Code = und
+[MP4 Video - 0x00d4] Opcolor = 0 0 0
+[MP4 Video - 0x00d3] Graphics Mode = Copy
+[MP4 Video - 0x00d2] Compression Type = H.264
+[MP4 Video - 0x00cc] Width = 1280 pixels
+[MP4 Video - 0x00cd] Height = 720 pixels
+[MP4 Video - 0x00d1] Depth = 24-bit color
+[MP4 Video - 0x00ce] Horizontal Resolution = 72
+[MP4 Video - 0x00cf] Vertical Resolution = 72
+[MP4 Video - 0x00d6] Frame Rate = 30
+
+[MP4 Sound - 0x0065] Creation Time = Sat Oct 24 07:27:29 +11:00 2020
+[MP4 Sound - 0x0066] Modification Time = Sat Oct 24 07:27:29 +11:00 2020
+[MP4 Sound - 0x0068] ISO 639-2 Language Code = und
+[MP4 Sound - 0x0131] Balance = 0
+[MP4 Sound - 0x012d] Format = MPEG-4, Advanced Audio Coding (AAC)
+[MP4 Sound - 0x012e] Number of Channels = 2
+[MP4 Sound - 0x012f] Sample Size = 16
+[MP4 Sound - 0x0130] Sample Rate = 48000
+
+[File Type - 0x0001] Detected File Type Name = MP4
+[File Type - 0x0002] Detected File Type Long Name = MPEG-4 Part 14
+[File Type - 0x0003] Detected MIME Type = video/mp4
+[File Type - 0x0004] Expected File Name Extension = mp4
 
 [File - 0x0001] File Name = ftyp3gp5.mp4
 [File - 0x0002] File Size = 1372726 bytes
 [File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>
 
-- QuickTime
-- QuickTime Video
-- QuickTime Sound
+- MP4
+- MP4 Video
+- MP4 Sound
 - File Type
 - File