diff --git a/media/base/adapted_video_track_source.cc b/media/base/adapted_video_track_source.cc
index c0a4d36..531fa45 100644
--- a/media/base/adapted_video_track_source.cc
+++ b/media/base/adapted_video_track_source.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/adaptedvideotracksource.h"
+#include "media/base/adapted_video_track_source.h"
 
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_rotation.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 
diff --git a/media/base/adapted_video_track_source.h b/media/base/adapted_video_track_source.h
index 9cd467f..a995fe8 100644
--- a/media/base/adapted_video_track_source.h
+++ b/media/base/adapted_video_track_source.h
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
-#define MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
+#ifndef MEDIA_BASE_ADAPTED_VIDEO_TRACK_SOURCE_H_
+#define MEDIA_BASE_ADAPTED_VIDEO_TRACK_SOURCE_H_
 
 #include <stdint.h>
 
 #include "absl/types/optional.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/notifier.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_sink_interface.h"
 #include "api/video/video_source_interface.h"
-#include "media/base/videoadapter.h"
-#include "media/base/videobroadcaster.h"
-#include "rtc_base/criticalsection.h"
+#include "media/base/video_adapter.h"
+#include "media/base/video_broadcaster.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
 
@@ -91,4 +91,4 @@
 
 }  // namespace rtc
 
-#endif  // MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
+#endif  // MEDIA_BASE_ADAPTED_VIDEO_TRACK_SOURCE_H_
diff --git a/media/base/audio_source.h b/media/base/audio_source.h
index 199b614..d5cf629 100644
--- a/media/base/audio_source.h
+++ b/media/base/audio_source.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_AUDIOSOURCE_H_
-#define MEDIA_BASE_AUDIOSOURCE_H_
+#ifndef MEDIA_BASE_AUDIO_SOURCE_H_
+#define MEDIA_BASE_AUDIO_SOURCE_H_
 
 #include <cstddef>
 
@@ -46,4 +46,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_AUDIOSOURCE_H_
+#endif  // MEDIA_BASE_AUDIO_SOURCE_H_
diff --git a/media/base/codec.cc b/media/base/codec.cc
index 0a1c715..805a79e 100644
--- a/media/base/codec.cc
+++ b/media/base/codec.cc
@@ -17,7 +17,7 @@
 #include "media/base/vp9_profile.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/strings/string_builder.h"
 
 namespace cricket {
diff --git a/media/base/codec.h b/media/base/codec.h
index 0ca6535..fe4455d 100644
--- a/media/base/codec.h
+++ b/media/base/codec.h
@@ -16,9 +16,9 @@
 #include <string>
 #include <vector>
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "api/video_codecs/sdp_video_format.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace cricket {
diff --git a/media/base/device.h b/media/base/device.h
index 7910c97..9ae844f 100644
--- a/media/base/device.h
+++ b/media/base/device.h
@@ -13,7 +13,7 @@
 
 #include <string>
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 
 namespace cricket {
 
diff --git a/media/base/fake_frame_source.cc b/media/base/fake_frame_source.cc
index 5f829af..2573db1 100644
--- a/media/base/fake_frame_source.cc
+++ b/media/base/fake_frame_source.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/fakeframesource.h"
+#include "media/base/fake_frame_source.h"
 
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace cricket {
 
diff --git a/media/base/fake_frame_source.h b/media/base/fake_frame_source.h
index fb433ae..d6f71be 100644
--- a/media/base/fake_frame_source.h
+++ b/media/base/fake_frame_source.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_FAKEFRAMESOURCE_H_
-#define MEDIA_BASE_FAKEFRAMESOURCE_H_
+#ifndef MEDIA_BASE_FAKE_FRAME_SOURCE_H_
+#define MEDIA_BASE_FAKE_FRAME_SOURCE_H_
 
 #include "api/video/video_frame.h"
 
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace cricket {
 
@@ -48,4 +48,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_FAKEFRAMESOURCE_H_
+#endif  // MEDIA_BASE_FAKE_FRAME_SOURCE_H_
diff --git a/media/base/fake_media_engine.cc b/media/base/fake_media_engine.cc
index b48206f..ab8ce99 100644
--- a/media/base/fake_media_engine.cc
+++ b/media/base/fake_media_engine.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/fakemediaengine.h"
+#include "media/base/fake_media_engine.h"
 
 #include <utility>
 
diff --git a/media/base/fake_media_engine.h b/media/base/fake_media_engine.h
index e3a0638..ff8f44d 100644
--- a/media/base/fake_media_engine.h
+++ b/media/base/fake_media_engine.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_FAKEMEDIAENGINE_H_
-#define MEDIA_BASE_FAKEMEDIAENGINE_H_
+#ifndef MEDIA_BASE_FAKE_MEDIA_ENGINE_H_
+#define MEDIA_BASE_FAKE_MEDIA_ENGINE_H_
 
 #include <list>
 #include <map>
@@ -20,14 +20,14 @@
 #include <vector>
 
 #include "api/call/audio_sink.h"
-#include "media/base/audiosource.h"
-#include "media/base/mediaengine.h"
-#include "media/base/rtputils.h"
-#include "media/base/streamparams.h"
-#include "media/engine/webrtcvideoengine.h"
+#include "media/base/audio_source.h"
+#include "media/base/media_engine.h"
+#include "media/base/rtp_utils.h"
+#include "media/base/stream_params.h"
+#include "media/engine/webrtc_video_engine.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/network_route.h"
 
 using webrtc::RtpExtension;
 
@@ -594,4 +594,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_FAKEMEDIAENGINE_H_
+#endif  // MEDIA_BASE_FAKE_MEDIA_ENGINE_H_
diff --git a/media/base/fake_network_interface.h b/media/base/fake_network_interface.h
index dfd3407..e61202f 100644
--- a/media/base/fake_network_interface.h
+++ b/media/base/fake_network_interface.h
@@ -8,21 +8,21 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_FAKENETWORKINTERFACE_H_
-#define MEDIA_BASE_FAKENETWORKINTERFACE_H_
+#ifndef MEDIA_BASE_FAKE_NETWORK_INTERFACE_H_
+#define MEDIA_BASE_FAKE_NETWORK_INTERFACE_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
-#include "media/base/mediachannel.h"
-#include "media/base/rtputils.h"
-#include "rtc_base/byteorder.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/criticalsection.h"
+#include "media/base/media_channel.h"
+#include "media/base/rtp_utils.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/dscp.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
 #include "rtc_base/thread.h"
 
 namespace cricket {
@@ -224,4 +224,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_FAKENETWORKINTERFACE_H_
+#endif  // MEDIA_BASE_FAKE_NETWORK_INTERFACE_H_
diff --git a/media/base/fake_rtp.cc b/media/base/fake_rtp.cc
index 2bf0211..751766e 100644
--- a/media/base/fake_rtp.cc
+++ b/media/base/fake_rtp.cc
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <algorithm>
 
-#include "media/base/fakertp.h"
+#include "media/base/fake_rtp.h"
 #include "rtc_base/checks.h"
 #include "test/gtest.h"
 
diff --git a/media/base/fake_rtp.h b/media/base/fake_rtp.h
index 946f302..07c8e72 100644
--- a/media/base/fake_rtp.h
+++ b/media/base/fake_rtp.h
@@ -10,8 +10,8 @@
 
 // Fake RTP and RTCP packets to use in unit tests.
 
-#ifndef MEDIA_BASE_FAKERTP_H_
-#define MEDIA_BASE_FAKERTP_H_
+#ifndef MEDIA_BASE_FAKE_RTP_H_
+#define MEDIA_BASE_FAKE_RTP_H_
 
 #include <cstddef>  // size_t
 #include <vector>
@@ -120,4 +120,4 @@
                              const std::vector<int> encrypted_headers,
                              bool expect_equal);
 
-#endif  // MEDIA_BASE_FAKERTP_H_
+#endif  // MEDIA_BASE_FAKE_RTP_H_
diff --git a/media/base/fake_video_capturer.cc b/media/base/fake_video_capturer.cc
index c604387..7535b16 100644
--- a/media/base/fake_video_capturer.cc
+++ b/media/base/fake_video_capturer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/fakevideocapturer.h"
+#include "media/base/fake_video_capturer.h"
 
 #include <string.h>
 #include <cstdint>
@@ -19,7 +19,7 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace cricket {
 
diff --git a/media/base/fake_video_capturer.h b/media/base/fake_video_capturer.h
index 4a49f45..3cb64b0 100644
--- a/media/base/fake_video_capturer.h
+++ b/media/base/fake_video_capturer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_FAKEVIDEOCAPTURER_H_
-#define MEDIA_BASE_FAKEVIDEOCAPTURER_H_
+#ifndef MEDIA_BASE_FAKE_VIDEO_CAPTURER_H_
+#define MEDIA_BASE_FAKE_VIDEO_CAPTURER_H_
 
 #include <string.h>
 
@@ -18,11 +18,11 @@
 
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame.h"
-#include "media/base/fakeframesource.h"
-#include "media/base/videocapturer.h"
-#include "media/base/videocommon.h"
+#include "media/base/fake_frame_source.h"
+#include "media/base/video_capturer.h"
+#include "media/base/video_common.h"
 #include "rtc_base/task_queue_for_test.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace cricket {
 
@@ -77,4 +77,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_FAKEVIDEOCAPTURER_H_
+#endif  // MEDIA_BASE_FAKE_VIDEO_CAPTURER_H_
diff --git a/media/base/fake_video_renderer.cc b/media/base/fake_video_renderer.cc
index fdd789a..64de624 100644
--- a/media/base/fake_video_renderer.cc
+++ b/media/base/fake_video_renderer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/fakevideorenderer.h"
+#include "media/base/fake_video_renderer.h"
 
 namespace cricket {
 
diff --git a/media/base/fake_video_renderer.h b/media/base/fake_video_renderer.h
index ce12034..4ffa91e 100644
--- a/media/base/fake_video_renderer.h
+++ b/media/base/fake_video_renderer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_FAKEVIDEORENDERER_H_
-#define MEDIA_BASE_FAKEVIDEORENDERER_H_
+#ifndef MEDIA_BASE_FAKE_VIDEO_RENDERER_H_
+#define MEDIA_BASE_FAKE_VIDEO_RENDERER_H_
 
 #include <stdint.h>
 
@@ -17,7 +17,7 @@
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_rotation.h"
 #include "api/video/video_sink_interface.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace cricket {
@@ -122,4 +122,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_FAKEVIDEORENDERER_H_
+#endif  // MEDIA_BASE_FAKE_VIDEO_RENDERER_H_
diff --git a/media/base/media_channel.cc b/media/base/media_channel.cc
index 0634b2e..3451525 100644
--- a/media/base/media_channel.cc
+++ b/media/base/media_channel.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/mediachannel.h"
+#include "media/base/media_channel.h"
 
 namespace cricket {
 
diff --git a/media/base/media_channel.h b/media/base/media_channel.h
index 09e752a..8eecaa0 100644
--- a/media/base/media_channel.h
+++ b/media/base/media_channel.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_MEDIACHANNEL_H_
-#define MEDIA_BASE_MEDIACHANNEL_H_
+#ifndef MEDIA_BASE_MEDIA_CHANNEL_H_
+#define MEDIA_BASE_MEDIA_CHANNEL_H_
 
 #include <map>
 #include <memory>
@@ -20,30 +20,30 @@
 #include "absl/types/optional.h"
 #include "api/audio_codecs/audio_encoder.h"
 #include "api/audio_options.h"
-#include "api/crypto/framedecryptorinterface.h"
-#include "api/crypto/frameencryptorinterface.h"
+#include "api/crypto/frame_decryptor_interface.h"
+#include "api/crypto/frame_encryptor_interface.h"
 #include "api/media_transport_interface.h"
-#include "api/rtcerror.h"
-#include "api/rtpparameters.h"
-#include "api/rtpreceiverinterface.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_receiver_interface.h"
 #include "api/video/video_content_type.h"
 #include "api/video/video_sink_interface.h"
 #include "api/video/video_source_interface.h"
 #include "api/video/video_timing.h"
 #include "api/video_codecs/video_encoder_config.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconfig.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/streamparams.h"
+#include "media/base/media_config.h"
+#include "media/base/media_constants.h"
+#include "media/base/stream_params.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "rtc_base/async_packet_socket.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/dscp.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/network_route.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
@@ -913,4 +913,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_MEDIACHANNEL_H_
+#endif  // MEDIA_BASE_MEDIA_CHANNEL_H_
diff --git a/media/base/media_config.h b/media/base/media_config.h
index c8fc521..eb5d43b 100644
--- a/media/base/media_config.h
+++ b/media/base/media_config.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_MEDIACONFIG_H_
-#define MEDIA_BASE_MEDIACONFIG_H_
+#ifndef MEDIA_BASE_MEDIA_CONFIG_H_
+#define MEDIA_BASE_MEDIA_CONFIG_H_
 
 namespace cricket {
 
@@ -90,4 +90,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_MEDIACONFIG_H_
+#endif  // MEDIA_BASE_MEDIA_CONFIG_H_
diff --git a/media/base/media_constants.cc b/media/base/media_constants.cc
index 94b91e7..b10304a 100644
--- a/media/base/media_constants.cc
+++ b/media/base/media_constants.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 
 namespace cricket {
 
diff --git a/media/base/media_constants.h b/media/base/media_constants.h
index d7fb20a..97dcadc 100644
--- a/media/base/media_constants.h
+++ b/media/base/media_constants.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_MEDIACONSTANTS_H_
-#define MEDIA_BASE_MEDIACONSTANTS_H_
+#ifndef MEDIA_BASE_MEDIA_CONSTANTS_H_
+#define MEDIA_BASE_MEDIA_CONSTANTS_H_
 
 #include <stddef.h>
 
@@ -145,4 +145,4 @@
 extern const size_t kConferenceDefaultNumTemporalLayers;
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_MEDIACONSTANTS_H_
+#endif  // MEDIA_BASE_MEDIA_CONSTANTS_H_
diff --git a/media/base/media_engine.cc b/media/base/media_engine.cc
index bcdd6b6..91fcc1e 100644
--- a/media/base/media_engine.cc
+++ b/media/base/media_engine.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/mediaengine.h"
+#include "media/base/media_engine.h"
 
 #include <stddef.h>
 #include <cstdint>
@@ -17,7 +17,7 @@
 
 #include "api/video/video_bitrate_allocation.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 
 namespace cricket {
 
diff --git a/media/base/media_engine.h b/media/base/media_engine.h
index 01300d4..40c9ecc 100644
--- a/media/base/media_engine.h
+++ b/media/base/media_engine.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_MEDIAENGINE_H_
-#define MEDIA_BASE_MEDIAENGINE_H_
+#ifndef MEDIA_BASE_MEDIA_ENGINE_H_
+#define MEDIA_BASE_MEDIA_ENGINE_H_
 
 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
 #include <CoreAudio/CoreAudio.h>
@@ -21,12 +21,12 @@
 
 #include "api/audio_codecs/audio_decoder_factory.h"
 #include "api/audio_codecs/audio_encoder_factory.h"
-#include "api/crypto/cryptooptions.h"
-#include "api/rtpparameters.h"
+#include "api/crypto/crypto_options.h"
+#include "api/rtp_parameters.h"
 #include "call/audio_state.h"
 #include "media/base/codec.h"
-#include "media/base/mediachannel.h"
-#include "media/base/videocommon.h"
+#include "media/base/media_channel.h"
+#include "media/base/video_common.h"
 #include "rtc_base/platform_file.h"
 
 namespace webrtc {
@@ -155,4 +155,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_MEDIAENGINE_H_
+#endif  // MEDIA_BASE_MEDIA_ENGINE_H_
diff --git a/media/base/rid_description.cc b/media/base/rid_description.cc
index 7f0c5d0..b3eae27 100644
--- a/media/base/rid_description.cc
+++ b/media/base/rid_description.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/riddescription.h"
+#include "media/base/rid_description.h"
 
 namespace cricket {
 
diff --git a/media/base/rid_description.h b/media/base/rid_description.h
index 5a616ff..04c0f3d 100644
--- a/media/base/rid_description.h
+++ b/media/base/rid_description.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_RIDDESCRIPTION_H_
-#define MEDIA_BASE_RIDDESCRIPTION_H_
+#ifndef MEDIA_BASE_RID_DESCRIPTION_H_
+#define MEDIA_BASE_RID_DESCRIPTION_H_
 
 #include <map>
 #include <string>
@@ -90,4 +90,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_RIDDESCRIPTION_H_
+#endif  // MEDIA_BASE_RID_DESCRIPTION_H_
diff --git a/media/base/rtp_data_engine.cc b/media/base/rtp_data_engine.cc
index c3367c0..42ec8d0 100644
--- a/media/base/rtp_data_engine.cc
+++ b/media/base/rtp_data_engine.cc
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/rtpdataengine.h"
+#include "media/base/rtp_data_engine.h"
 
 #include <map>
 
 #include "absl/strings/match.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/rtputils.h"
-#include "media/base/streamparams.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "media/base/media_constants.h"
+#include "media/base/rtp_utils.h"
+#include "media/base/stream_params.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/data_rate_limiter.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
diff --git a/media/base/rtp_data_engine.h b/media/base/rtp_data_engine.h
index 42e9190..f24b224 100644
--- a/media/base/rtp_data_engine.h
+++ b/media/base/rtp_data_engine.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_RTPDATAENGINE_H_
-#define MEDIA_BASE_RTPDATAENGINE_H_
+#ifndef MEDIA_BASE_RTP_DATA_ENGINE_H_
+#define MEDIA_BASE_RTP_DATA_ENGINE_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "media/base/mediachannel.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/mediaengine.h"
+#include "media/base/media_channel.h"
+#include "media/base/media_constants.h"
+#include "media/base/media_engine.h"
 
 namespace rtc {
 class DataRateLimiter;
@@ -109,4 +109,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_RTPDATAENGINE_H_
+#endif  // MEDIA_BASE_RTP_DATA_ENGINE_H_
diff --git a/media/base/rtp_data_engine_unittest.cc b/media/base/rtp_data_engine_unittest.cc
index 23f9f67..d0e4e84 100644
--- a/media/base/rtp_data_engine_unittest.cc
+++ b/media/base/rtp_data_engine_unittest.cc
@@ -12,14 +12,14 @@
 #include <memory>
 #include <string>
 
-#include "media/base/fakenetworkinterface.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/rtpdataengine.h"
-#include "media/base/rtputils.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/fakeclock.h"
+#include "media/base/fake_network_interface.h"
+#include "media/base/media_constants.h"
+#include "media/base/rtp_data_engine.h"
+#include "media/base/rtp_utils.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 class FakeDataReceiver : public sigslot::has_slots<> {
diff --git a/media/base/rtp_utils.cc b/media/base/rtp_utils.cc
index 40e2f9a..b162fe5 100644
--- a/media/base/rtp_utils.cc
+++ b/media/base/rtp_utils.cc
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/rtputils.h"
+#include "media/base/rtp_utils.h"
 
 #include <string.h>
 #include <vector>
 
 // PacketTimeUpdateParams is defined in asyncpacketsocket.h.
 // TODO(sergeyu): Find more appropriate place for PacketTimeUpdateParams.
-#include "media/base/turnutils.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/byteorder.h"
+#include "media/base/turn_utils.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
 
 namespace cricket {
 
diff --git a/media/base/rtp_utils.h b/media/base/rtp_utils.h
index c5fe14f..93f3103 100644
--- a/media/base/rtp_utils.h
+++ b/media/base/rtp_utils.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_RTPUTILS_H_
-#define MEDIA_BASE_RTPUTILS_H_
+#ifndef MEDIA_BASE_RTP_UTILS_H_
+#define MEDIA_BASE_RTP_UTILS_H_
 
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace rtc {
@@ -89,4 +89,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_RTPUTILS_H_
+#endif  // MEDIA_BASE_RTP_UTILS_H_
diff --git a/media/base/rtp_utils_unittest.cc b/media/base/rtp_utils_unittest.cc
index d07ce8d..8ac68a4 100644
--- a/media/base/rtp_utils_unittest.cc
+++ b/media/base/rtp_utils_unittest.cc
@@ -12,9 +12,9 @@
 #include <cstdint>
 #include <vector>
 
-#include "media/base/fakertp.h"
-#include "media/base/rtputils.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "media/base/fake_rtp.h"
+#include "media/base/rtp_utils.h"
+#include "rtc_base/async_packet_socket.h"
 #include "test/gtest.h"
 
 namespace cricket {
diff --git a/media/base/stream_params.cc b/media/base/stream_params.cc
index 8fb1719..f89e565 100644
--- a/media/base/stream_params.cc
+++ b/media/base/stream_params.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/streamparams.h"
+#include "media/base/stream_params.h"
 
 #include <stdint.h>
 #include <algorithm>
diff --git a/media/base/stream_params.h b/media/base/stream_params.h
index f128532..b53e047 100644
--- a/media/base/stream_params.h
+++ b/media/base/stream_params.h
@@ -43,8 +43,8 @@
 // See https://tools.ietf.org/html/draft-ietf-mmusic-sdp-simulcast-13
 // and https://tools.ietf.org/html/draft-ietf-mmusic-rid-15.
 
-#ifndef MEDIA_BASE_STREAMPARAMS_H_
-#define MEDIA_BASE_STREAMPARAMS_H_
+#ifndef MEDIA_BASE_STREAM_PARAMS_H_
+#define MEDIA_BASE_STREAM_PARAMS_H_
 
 #include <stddef.h>
 #include <algorithm>
@@ -52,8 +52,8 @@
 #include <string>
 #include <vector>
 
-#include "media/base/riddescription.h"
-#include "rtc_base/constructormagic.h"
+#include "media/base/rid_description.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace cricket {
 
@@ -374,4 +374,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_STREAMPARAMS_H_
+#endif  // MEDIA_BASE_STREAM_PARAMS_H_
diff --git a/media/base/stream_params_unittest.cc b/media/base/stream_params_unittest.cc
index d552578..f004133 100644
--- a/media/base/stream_params_unittest.cc
+++ b/media/base/stream_params_unittest.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/streamparams.h"
+#include "media/base/stream_params.h"
 
 #include <stdint.h>
 
-#include "media/base/testutils.h"
+#include "media/base/test_utils.h"
 #include "rtc_base/arraysize.h"
 #include "test/gtest.h"
 
diff --git a/media/base/test_utils.cc b/media/base/test_utils.cc
index 87f5010..a6d5f61 100644
--- a/media/base/test_utils.cc
+++ b/media/base/test_utils.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/testutils.h"
+#include "media/base/test_utils.h"
 
 #include <cstdint>
 
diff --git a/media/base/test_utils.h b/media/base/test_utils.h
index e08147b..46783a1 100644
--- a/media/base/test_utils.h
+++ b/media/base/test_utils.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_TESTUTILS_H_
-#define MEDIA_BASE_TESTUTILS_H_
+#ifndef MEDIA_BASE_TEST_UTILS_H_
+#define MEDIA_BASE_TEST_UTILS_H_
 
 #include <string>
 #include <vector>
 
-#include "media/base/mediachannel.h"
-#include "media/base/videocommon.h"
+#include "media/base/media_channel.h"
+#include "media/base/video_common.h"
 #include "rtc_base/arraysize.h"
 
 namespace webrtc {
@@ -65,4 +65,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_TESTUTILS_H_
+#endif  // MEDIA_BASE_TEST_UTILS_H_
diff --git a/media/base/turn_utils.cc b/media/base/turn_utils.cc
index 16df7d0..c0f1a28 100644
--- a/media/base/turn_utils.cc
+++ b/media/base/turn_utils.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/turnutils.h"
+#include "media/base/turn_utils.h"
 
 #include "p2p/base/stun.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 
 namespace cricket {
 
diff --git a/media/base/turn_utils.h b/media/base/turn_utils.h
index 7aa0651..ed8e282 100644
--- a/media/base/turn_utils.h
+++ b/media/base/turn_utils.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_TURNUTILS_H_
-#define MEDIA_BASE_TURNUTILS_H_
+#ifndef MEDIA_BASE_TURN_UTILS_H_
+#define MEDIA_BASE_TURN_UTILS_H_
 
 #include <cstddef>
 #include <cstdint>
@@ -29,4 +29,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_TURNUTILS_H_
+#endif  // MEDIA_BASE_TURN_UTILS_H_
diff --git a/media/base/turn_utils_unittest.cc b/media/base/turn_utils_unittest.cc
index 256f5ac..f7bbf8b 100644
--- a/media/base/turn_utils_unittest.cc
+++ b/media/base/turn_utils_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/turnutils.h"
+#include "media/base/turn_utils.h"
 
 #include "test/gtest.h"
 
diff --git a/media/base/video_adapter.cc b/media/base/video_adapter.cc
index 3e240a0..4f1181e 100644
--- a/media/base/video_adapter.cc
+++ b/media/base/video_adapter.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/videoadapter.h"
+#include "media/base/video_adapter.h"
 
 #include <algorithm>
 #include <cmath>
@@ -17,10 +17,10 @@
 #include <utility>
 
 #include "absl/types/optional.h"
-#include "media/base/videocommon.h"
+#include "media/base/video_common.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace {
 struct Fraction {
diff --git a/media/base/video_adapter.h b/media/base/video_adapter.h
index 0ce5c05..83f2f01 100644
--- a/media/base/video_adapter.h
+++ b/media/base/video_adapter.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_VIDEOADAPTER_H_
-#define MEDIA_BASE_VIDEOADAPTER_H_
+#ifndef MEDIA_BASE_VIDEO_ADAPTER_H_
+#define MEDIA_BASE_VIDEO_ADAPTER_H_
 
 #include <stdint.h>
 #include <utility>
 
 #include "absl/types/optional.h"
-#include "media/base/videocommon.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "media/base/video_common.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace cricket {
@@ -134,4 +134,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_VIDEOADAPTER_H_
+#endif  // MEDIA_BASE_VIDEO_ADAPTER_H_
diff --git a/media/base/video_adapter_unittest.cc b/media/base/video_adapter_unittest.cc
index d7b328f..f50e13b 100644
--- a/media/base/video_adapter_unittest.cc
+++ b/media/base/video_adapter_unittest.cc
@@ -14,9 +14,9 @@
 
 #include "absl/memory/memory.h"
 #include "api/video/video_frame.h"
-#include "media/base/fakeframesource.h"
-#include "media/base/videoadapter.h"
-#include "rtc_base/timeutils.h"
+#include "media/base/fake_frame_source.h"
+#include "media/base/video_adapter.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 namespace cricket {
diff --git a/media/base/video_broadcaster.cc b/media/base/video_broadcaster.cc
index 4ee6045..a2009f2 100644
--- a/media/base/video_broadcaster.cc
+++ b/media/base/video_broadcaster.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/videobroadcaster.h"
+#include "media/base/video_broadcaster.h"
 
 #include <vector>
 
diff --git a/media/base/video_broadcaster.h b/media/base/video_broadcaster.h
index 18bfc9d..a99e044 100644
--- a/media/base/video_broadcaster.h
+++ b/media/base/video_broadcaster.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_VIDEOBROADCASTER_H_
-#define MEDIA_BASE_VIDEOBROADCASTER_H_
+#ifndef MEDIA_BASE_VIDEO_BROADCASTER_H_
+#define MEDIA_BASE_VIDEO_BROADCASTER_H_
 
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_source_interface.h"
-#include "media/base/videosourcebase.h"
-#include "rtc_base/criticalsection.h"
+#include "media/base/video_source_base.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
@@ -64,4 +64,4 @@
 
 }  // namespace rtc
 
-#endif  // MEDIA_BASE_VIDEOBROADCASTER_H_
+#endif  // MEDIA_BASE_VIDEO_BROADCASTER_H_
diff --git a/media/base/video_broadcaster_unittest.cc b/media/base/video_broadcaster_unittest.cc
index 5b191a7..cb76d9f 100644
--- a/media/base/video_broadcaster_unittest.cc
+++ b/media/base/video_broadcaster_unittest.cc
@@ -14,8 +14,8 @@
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_rotation.h"
-#include "media/base/fakevideorenderer.h"
-#include "media/base/videobroadcaster.h"
+#include "media/base/fake_video_renderer.h"
+#include "media/base/video_broadcaster.h"
 #include "test/gtest.h"
 
 using rtc::VideoBroadcaster;
diff --git a/media/base/video_capturer.cc b/media/base/video_capturer.cc
index 20dcf4e..76c0047 100644
--- a/media/base/video_capturer.cc
+++ b/media/base/video_capturer.cc
@@ -10,7 +10,7 @@
 
 // Implementation file of class VideoCapturer.
 
-#include "media/base/videocapturer.h"
+#include "media/base/video_capturer.h"
 
 #include <cstdint>
 
@@ -21,7 +21,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace cricket {
 
diff --git a/media/base/video_capturer.h b/media/base/video_capturer.h
index 3274206..05219be 100644
--- a/media/base/video_capturer.h
+++ b/media/base/video_capturer.h
@@ -10,8 +10,8 @@
 
 // Declaration of abstract class VideoCapturer
 
-#ifndef MEDIA_BASE_VIDEOCAPTURER_H_
-#define MEDIA_BASE_VIDEOCAPTURER_H_
+#ifndef MEDIA_BASE_VIDEO_CAPTURER_H_
+#define MEDIA_BASE_VIDEO_CAPTURER_H_
 
 #include <stdint.h>
 
@@ -21,15 +21,15 @@
 #include <vector>
 
 #include "api/video/video_source_interface.h"
-#include "media/base/videoadapter.h"
-#include "media/base/videobroadcaster.h"
-#include "media/base/videocommon.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "media/base/video_adapter.h"
+#include "media/base/video_broadcaster.h"
+#include "media/base/video_common.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/system/rtc_export.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread_checker.h"
-#include "rtc_base/timestampaligner.h"
+#include "rtc_base/timestamp_aligner.h"
 
 namespace webrtc {
 class VideoFrame;
@@ -280,4 +280,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_VIDEOCAPTURER_H_
+#endif  // MEDIA_BASE_VIDEO_CAPTURER_H_
diff --git a/media/base/video_capturer_unittest.cc b/media/base/video_capturer_unittest.cc
index e6dae6d..bb05ca1 100644
--- a/media/base/video_capturer_unittest.cc
+++ b/media/base/video_capturer_unittest.cc
@@ -14,9 +14,9 @@
 
 #include "absl/types/optional.h"
 #include "api/video/video_rotation.h"
-#include "media/base/fakevideocapturer.h"
-#include "media/base/fakevideorenderer.h"
-#include "media/base/videocapturer.h"
+#include "media/base/fake_video_capturer.h"
+#include "media/base/fake_video_renderer.h"
+#include "media/base/video_capturer.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
diff --git a/media/base/video_common.cc b/media/base/video_common.cc
index 2f55793..1035757 100644
--- a/media/base/video_common.cc
+++ b/media/base/video_common.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/videocommon.h"
+#include "media/base/video_common.h"
 
 #include "api/array_view.h"
 #include "rtc_base/arraysize.h"
diff --git a/media/base/video_common.h b/media/base/video_common.h
index 6447cba..f01e833 100644
--- a/media/base/video_common.h
+++ b/media/base/video_common.h
@@ -10,15 +10,15 @@
 
 // Common definition for video, including fourcc and VideoFormat.
 
-#ifndef MEDIA_BASE_VIDEOCOMMON_H_
-#define MEDIA_BASE_VIDEOCOMMON_H_
+#ifndef MEDIA_BASE_VIDEO_COMMON_H_
+#define MEDIA_BASE_VIDEO_COMMON_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "rtc_base/system/rtc_export.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace cricket {
 
@@ -226,4 +226,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_BASE_VIDEOCOMMON_H_
+#endif  // MEDIA_BASE_VIDEO_COMMON_H_
diff --git a/media/base/video_common_unittest.cc b/media/base/video_common_unittest.cc
index 40421cb..3a94367 100644
--- a/media/base/video_common_unittest.cc
+++ b/media/base/video_common_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/videocommon.h"
+#include "media/base/video_common.h"
 
 #include "test/gtest.h"
 
diff --git a/media/base/video_source_base.cc b/media/base/video_source_base.cc
index 47dfaab..71b4276 100644
--- a/media/base/video_source_base.cc
+++ b/media/base/video_source_base.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/base/videosourcebase.h"
+#include "media/base/video_source_base.h"
 
 #include <algorithm>
 
diff --git a/media/base/video_source_base.h b/media/base/video_source_base.h
index aaae61c..507fa10 100644
--- a/media/base/video_source_base.h
+++ b/media/base/video_source_base.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_BASE_VIDEOSOURCEBASE_H_
-#define MEDIA_BASE_VIDEOSOURCEBASE_H_
+#ifndef MEDIA_BASE_VIDEO_SOURCE_BASE_H_
+#define MEDIA_BASE_VIDEO_SOURCE_BASE_H_
 
 #include <vector>
 
@@ -46,4 +46,4 @@
 
 }  // namespace rtc
 
-#endif  // MEDIA_BASE_VIDEOSOURCEBASE_H_
+#endif  // MEDIA_BASE_VIDEO_SOURCE_BASE_H_