--- a/dom/media/gtest/moz.build
+++ b/dom/media/gtest/moz.build
@@ -56,18 +56,18 @@ TEST_HARNESS_FILES.gtest += [
     'test_case_1224369.vp8.ivf',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '/dom/media',
     '/dom/media/encoder',
-    '/dom/media/fmp4',
     '/dom/media/gmp',
+    '/dom/media/mp4',
     '/dom/media/platforms',
     '/dom/media/platforms/agnostic',
     '/security/certverifier',
     '/security/pkix/include',
 ]
 
 FINAL_LIBRARY = 'xul-gtest'
 

--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -54,17 +54,17 @@ DIRS += [
     'webspeech',
     'webvtt',
 ]
 
 if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
     DIRS += ['hls']
 
 if CONFIG['MOZ_FMP4']:
-    DIRS += ['fmp4']
+    DIRS += ['mp4']
 
 if CONFIG['MOZ_WEBRTC']:
     DIRS += ['bridge']
 
 TEST_DIRS += [
     'gtest',
 ]
 

rename from dom/media/fmp4/MP4Decoder.cpp
rename to dom/media/mp4/MP4Decoder.cpp

rename from dom/media/fmp4/MP4Decoder.h
rename to dom/media/mp4/MP4Decoder.h

rename from dom/media/fmp4/MP4Demuxer.cpp
rename to dom/media/mp4/MP4Demuxer.cpp

rename from dom/media/fmp4/MP4Demuxer.h
rename to dom/media/mp4/MP4Demuxer.h

rename from dom/media/fmp4/moz.build
rename to dom/media/mp4/moz.build