diff --git a/api/BUILD.gn b/api/BUILD.gn
index bc3d649..aeb03e5 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -40,7 +40,7 @@
 rtc_source_set("callfactory_api") {
   visibility = [ "*" ]
   sources = [
-    "call/callfactoryinterface.h",
+    "call/call_factory_interface.h",
   ]
 }
 
@@ -77,59 +77,59 @@
   visibility = [ "*" ]
   cflags = []
   sources = [
-    "asyncresolverfactory.h",
+    "async_resolver_factory.h",
     "bitrate_constraints.h",
     "candidate.cc",
     "candidate.h",
-    "crypto/cryptooptions.cc",
-    "crypto/cryptooptions.h",
-    "crypto/framedecryptorinterface.h",
-    "crypto/frameencryptorinterface.h",
-    "cryptoparams.h",
-    "datachannelinterface.cc",
-    "datachannelinterface.h",
-    "dtlstransportinterface.h",
-    "dtmfsenderinterface.h",
+    "crypto/crypto_options.cc",
+    "crypto/crypto_options.h",
+    "crypto/frame_decryptor_interface.h",
+    "crypto/frame_encryptor_interface.h",
+    "crypto_params.h",
+    "data_channel_interface.cc",
+    "data_channel_interface.h",
+    "dtls_transport_interface.h",
+    "dtmf_sender_interface.h",
     "jsep.cc",
     "jsep.h",
-    "jsepicecandidate.cc",
-    "jsepicecandidate.h",
-    "jsepsessiondescription.h",
+    "jsep_ice_candidate.cc",
+    "jsep_ice_candidate.h",
+    "jsep_session_description.h",
+    "media_constraints_interface.cc",
+    "media_constraints_interface.h",
+    "media_stream_interface.cc",
+    "media_stream_interface.h",
+    "media_stream_proxy.h",
+    "media_stream_track_proxy.h",
     "media_transport_interface.cc",
     "media_transport_interface.h",
-    "mediaconstraintsinterface.cc",
-    "mediaconstraintsinterface.h",
-    "mediastreaminterface.cc",
-    "mediastreaminterface.h",
-    "mediastreamproxy.h",
-    "mediastreamtrackproxy.h",
-    "mediatypes.cc",
-    "mediatypes.h",
+    "media_types.cc",
+    "media_types.h",
     "notifier.h",
-    "peerconnectionfactoryproxy.h",
-    "peerconnectioninterface.cc",
-    "peerconnectioninterface.h",
-    "peerconnectionproxy.h",
+    "peer_connection_factory_proxy.h",
+    "peer_connection_interface.cc",
+    "peer_connection_interface.h",
+    "peer_connection_proxy.h",
     "proxy.cc",
     "proxy.h",
-    "rtcerror.cc",
-    "rtcerror.h",
+    "rtc_error.cc",
+    "rtc_error.h",
     "rtp_headers.cc",
     "rtp_headers.h",
-    "rtpparameters.cc",
-    "rtpparameters.h",
-    "rtpreceiverinterface.cc",
-    "rtpreceiverinterface.h",
-    "rtpsenderinterface.cc",
-    "rtpsenderinterface.h",
-    "rtptransceiverinterface.cc",
-    "rtptransceiverinterface.h",
-    "setremotedescriptionobserverinterface.h",
-    "statstypes.cc",
-    "statstypes.h",
-    "turncustomizer.h",
-    "umametrics.h",
-    "videosourceproxy.h",
+    "rtp_parameters.cc",
+    "rtp_parameters.h",
+    "rtp_receiver_interface.cc",
+    "rtp_receiver_interface.h",
+    "rtp_sender_interface.cc",
+    "rtp_sender_interface.h",
+    "rtp_transceiver_interface.cc",
+    "rtp_transceiver_interface.h",
+    "set_remote_description_observer_interface.h",
+    "stats_types.cc",
+    "stats_types.h",
+    "turn_customizer.h",
+    "uma_metrics.h",
+    "video_track_source_proxy.h",
   ]
   deps = [
     ":array_view",
@@ -240,16 +240,16 @@
 rtc_source_set("libjingle_logging_api") {
   visibility = [ "*" ]
   sources = [
-    "rtceventlogoutput.h",
+    "rtc_event_log_output.h",
   ]
 }
 
 rtc_source_set("ortc_api") {
   visibility = [ "*" ]
   sources = [
-    "ortc/packettransportinterface.h",
-    "ortc/rtptransportinterface.h",
-    "ortc/srtptransportinterface.h",
+    "ortc/packet_transport_interface.h",
+    "ortc/rtp_transport_interface.h",
+    "ortc/srtp_transport_interface.h",
   ]
 
   deps = [
@@ -262,10 +262,10 @@
   visibility = [ "*" ]
   cflags = []
   sources = [
-    "stats/rtcstats.h",
+    "stats/rtc_stats.h",
+    "stats/rtc_stats_collector_callback.h",
+    "stats/rtc_stats_report.h",
     "stats/rtcstats_objects.h",
-    "stats/rtcstatscollectorcallback.h",
-    "stats/rtcstatsreport.h",
   ]
 
   deps = [
@@ -346,7 +346,7 @@
 rtc_source_set("refcountedbase") {
   visibility = [ "*" ]
   sources = [
-    "refcountedbase.h",
+    "ref_counted_base.h",
   ]
   deps = [
     "../rtc_base:rtc_base_approved",
@@ -357,7 +357,7 @@
   visibility = [ "*" ]
   testonly = true
   sources = [
-    "test/fakeconstraints.h",
+    "test/fake_constraints.h",
   ]
 
   deps = [
@@ -666,8 +666,8 @@
 
     sources = [
       "array_view_unittest.cc",
-      "rtcerror_unittest.cc",
-      "rtpparameters_unittest.cc",
+      "rtc_error_unittest.cc",
+      "rtp_parameters_unittest.cc",
       "test/loopback_media_transport_unittest.cc",
     ]
 
diff --git a/api/DEPS b/api/DEPS
index 82885d4..37d0e9b 100644
--- a/api/DEPS
+++ b/api/DEPS
@@ -57,13 +57,13 @@
     "+modules/audio_coding/codecs/opus/audio_encoder_opus.h",
   ],
 
-  "asyncresolverfactory\.h": [
-    "+rtc_base/asyncresolverinterface.h",
+  "async_resolver_factory\.h": [
+    "+rtc_base/async_resolver_interface.h",
   ],
 
   "candidate\.h": [
     "+rtc_base/network_constants.h",
-    "+rtc_base/socketaddress.h",
+    "+rtc_base/socket_address.h",
   ],
 
   "create_peerconnection_factory\.h": [
@@ -71,17 +71,17 @@
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
-  "datachannelinterface\.h": [
-    "+rtc_base/copyonwritebuffer.h",
-    "+rtc_base/refcount.h",
+  "data_channel_interface\.h": [
+    "+rtc_base/copy_on_write_buffer.h",
+    "+rtc_base/ref_count.h",
   ],
 
-  "dtlstransportinterface\.h": [
-    "+rtc_base/refcount.h",
+  "dtls_transport_interface\.h": [
+    "+rtc_base/ref_count.h",
   ],
 
-  "dtmfsenderinterface\.h": [
-    "+rtc_base/refcount.h",
+  "dtmf_sender_interface\.h": [
+    "+rtc_base/ref_count.h",
   ],
 
   "fec_controller\.h": [
@@ -89,118 +89,118 @@
   ],
 
   "jsep\.h": [
-    "+rtc_base/refcount.h",
+    "+rtc_base/ref_count.h",
   ],
 
-  "jsepicecandidate\.h": [
-    "+rtc_base/constructormagic.h",
+  "jsep_ice_candidate\.h": [
+    "+rtc_base/constructor_magic.h",
   ],
 
-  "jsepsessiondescription\.h": [
-    "+rtc_base/constructormagic.h",
+  "jsep_session_description\.h": [
+    "+rtc_base/constructor_magic.h",
   ],
 
-  "mediastreaminterface\.h": [
+  "media_stream_interface\.h": [
     "+modules/audio_processing/include/audio_processing_statistics.h",
-    "+rtc_base/refcount.h",
+    "+rtc_base/ref_count.h",
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
   "media_transport_interface\.h": [
-    "+rtc_base/copyonwritebuffer.h",  # As used by datachannelinterface.h
-    "+rtc_base/networkroute.h",
+    "+rtc_base/copy_on_write_buffer.h",  # As used by datachannelinterface.h
+    "+rtc_base/network_route.h",
     "+rtc_base/deprecation.h",
   ],
 
-  "peerconnectionfactoryproxy\.h": [
+  "peer_connection_factory_proxy\.h": [
     "+rtc_base/bind.h",
   ],
 
-  "peerconnectioninterface\.h": [
+  "peer_connection_interface\.h": [
     "+logging/rtc_event_log/rtc_event_log_factory_interface.h",
-    "+media/base/mediaconfig.h",
-    "+media/base/videocapturer.h",
-    "+media/base/mediaengine.h",
-    "+p2p/base/portallocator.h",
-    "+rtc_base/bitrateallocationstrategy.h",
+    "+media/base/media_config.h",
+    "+media/base/video_capturer.h",
+    "+media/base/media_engine.h",
+    "+p2p/base/port_allocator.h",
+    "+rtc_base/bitrate_allocation_strategy.h",
     "+rtc_base/network.h",
     "+rtc_base/platform_file.h",
-    "+rtc_base/rtccertificate.h",
-    "+rtc_base/rtccertificategenerator.h",
-    "+rtc_base/socketaddress.h",
-    "+rtc_base/sslcertificate.h",
-    "+rtc_base/sslstreamadapter.h",
+    "+rtc_base/rtc_certificate.h",
+    "+rtc_base/rtc_certificate_generator.h",
+    "+rtc_base/socket_address.h",
+    "+rtc_base/ssl_certificate.h",
+    "+rtc_base/ssl_stream_adapter.h",
   ],
 
   "proxy\.h": [
     "+rtc_base/event.h",
-    "+rtc_base/messagehandler.h",  # Inherits from it.
-    "+rtc_base/messagequeue.h",    # Inherits from MessageData.
-    "+rtc_base/refcountedobject.h",
+    "+rtc_base/message_handler.h",  # Inherits from it.
+    "+rtc_base/message_queue.h",    # Inherits from MessageData.
+    "+rtc_base/ref_counted_object.h",
     "+rtc_base/scoped_ref_ptr.h",
     "+rtc_base/thread.h",
   ],
 
-  "refcountedbase\.h": [
-    "+rtc_base/constructormagic.h",
-    "+rtc_base/refcount.h",
-    "+rtc_base/refcounter.h",
+  "ref_counted_base\.h": [
+    "+rtc_base/constructor_magic.h",
+    "+rtc_base/ref_count.h",
+    "+rtc_base/ref_counter.h",
   ],
 
-  "rtcerror\.h": [
+  "rtc_error\.h": [
     "+rtc_base/logging.h",
   ],
 
-  "rtpreceiverinterface\.h": [
-    "+rtc_base/refcount.h",
+  "rtp_receiver_interface\.h": [
+    "+rtc_base/ref_count.h",
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
-  "rtpsenderinterface\.h": [
-    "+rtc_base/refcount.h",
+  "rtp_sender_interface\.h": [
+    "+rtc_base/ref_count.h",
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
-  "rtptransceiverinterface\.h": [
-    "+rtc_base/refcount.h",
+  "rtp_transceiver_interface\.h": [
+    "+rtc_base/ref_count.h",
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
-  "setremotedescriptionobserverinterface\.h": [
-    "+rtc_base/refcount.h",
+  "set_remote_description_observer_interface\.h": [
+    "+rtc_base/ref_count.h",
   ],
 
-  "statstypes\.h": [
-    "+rtc_base/constructormagic.h",
-    "+rtc_base/refcount.h",
+  "stats_types\.h": [
+    "+rtc_base/constructor_magic.h",
+    "+rtc_base/ref_count.h",
     "+rtc_base/scoped_ref_ptr.h",
-    "+rtc_base/stringencode.h",
+    "+rtc_base/string_encode.h",
     "+rtc_base/thread_checker.h",
   ],
 
-  "umametrics\.h": [
-    "+rtc_base/refcount.h",
+  "uma_metrics\.h": [
+    "+rtc_base/ref_count.h",
   ],
 
   "audio_frame\.h": [
-    "+rtc_base/constructormagic.h",
+    "+rtc_base/constructor_magic.h",
   ],
 
   "audio_mixer\.h": [
-    "+rtc_base/refcount.h",
+    "+rtc_base/ref_count.h",
   ],
 
   "audio_decoder\.h": [
     "+rtc_base/buffer.h",
-    "+rtc_base/constructormagic.h",
+    "+rtc_base/constructor_magic.h",
   ],
 
   "audio_decoder_factory\.h": [
-    "+rtc_base/refcount.h",
+    "+rtc_base/ref_count.h",
   ],
 
   "audio_decoder_factory_template\.h": [
-    "+rtc_base/refcountedobject.h",
+    "+rtc_base/ref_counted_object.h",
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
@@ -210,11 +210,11 @@
   ],
 
   "audio_encoder_factory\.h": [
-    "+rtc_base/refcount.h",
+    "+rtc_base/ref_count.h",
   ],
 
   "audio_encoder_factory_template\.h": [
-    "+rtc_base/refcountedobject.h",
+    "+rtc_base/ref_counted_object.h",
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
@@ -226,22 +226,22 @@
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
-  "framedecryptorinterface\.h": [
-    "+rtc_base/refcount.h",
+  "frame_decryptor_interface\.h": [
+    "+rtc_base/ref_count.h",
   ],
 
-  "frameencryptorinterface\.h": [
-    "+rtc_base/refcount.h",
+  "frame_encryptor_interface\.h": [
+    "+rtc_base/ref_count.h",
   ],
 
-  "rtcstatscollectorcallback\.h": [
-    "+rtc_base/refcount.h",
+  "rtc_stats_collector_callback\.h": [
+    "+rtc_base/ref_count.h",
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
-  "rtcstatsreport\.h": [
-    "+rtc_base/refcount.h",
-    "+rtc_base/refcountedobject.h",
+  "rtc_stats_report\.h": [
+    "+rtc_base/ref_count.h",
+    "+rtc_base/ref_counted_object.h",
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
@@ -250,11 +250,11 @@
   ],
 
   "fake_frame_decryptor\.h": [
-    "+rtc_base/refcountedobject.h",
+    "+rtc_base/ref_counted_object.h",
   ],
 
   "fake_frame_encryptor\.h": [
-    "+rtc_base/refcountedobject.h",
+    "+rtc_base/ref_counted_object.h",
   ],
 
   "mock.*\.h": [
@@ -262,7 +262,7 @@
   ],
 
   "simulated_network\.h": [
-    "+rtc_base/criticalsection.h",
+    "+rtc_base/critical_section.h",
     "+rtc_base/random.h",
     "+rtc_base/thread_annotations.h",
   ],
@@ -280,7 +280,7 @@
   ],
 
   "video_encoder_config\.h": [
-    "+rtc_base/refcount.h",
+    "+rtc_base/ref_count.h",
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
diff --git a/api/async_resolver_factory.h b/api/async_resolver_factory.h
index 96abee4..93d3f79 100644
--- a/api/async_resolver_factory.h
+++ b/api/async_resolver_factory.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_ASYNCRESOLVERFACTORY_H_
-#define API_ASYNCRESOLVERFACTORY_H_
+#ifndef API_ASYNC_RESOLVER_FACTORY_H_
+#define API_ASYNC_RESOLVER_FACTORY_H_
 
-#include "rtc_base/asyncresolverinterface.h"
+#include "rtc_base/async_resolver_interface.h"
 
 namespace webrtc {
 
@@ -29,4 +29,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_ASYNCRESOLVERFACTORY_H_
+#endif  // API_ASYNC_RESOLVER_FACTORY_H_
diff --git a/api/audio/audio_frame.cc b/api/audio/audio_frame.cc
index 75d30b0..1e706b9 100644
--- a/api/audio/audio_frame.cc
+++ b/api/audio/audio_frame.cc
@@ -13,7 +13,7 @@
 #include <string.h>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/api/audio/audio_frame.h b/api/audio/audio_frame.h
index dd6ac02..8f1dc62 100644
--- a/api/audio/audio_frame.h
+++ b/api/audio/audio_frame.h
@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/api/audio/audio_mixer.h b/api/audio/audio_mixer.h
index 14eefc1..b290cfa 100644
--- a/api/audio/audio_mixer.h
+++ b/api/audio/audio_mixer.h
@@ -14,7 +14,7 @@
 #include <memory>
 
 #include "api/audio/audio_frame.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 
diff --git a/api/audio_codecs/audio_decoder.h b/api/audio_codecs/audio_decoder.h
index 684266a..e4e5e1e 100644
--- a/api/audio_codecs/audio_decoder.h
+++ b/api/audio_codecs/audio_decoder.h
@@ -19,7 +19,7 @@
 #include "absl/types/optional.h"
 #include "api/array_view.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/api/audio_codecs/audio_decoder_factory.h b/api/audio_codecs/audio_decoder_factory.h
index 3d80958..c36a0e1 100644
--- a/api/audio_codecs/audio_decoder_factory.h
+++ b/api/audio_codecs/audio_decoder_factory.h
@@ -18,7 +18,7 @@
 #include "api/audio_codecs/audio_codec_pair_id.h"
 #include "api/audio_codecs/audio_decoder.h"
 #include "api/audio_codecs/audio_format.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 
diff --git a/api/audio_codecs/audio_decoder_factory_template.h b/api/audio_codecs/audio_decoder_factory_template.h
index 22bb7de..e7f1443 100644
--- a/api/audio_codecs/audio_decoder_factory_template.h
+++ b/api/audio_codecs/audio_decoder_factory_template.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "api/audio_codecs/audio_decoder_factory.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/api/audio_codecs/audio_encoder_factory.h b/api/audio_codecs/audio_encoder_factory.h
index a5fd561b..48995a8 100644
--- a/api/audio_codecs/audio_encoder_factory.h
+++ b/api/audio_codecs/audio_encoder_factory.h
@@ -18,7 +18,7 @@
 #include "api/audio_codecs/audio_codec_pair_id.h"
 #include "api/audio_codecs/audio_encoder.h"
 #include "api/audio_codecs/audio_format.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 
diff --git a/api/audio_codecs/audio_encoder_factory_template.h b/api/audio_codecs/audio_encoder_factory_template.h
index 2088619..01a6a74 100644
--- a/api/audio_codecs/audio_encoder_factory_template.h
+++ b/api/audio_codecs/audio_encoder_factory_template.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "api/audio_codecs/audio_encoder_factory.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/api/call/call_factory_interface.h b/api/call/call_factory_interface.h
index a7f3245..c3d5b41 100644
--- a/api/call/call_factory_interface.h
+++ b/api/call/call_factory_interface.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_CALL_CALLFACTORYINTERFACE_H_
-#define API_CALL_CALLFACTORYINTERFACE_H_
+#ifndef API_CALL_CALL_FACTORY_INTERFACE_H_
+#define API_CALL_CALL_FACTORY_INTERFACE_H_
 
 #include <memory>
 
@@ -33,4 +33,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_CALL_CALLFACTORYINTERFACE_H_
+#endif  // API_CALL_CALL_FACTORY_INTERFACE_H_
diff --git a/api/candidate.cc b/api/candidate.cc
index 5637566..c857f89 100644
--- a/api/candidate.cc
+++ b/api/candidate.cc
@@ -11,7 +11,7 @@
 #include "api/candidate.h"
 
 #include "rtc_base/helpers.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/strings/string_builder.h"
 
 namespace cricket {
diff --git a/api/candidate.h b/api/candidate.h
index 02b4bca..7452055 100644
--- a/api/candidate.h
+++ b/api/candidate.h
@@ -19,7 +19,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/network_constants.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace cricket {
diff --git a/api/create_peerconnection_factory.cc b/api/create_peerconnection_factory.cc
index d714dfe..3e1566e 100644
--- a/api/create_peerconnection_factory.cc
+++ b/api/create_peerconnection_factory.cc
@@ -16,16 +16,16 @@
 #include "api/audio/audio_mixer.h"
 #include "api/audio_codecs/audio_decoder_factory.h"
 #include "api/audio_codecs/audio_encoder_factory.h"
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
 #include "api/fec_controller.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "api/transport/network_control.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
 #include "logging/rtc_event_log/rtc_event_log_factory.h"
 #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
-#include "media/base/mediaengine.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/base/media_engine.h"
+#include "media/engine/webrtc_media_engine.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "rtc_base/scoped_ref_ptr.h"
diff --git a/api/create_peerconnection_factory.h b/api/create_peerconnection_factory.h
index 063de18..c3729d2 100644
--- a/api/create_peerconnection_factory.h
+++ b/api/create_peerconnection_factory.h
@@ -17,7 +17,7 @@
 #include "api/audio_codecs/audio_decoder_factory.h"
 #include "api/audio_codecs/audio_encoder_factory.h"
 #include "api/fec_controller.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "api/transport/network_control.h"
 #include "rtc_base/deprecation.h"
 #include "rtc_base/scoped_ref_ptr.h"
diff --git a/api/crypto/crypto_options.cc b/api/crypto/crypto_options.cc
index 7f34f19..9a3de2c 100644
--- a/api/crypto/crypto_options.cc
+++ b/api/crypto/crypto_options.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/crypto/cryptooptions.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "api/crypto/crypto_options.h"
+#include "rtc_base/ssl_stream_adapter.h"
 
 namespace webrtc {
 
diff --git a/api/crypto/crypto_options.h b/api/crypto/crypto_options.h
index e730ab2..f0b91d0 100644
--- a/api/crypto/crypto_options.h
+++ b/api/crypto/crypto_options.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_CRYPTO_CRYPTOOPTIONS_H_
-#define API_CRYPTO_CRYPTOOPTIONS_H_
+#ifndef API_CRYPTO_CRYPTO_OPTIONS_H_
+#define API_CRYPTO_CRYPTO_OPTIONS_H_
 
 #include <vector>
 
@@ -63,4 +63,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_CRYPTO_CRYPTOOPTIONS_H_
+#endif  // API_CRYPTO_CRYPTO_OPTIONS_H_
diff --git a/api/crypto/frame_decryptor_interface.h b/api/crypto/frame_decryptor_interface.h
index 587df47..400e056 100644
--- a/api/crypto/frame_decryptor_interface.h
+++ b/api/crypto/frame_decryptor_interface.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_
-#define API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_
+#ifndef API_CRYPTO_FRAME_DECRYPTOR_INTERFACE_H_
+#define API_CRYPTO_FRAME_DECRYPTOR_INTERFACE_H_
 
 #include <vector>
 
 #include "api/array_view.h"
-#include "api/mediatypes.h"
-#include "rtc_base/refcount.h"
+#include "api/media_types.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 
@@ -56,4 +56,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_CRYPTO_FRAMEDECRYPTORINTERFACE_H_
+#endif  // API_CRYPTO_FRAME_DECRYPTOR_INTERFACE_H_
diff --git a/api/crypto/frame_encryptor_interface.h b/api/crypto/frame_encryptor_interface.h
index 72bc04b..d5b6d8a 100644
--- a/api/crypto/frame_encryptor_interface.h
+++ b/api/crypto/frame_encryptor_interface.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_
-#define API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_
+#ifndef API_CRYPTO_FRAME_ENCRYPTOR_INTERFACE_H_
+#define API_CRYPTO_FRAME_ENCRYPTOR_INTERFACE_H_
 
 #include "api/array_view.h"
-#include "api/mediatypes.h"
-#include "rtc_base/refcount.h"
+#include "api/media_types.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 
@@ -52,4 +52,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_CRYPTO_FRAMEENCRYPTORINTERFACE_H_
+#endif  // API_CRYPTO_FRAME_ENCRYPTOR_INTERFACE_H_
diff --git a/api/crypto_params.h b/api/crypto_params.h
index abe9055..5da352c 100644
--- a/api/crypto_params.h
+++ b/api/crypto_params.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_CRYPTOPARAMS_H_
-#define API_CRYPTOPARAMS_H_
+#ifndef API_CRYPTO_PARAMS_H_
+#define API_CRYPTO_PARAMS_H_
 
 #include <string>
 
@@ -38,4 +38,4 @@
 
 }  // namespace cricket
 
-#endif  // API_CRYPTOPARAMS_H_
+#endif  // API_CRYPTO_PARAMS_H_
diff --git a/api/data_channel_interface.cc b/api/data_channel_interface.cc
index 141462d..240ccbe 100644
--- a/api/data_channel_interface.cc
+++ b/api/data_channel_interface.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 
 namespace webrtc {
 
diff --git a/api/data_channel_interface.h b/api/data_channel_interface.h
index 7cb5582..91a9804 100644
--- a/api/data_channel_interface.h
+++ b/api/data_channel_interface.h
@@ -11,16 +11,16 @@
 // This file contains interfaces for DataChannels
 // http://dev.w3.org/2011/webrtc/editor/webrtc.html#rtcdatachannel
 
-#ifndef API_DATACHANNELINTERFACE_H_
-#define API_DATACHANNELINTERFACE_H_
+#ifndef API_DATA_CHANNEL_INTERFACE_H_
+#define API_DATA_CHANNEL_INTERFACE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 
@@ -177,4 +177,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_DATACHANNELINTERFACE_H_
+#endif  // API_DATA_CHANNEL_INTERFACE_H_
diff --git a/api/dtls_transport_interface.h b/api/dtls_transport_interface.h
index bff6752..abe7378 100644
--- a/api/dtls_transport_interface.h
+++ b/api/dtls_transport_interface.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_DTLSTRANSPORTINTERFACE_H_
-#define API_DTLSTRANSPORTINTERFACE_H_
+#ifndef API_DTLS_TRANSPORT_INTERFACE_H_
+#define API_DTLS_TRANSPORT_INTERFACE_H_
 
-#include "api/rtcerror.h"
-#include "rtc_base/refcount.h"
+#include "api/rtc_error.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 
@@ -66,4 +66,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_DTLSTRANSPORTINTERFACE_H_
+#endif  // API_DTLS_TRANSPORT_INTERFACE_H_
diff --git a/api/dtmf_sender_interface.h b/api/dtmf_sender_interface.h
index d8714f5..9cdfba1 100644
--- a/api/dtmf_sender_interface.h
+++ b/api/dtmf_sender_interface.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_DTMFSENDERINTERFACE_H_
-#define API_DTMFSENDERINTERFACE_H_
+#ifndef API_DTMF_SENDER_INTERFACE_H_
+#define API_DTMF_SENDER_INTERFACE_H_
 
 #include <string>
 
-#include "api/mediastreaminterface.h"
-#include "rtc_base/refcount.h"
+#include "api/media_stream_interface.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 
@@ -97,4 +97,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_DTMFSENDERINTERFACE_H_
+#endif  // API_DTMF_SENDER_INTERFACE_H_
diff --git a/api/jsep.h b/api/jsep.h
index 1c50455..6da7827 100644
--- a/api/jsep.h
+++ b/api/jsep.h
@@ -27,8 +27,8 @@
 #include <vector>
 
 #include "absl/types/optional.h"
-#include "api/rtcerror.h"
-#include "rtc_base/refcount.h"
+#include "api/rtc_error.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace cricket {
diff --git a/api/jsep_ice_candidate.cc b/api/jsep_ice_candidate.cc
index ed2f792..59da4e4 100644
--- a/api/jsep_ice_candidate.cc
+++ b/api/jsep_ice_candidate.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/jsepicecandidate.h"
+#include "api/jsep_ice_candidate.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/api/jsep_ice_candidate.h b/api/jsep_ice_candidate.h
index 9cc7443..5b22454 100644
--- a/api/jsep_ice_candidate.h
+++ b/api/jsep_ice_candidate.h
@@ -11,8 +11,8 @@
 // TODO(deadbeef): Move this out of api/; it's an implementation detail and
 // shouldn't be used externally.
 
-#ifndef API_JSEPICECANDIDATE_H_
-#define API_JSEPICECANDIDATE_H_
+#ifndef API_JSEP_ICE_CANDIDATE_H_
+#define API_JSEP_ICE_CANDIDATE_H_
 
 #include <stddef.h>
 #include <string>
@@ -20,7 +20,7 @@
 
 #include "api/candidate.h"
 #include "api/jsep.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
@@ -82,4 +82,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_JSEPICECANDIDATE_H_
+#endif  // API_JSEP_ICE_CANDIDATE_H_
diff --git a/api/jsep_session_description.h b/api/jsep_session_description.h
index 49b80fa..75ae0cd 100644
--- a/api/jsep_session_description.h
+++ b/api/jsep_session_description.h
@@ -11,8 +11,8 @@
 // TODO(deadbeef): Move this out of api/; it's an implementation detail and
 // shouldn't be used externally.
 
-#ifndef API_JSEPSESSIONDESCRIPTION_H_
-#define API_JSEPSESSIONDESCRIPTION_H_
+#ifndef API_JSEP_SESSION_DESCRIPTION_H_
+#define API_JSEP_SESSION_DESCRIPTION_H_
 
 #include <memory>
 #include <string>
@@ -21,8 +21,8 @@
 #include "absl/strings/string_view.h"
 #include "api/candidate.h"
 #include "api/jsep.h"
-#include "api/jsepicecandidate.h"
-#include "rtc_base/constructormagic.h"
+#include "api/jsep_ice_candidate.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace cricket {
 class SessionDescription;
@@ -88,4 +88,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_JSEPSESSIONDESCRIPTION_H_
+#endif  // API_JSEP_SESSION_DESCRIPTION_H_
diff --git a/api/media_constraints_interface.cc b/api/media_constraints_interface.cc
index b66ba05..ddf5559 100644
--- a/api/media_constraints_interface.cc
+++ b/api/media_constraints_interface.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
 
 #include "absl/types/optional.h"
-#include "api/peerconnectioninterface.h"
-#include "media/base/mediaconfig.h"
-#include "rtc_base/stringencode.h"
+#include "api/peer_connection_interface.h"
+#include "media/base/media_config.h"
+#include "rtc_base/string_encode.h"
 
 namespace {
 
diff --git a/api/media_constraints_interface.h b/api/media_constraints_interface.h
index c9a6e1b..fc49cbe 100644
--- a/api/media_constraints_interface.h
+++ b/api/media_constraints_interface.h
@@ -18,15 +18,15 @@
 // be removed from WebRTC.
 // https://bugs.chromium.org/p/webrtc/issues/detail?id=9239
 
-#ifndef API_MEDIACONSTRAINTSINTERFACE_H_
-#define API_MEDIACONSTRAINTSINTERFACE_H_
+#ifndef API_MEDIA_CONSTRAINTS_INTERFACE_H_
+#define API_MEDIA_CONSTRAINTS_INTERFACE_H_
 
 #include <stddef.h>
 #include <string>
 #include <vector>
 
 #include "api/audio_options.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 
 namespace webrtc {
 
@@ -156,4 +156,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_MEDIACONSTRAINTSINTERFACE_H_
+#endif  // API_MEDIA_CONSTRAINTS_INTERFACE_H_
diff --git a/api/media_stream_interface.cc b/api/media_stream_interface.cc
index 7154014..73566c4 100644
--- a/api/media_stream_interface.cc
+++ b/api/media_stream_interface.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 
 namespace webrtc {
 
diff --git a/api/media_stream_interface.h b/api/media_stream_interface.h
index 6d96766..af89e9d 100644
--- a/api/media_stream_interface.h
+++ b/api/media_stream_interface.h
@@ -14,8 +14,8 @@
 // interfaces must be used only with PeerConnection. PeerConnectionManager
 // interface provides the factory methods to create MediaStream and MediaTracks.
 
-#ifndef API_MEDIASTREAMINTERFACE_H_
-#define API_MEDIASTREAMINTERFACE_H_
+#ifndef API_MEDIA_STREAM_INTERFACE_H_
+#define API_MEDIA_STREAM_INTERFACE_H_
 
 #include <stddef.h>
 
@@ -28,7 +28,7 @@
 #include "api/video/video_sink_interface.h"
 #include "api/video/video_source_interface.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
@@ -294,4 +294,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_MEDIASTREAMINTERFACE_H_
+#endif  // API_MEDIA_STREAM_INTERFACE_H_
diff --git a/api/media_stream_proxy.h b/api/media_stream_proxy.h
index 4c54459..5169679 100644
--- a/api/media_stream_proxy.h
+++ b/api/media_stream_proxy.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_MEDIASTREAMPROXY_H_
-#define API_MEDIASTREAMPROXY_H_
+#ifndef API_MEDIA_STREAM_PROXY_H_
+#define API_MEDIA_STREAM_PROXY_H_
 
 #include <string>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/proxy.h"
 
 namespace webrtc {
@@ -41,4 +41,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_MEDIASTREAMPROXY_H_
+#endif  // API_MEDIA_STREAM_PROXY_H_
diff --git a/api/media_stream_track_proxy.h b/api/media_stream_track_proxy.h
index 77b7bad..d3dc255 100644
--- a/api/media_stream_track_proxy.h
+++ b/api/media_stream_track_proxy.h
@@ -11,12 +11,12 @@
 // This file includes proxy classes for tracks. The purpose is
 // to make sure tracks are only accessed from the signaling thread.
 
-#ifndef API_MEDIASTREAMTRACKPROXY_H_
-#define API_MEDIASTREAMTRACKPROXY_H_
+#ifndef API_MEDIA_STREAM_TRACK_PROXY_H_
+#define API_MEDIA_STREAM_TRACK_PROXY_H_
 
 #include <string>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/proxy.h"
 
 namespace webrtc {
@@ -62,4 +62,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_MEDIASTREAMTRACKPROXY_H_
+#endif  // API_MEDIA_STREAM_TRACK_PROXY_H_
diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h
index 4531fe4..ee1b8e3 100644
--- a/api/media_transport_interface.h
+++ b/api/media_transport_interface.h
@@ -25,11 +25,11 @@
 
 #include "absl/types/optional.h"
 #include "api/array_view.h"
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
 #include "api/video/encoded_image.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/deprecation.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/network_route.h"
 
 namespace rtc {
 class PacketTransportInternal;
diff --git a/api/media_types.cc b/api/media_types.cc
index 599542d..3359f1d 100644
--- a/api/media_types.cc
+++ b/api/media_types.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/mediatypes.h"
+#include "api/media_types.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "rtc_base/checks.h"
 
 namespace {
diff --git a/api/media_types.h b/api/media_types.h
index f281276..64e2ebc 100644
--- a/api/media_types.h
+++ b/api/media_types.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_MEDIATYPES_H_
-#define API_MEDIATYPES_H_
+#ifndef API_MEDIA_TYPES_H_
+#define API_MEDIA_TYPES_H_
 
 #include <string>
 
@@ -33,4 +33,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_MEDIATYPES_H_
+#endif  // API_MEDIA_TYPES_H_
diff --git a/api/notifier.h b/api/notifier.h
index e5c61c9..c03b104 100644
--- a/api/notifier.h
+++ b/api/notifier.h
@@ -13,7 +13,7 @@
 
 #include <list>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/ortc/packet_transport_interface.h b/api/ortc/packet_transport_interface.h
index f357f8a..8fef270 100644
--- a/api/ortc/packet_transport_interface.h
+++ b/api/ortc/packet_transport_interface.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_ORTC_PACKETTRANSPORTINTERFACE_H_
-#define API_ORTC_PACKETTRANSPORTINTERFACE_H_
+#ifndef API_ORTC_PACKET_TRANSPORT_INTERFACE_H_
+#define API_ORTC_PACKET_TRANSPORT_INTERFACE_H_
 
 namespace rtc {
 
@@ -36,4 +36,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_ORTC_PACKETTRANSPORTINTERFACE_H_
+#endif  // API_ORTC_PACKET_TRANSPORT_INTERFACE_H_
diff --git a/api/ortc/rtp_transport_interface.h b/api/ortc/rtp_transport_interface.h
index 4b9d161..ec71216 100644
--- a/api/ortc/rtp_transport_interface.h
+++ b/api/ortc/rtp_transport_interface.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_ORTC_RTPTRANSPORTINTERFACE_H_
-#define API_ORTC_RTPTRANSPORTINTERFACE_H_
+#ifndef API_ORTC_RTP_TRANSPORT_INTERFACE_H_
+#define API_ORTC_RTP_TRANSPORT_INTERFACE_H_
 
 #include <string>
 
 #include "absl/types/optional.h"
-#include "api/ortc/packettransportinterface.h"
-#include "api/rtcerror.h"
+#include "api/ortc/packet_transport_interface.h"
+#include "api/rtc_error.h"
 #include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 
 namespace webrtc {
 
@@ -91,4 +91,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_ORTC_RTPTRANSPORTINTERFACE_H_
+#endif  // API_ORTC_RTP_TRANSPORT_INTERFACE_H_
diff --git a/api/ortc/srtp_transport_interface.h b/api/ortc/srtp_transport_interface.h
index 4b757e4..65ef1ef 100644
--- a/api/ortc/srtp_transport_interface.h
+++ b/api/ortc/srtp_transport_interface.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_ORTC_SRTPTRANSPORTINTERFACE_H_
-#define API_ORTC_SRTPTRANSPORTINTERFACE_H_
+#ifndef API_ORTC_SRTP_TRANSPORT_INTERFACE_H_
+#define API_ORTC_SRTP_TRANSPORT_INTERFACE_H_
 
-#include "api/cryptoparams.h"
-#include "api/ortc/rtptransportinterface.h"
-#include "api/rtcerror.h"
+#include "api/crypto_params.h"
+#include "api/ortc/rtp_transport_interface.h"
+#include "api/rtc_error.h"
 
 namespace webrtc {
 
@@ -45,4 +45,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_ORTC_SRTPTRANSPORTINTERFACE_H_
+#endif  // API_ORTC_SRTP_TRANSPORT_INTERFACE_H_
diff --git a/api/peer_connection_factory_proxy.h b/api/peer_connection_factory_proxy.h
index d885cc1..1f37034 100644
--- a/api/peer_connection_factory_proxy.h
+++ b/api/peer_connection_factory_proxy.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_PEERCONNECTIONFACTORYPROXY_H_
-#define API_PEERCONNECTIONFACTORYPROXY_H_
+#ifndef API_PEER_CONNECTION_FACTORY_PROXY_H_
+#define API_PEER_CONNECTION_FACTORY_PROXY_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "api/proxy.h"
 #include "rtc_base/bind.h"
 
@@ -74,4 +74,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_PEERCONNECTIONFACTORYPROXY_H_
+#endif  // API_PEER_CONNECTION_FACTORY_PROXY_H_
diff --git a/api/peer_connection_interface.cc b/api/peer_connection_interface.cc
index a9b95a9..57754b6 100644
--- a/api/peer_connection_interface.cc
+++ b/api/peer_connection_interface.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/peerconnectioninterface.h"
-#include "api/dtlstransportinterface.h"
+#include "api/peer_connection_interface.h"
+#include "api/dtls_transport_interface.h"
 
 namespace webrtc {
 
diff --git a/api/peer_connection_interface.h b/api/peer_connection_interface.h
index 91d71b4..d431a8e 100644
--- a/api/peer_connection_interface.h
+++ b/api/peer_connection_interface.h
@@ -64,55 +64,55 @@
 // 7. Once a candidate has been gathered, the PeerConnection will call the
 // observer function OnIceCandidate. Send these candidates to the remote peer.
 
-#ifndef API_PEERCONNECTIONINTERFACE_H_
-#define API_PEERCONNECTIONINTERFACE_H_
+#ifndef API_PEER_CONNECTION_INTERFACE_H_
+#define API_PEER_CONNECTION_INTERFACE_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "api/asyncresolverfactory.h"
+#include "api/async_resolver_factory.h"
 #include "api/audio/audio_mixer.h"
 #include "api/audio_codecs/audio_decoder_factory.h"
 #include "api/audio_codecs/audio_encoder_factory.h"
 #include "api/audio_options.h"
-#include "api/call/callfactoryinterface.h"
-#include "api/crypto/cryptooptions.h"
-#include "api/datachannelinterface.h"
+#include "api/call/call_factory_interface.h"
+#include "api/crypto/crypto_options.h"
+#include "api/data_channel_interface.h"
 #include "api/fec_controller.h"
 #include "api/jsep.h"
+#include "api/media_stream_interface.h"
 #include "api/media_transport_interface.h"
-#include "api/mediastreaminterface.h"
-#include "api/rtcerror.h"
-#include "api/rtceventlogoutput.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "api/rtptransceiverinterface.h"
-#include "api/setremotedescriptionobserverinterface.h"
-#include "api/stats/rtcstatscollectorcallback.h"
-#include "api/statstypes.h"
+#include "api/rtc_error.h"
+#include "api/rtc_event_log_output.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_interface.h"
+#include "api/set_remote_description_observer_interface.h"
+#include "api/stats/rtc_stats_collector_callback.h"
+#include "api/stats_types.h"
 #include "api/transport/bitrate_settings.h"
 #include "api/transport/network_control.h"
-#include "api/turncustomizer.h"
+#include "api/turn_customizer.h"
 #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
-#include "media/base/mediaconfig.h"
+#include "media/base/media_config.h"
 // TODO(bugs.webrtc.org/6353): cricket::VideoCapturer is deprecated and should
 // be deleted from the PeerConnection api.
-#include "media/base/videocapturer.h"  // nogncheck
+#include "media/base/video_capturer.h"  // nogncheck
 // TODO(bugs.webrtc.org/7447): We plan to provide a way to let applications
 // inject a PacketSocketFactory and/or NetworkManager, and not expose
 // PortAllocator in the PeerConnection api.
-#include "media/base/mediaengine.h"  // nogncheck
-#include "p2p/base/portallocator.h"  // nogncheck
+#include "media/base/media_engine.h"  // nogncheck
+#include "p2p/base/port_allocator.h"  // nogncheck
 // TODO(nisse): The interface for bitrate allocation strategy belongs in api/.
-#include "rtc_base/bitrateallocationstrategy.h"
+#include "rtc_base/bitrate_allocation_strategy.h"
 #include "rtc_base/network.h"
 #include "rtc_base/platform_file.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/rtccertificategenerator.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/rtc_certificate_generator.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace rtc {
@@ -1462,4 +1462,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_PEERCONNECTIONINTERFACE_H_
+#endif  // API_PEER_CONNECTION_INTERFACE_H_
diff --git a/api/peer_connection_proxy.h b/api/peer_connection_proxy.h
index e69efc0..8bd4d71 100644
--- a/api/peer_connection_proxy.h
+++ b/api/peer_connection_proxy.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_PEERCONNECTIONPROXY_H_
-#define API_PEERCONNECTIONPROXY_H_
+#ifndef API_PEER_CONNECTION_PROXY_H_
+#define API_PEER_CONNECTION_PROXY_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "api/proxy.h"
 
 namespace webrtc {
@@ -141,4 +141,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_PEERCONNECTIONPROXY_H_
+#endif  // API_PEER_CONNECTION_PROXY_H_
diff --git a/api/proxy.h b/api/proxy.h
index 3c30995..b1d9d50 100644
--- a/api/proxy.h
+++ b/api/proxy.h
@@ -57,9 +57,9 @@
 #include <utility>
 
 #include "rtc_base/event.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
 
diff --git a/api/ref_counted_base.h b/api/ref_counted_base.h
index 8c26efd..a1761db 100644
--- a/api/ref_counted_base.h
+++ b/api/ref_counted_base.h
@@ -7,12 +7,12 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef API_REFCOUNTEDBASE_H_
-#define API_REFCOUNTEDBASE_H_
+#ifndef API_REF_COUNTED_BASE_H_
+#define API_REF_COUNTED_BASE_H_
 
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcounter.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counter.h"
 
 namespace rtc {
 
@@ -40,4 +40,4 @@
 
 }  // namespace rtc
 
-#endif  // API_REFCOUNTEDBASE_H_
+#endif  // API_REF_COUNTED_BASE_H_
diff --git a/api/rtc_error.cc b/api/rtc_error.cc
index 039e7f3..eccc891 100644
--- a/api/rtc_error.cc
+++ b/api/rtc_error.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
 
 #include "rtc_base/arraysize.h"
 
diff --git a/api/rtc_error.h b/api/rtc_error.h
index 4910682..d8db1f2 100644
--- a/api/rtc_error.h
+++ b/api/rtc_error.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_RTCERROR_H_
-#define API_RTCERROR_H_
+#ifndef API_RTC_ERROR_H_
+#define API_RTC_ERROR_H_
 
 #ifdef UNIT_TEST
 #include <ostream>
@@ -291,4 +291,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_RTCERROR_H_
+#endif  // API_RTC_ERROR_H_
diff --git a/api/rtc_error_unittest.cc b/api/rtc_error_unittest.cc
index a1ea83f..e9beb00 100644
--- a/api/rtc_error_unittest.cc
+++ b/api/rtc_error_unittest.cc
@@ -10,7 +10,7 @@
 
 #include <utility>
 
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
 #include "test/gtest.h"
 
 namespace {
diff --git a/api/rtc_event_log_output.h b/api/rtc_event_log_output.h
index 67e408d..4a46324 100644
--- a/api/rtc_event_log_output.h
+++ b/api/rtc_event_log_output.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_RTCEVENTLOGOUTPUT_H_
-#define API_RTCEVENTLOGOUTPUT_H_
+#ifndef API_RTC_EVENT_LOG_OUTPUT_H_
+#define API_RTC_EVENT_LOG_OUTPUT_H_
 
 #include <string>
 
@@ -36,4 +36,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_RTCEVENTLOGOUTPUT_H_
+#endif  // API_RTC_EVENT_LOG_OUTPUT_H_
diff --git a/api/rtp_parameters.cc b/api/rtp_parameters.cc
index 6b253dc..c4fd112 100644
--- a/api/rtp_parameters.cc
+++ b/api/rtp_parameters.cc
@@ -7,7 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 
 #include <algorithm>
 #include <string>
diff --git a/api/rtp_parameters.h b/api/rtp_parameters.h
index bb599ce..a2c566a 100644
--- a/api/rtp_parameters.h
+++ b/api/rtp_parameters.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_RTPPARAMETERS_H_
-#define API_RTPPARAMETERS_H_
+#ifndef API_RTP_PARAMETERS_H_
+#define API_RTP_PARAMETERS_H_
 
 #include <stdint.h>
 #include <string>
@@ -17,7 +17,7 @@
 #include <vector>
 
 #include "absl/types/optional.h"
-#include "api/mediatypes.h"
+#include "api/media_types.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
@@ -673,4 +673,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_RTPPARAMETERS_H_
+#endif  // API_RTP_PARAMETERS_H_
diff --git a/api/rtp_parameters_unittest.cc b/api/rtp_parameters_unittest.cc
index 9d17d25..b6f2482 100644
--- a/api/rtp_parameters_unittest.cc
+++ b/api/rtp_parameters_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/rtp_receiver_interface.cc b/api/rtp_receiver_interface.cc
index 216ed2e..d8bb3d3 100644
--- a/api/rtp_receiver_interface.cc
+++ b/api/rtp_receiver_interface.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
 
 namespace webrtc {
 
diff --git a/api/rtp_receiver_interface.h b/api/rtp_receiver_interface.h
index 2619735..12c9d95 100644
--- a/api/rtp_receiver_interface.h
+++ b/api/rtp_receiver_interface.h
@@ -11,18 +11,18 @@
 // This file contains interfaces for RtpReceivers
 // http://w3c.github.io/webrtc-pc/#rtcrtpreceiver-interface
 
-#ifndef API_RTPRECEIVERINTERFACE_H_
-#define API_RTPRECEIVERINTERFACE_H_
+#ifndef API_RTP_RECEIVER_INTERFACE_H_
+#define API_RTP_RECEIVER_INTERFACE_H_
 
 #include <string>
 #include <vector>
 
-#include "api/crypto/framedecryptorinterface.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
+#include "api/crypto/frame_decryptor_interface.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
 #include "api/proxy.h"
-#include "api/rtpparameters.h"
-#include "rtc_base/refcount.h"
+#include "api/rtp_parameters.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
@@ -164,4 +164,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_RTPRECEIVERINTERFACE_H_
+#endif  // API_RTP_RECEIVER_INTERFACE_H_
diff --git a/api/rtp_sender_interface.cc b/api/rtp_sender_interface.cc
index 11c0a69..68747ea 100644
--- a/api/rtp_sender_interface.cc
+++ b/api/rtp_sender_interface.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/rtpsenderinterface.h"
+#include "api/rtp_sender_interface.h"
 
 namespace webrtc {
 
diff --git a/api/rtp_sender_interface.h b/api/rtp_sender_interface.h
index 7c94c21..c1dc716 100644
--- a/api/rtp_sender_interface.h
+++ b/api/rtp_sender_interface.h
@@ -11,20 +11,20 @@
 // This file contains interfaces for RtpSenders
 // http://w3c.github.io/webrtc-pc/#rtcrtpsender-interface
 
-#ifndef API_RTPSENDERINTERFACE_H_
-#define API_RTPSENDERINTERFACE_H_
+#ifndef API_RTP_SENDER_INTERFACE_H_
+#define API_RTP_SENDER_INTERFACE_H_
 
 #include <string>
 #include <vector>
 
-#include "api/crypto/frameencryptorinterface.h"
-#include "api/dtmfsenderinterface.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
+#include "api/crypto/frame_encryptor_interface.h"
+#include "api/dtmf_sender_interface.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
 #include "api/proxy.h"
-#include "api/rtcerror.h"
-#include "api/rtpparameters.h"
-#include "rtc_base/refcount.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
@@ -108,4 +108,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_RTPSENDERINTERFACE_H_
+#endif  // API_RTP_SENDER_INTERFACE_H_
diff --git a/api/rtp_transceiver_interface.cc b/api/rtp_transceiver_interface.cc
index e62b014..0504331 100644
--- a/api/rtp_transceiver_interface.cc
+++ b/api/rtp_transceiver_interface.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/rtptransceiverinterface.h"
+#include "api/rtp_transceiver_interface.h"
 
 #include "rtc_base/checks.h"
 
diff --git a/api/rtp_transceiver_interface.h b/api/rtp_transceiver_interface.h
index c01fdaf..c62df49 100644
--- a/api/rtp_transceiver_interface.h
+++ b/api/rtp_transceiver_interface.h
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_RTPTRANSCEIVERINTERFACE_H_
-#define API_RTPTRANSCEIVERINTERFACE_H_
+#ifndef API_RTP_TRANSCEIVER_INTERFACE_H_
+#define API_RTP_TRANSCEIVER_INTERFACE_H_
 
 #include <string>
 #include <vector>
 
 #include "absl/types/optional.h"
 #include "api/array_view.h"
-#include "api/mediatypes.h"
-#include "api/rtpparameters.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "rtc_base/refcount.h"
+#include "api/media_types.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
@@ -137,4 +137,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_RTPTRANSCEIVERINTERFACE_H_
+#endif  // API_RTP_TRANSCEIVER_INTERFACE_H_
diff --git a/api/set_remote_description_observer_interface.h b/api/set_remote_description_observer_interface.h
index bea8b82..1782555 100644
--- a/api/set_remote_description_observer_interface.h
+++ b/api/set_remote_description_observer_interface.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_
-#define API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_
+#ifndef API_SET_REMOTE_DESCRIPTION_OBSERVER_INTERFACE_H_
+#define API_SET_REMOTE_DESCRIPTION_OBSERVER_INTERFACE_H_
 
-#include "api/rtcerror.h"
-#include "rtc_base/refcount.h"
+#include "api/rtc_error.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 
@@ -28,4 +28,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_SETREMOTEDESCRIPTIONOBSERVERINTERFACE_H_
+#endif  // API_SET_REMOTE_DESCRIPTION_OBSERVER_INTERFACE_H_
diff --git a/api/stats/rtc_stats.h b/api/stats/rtc_stats.h
index 3e96b0a..049b74f 100644
--- a/api/stats/rtc_stats.h
+++ b/api/stats/rtc_stats.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_STATS_RTCSTATS_H_
-#define API_STATS_RTCSTATS_H_
+#ifndef API_STATS_RTC_STATS_H_
+#define API_STATS_RTC_STATS_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -348,4 +348,4 @@
 };
 }  // namespace webrtc
 
-#endif  // API_STATS_RTCSTATS_H_
+#endif  // API_STATS_RTC_STATS_H_
diff --git a/api/stats/rtc_stats_collector_callback.h b/api/stats/rtc_stats_collector_callback.h
index 9242217..0bc8217 100644
--- a/api/stats/rtc_stats_collector_callback.h
+++ b/api/stats/rtc_stats_collector_callback.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_STATS_RTCSTATSCOLLECTORCALLBACK_H_
-#define API_STATS_RTCSTATSCOLLECTORCALLBACK_H_
+#ifndef API_STATS_RTC_STATS_COLLECTOR_CALLBACK_H_
+#define API_STATS_RTC_STATS_COLLECTOR_CALLBACK_H_
 
-#include "api/stats/rtcstatsreport.h"
-#include "rtc_base/refcount.h"
+#include "api/stats/rtc_stats_report.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
@@ -27,4 +27,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_STATS_RTCSTATSCOLLECTORCALLBACK_H_
+#endif  // API_STATS_RTC_STATS_COLLECTOR_CALLBACK_H_
diff --git a/api/stats/rtc_stats_report.h b/api/stats/rtc_stats_report.h
index a70a9ff..ab4f8f0 100644
--- a/api/stats/rtc_stats_report.h
+++ b/api/stats/rtc_stats_report.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_STATS_RTCSTATSREPORT_H_
-#define API_STATS_RTCSTATSREPORT_H_
+#ifndef API_STATS_RTC_STATS_REPORT_H_
+#define API_STATS_RTC_STATS_REPORT_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -18,9 +18,9 @@
 #include <string>
 #include <vector>
 
-#include "api/stats/rtcstats.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "api/stats/rtc_stats.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/system/rtc_export.h"
 
@@ -117,4 +117,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_STATS_RTCSTATSREPORT_H_
+#endif  // API_STATS_RTC_STATS_REPORT_H_
diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h
index 9727758..e69bc8e 100644
--- a/api/stats/rtcstats_objects.h
+++ b/api/stats/rtcstats_objects.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "api/stats/rtcstats.h"
+#include "api/stats/rtc_stats.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
diff --git a/api/stats_types.cc b/api/stats_types.cc
index dc37abc..71b1f86 100644
--- a/api/stats_types.cc
+++ b/api/stats_types.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/statstypes.h"
+#include "api/stats_types.h"
 
 #include <string.h>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 
 // TODO(tommi): Could we have a static map of value name -> expected type
 // and use this to RTC_DCHECK on correct usage (somewhat strongly typed values)?
diff --git a/api/stats_types.h b/api/stats_types.h
index e653d15..7f1160f 100644
--- a/api/stats_types.h
+++ b/api/stats_types.h
@@ -11,8 +11,8 @@
 // This file contains structures used for retrieving statistics from an ongoing
 // libjingle session.
 
-#ifndef API_STATSTYPES_H_
-#define API_STATSTYPES_H_
+#ifndef API_STATS_TYPES_H_
+#define API_STATS_TYPES_H_
 
 #include <algorithm>
 #include <list>
@@ -20,10 +20,10 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/thread_checker.h"
 
 namespace webrtc {
@@ -449,4 +449,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_STATSTYPES_H_
+#endif  // API_STATS_TYPES_H_
diff --git a/api/test/DEPS b/api/test/DEPS
index 6c1ab93..ed944b4 100644
--- a/api/test/DEPS
+++ b/api/test/DEPS
@@ -5,12 +5,12 @@
   ".*": [
     "+video"
   ],
-  "fakeconstraints\.h": [
-    "+rtc_base/stringencode.h",
+  "fake_constraints\.h": [
+    "+rtc_base/string_encode.h",
   ],
   "loopback_media_transport\.h": [
-    "+rtc_base/asyncinvoker.h",
-    "+rtc_base/criticalsection.h",
+    "+rtc_base/async_invoker.h",
+    "+rtc_base/critical_section.h",
     "+rtc_base/thread.h",
     "+rtc_base/thread_checker.h",
   ],
diff --git a/api/test/fake_constraints.h b/api/test/fake_constraints.h
index d9c767d..e2b26d1 100644
--- a/api/test/fake_constraints.h
+++ b/api/test/fake_constraints.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_TEST_FAKECONSTRAINTS_H_
-#define API_TEST_FAKECONSTRAINTS_H_
+#ifndef API_TEST_FAKE_CONSTRAINTS_H_
+#define API_TEST_FAKE_CONSTRAINTS_H_
 
 #include <string>
 #include <vector>
 
-#include "api/mediaconstraintsinterface.h"
-#include "rtc_base/stringencode.h"
+#include "api/media_constraints_interface.h"
+#include "rtc_base/string_encode.h"
 
 namespace webrtc {
 
@@ -109,4 +109,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_TEST_FAKECONSTRAINTS_H_
+#endif  // API_TEST_FAKE_CONSTRAINTS_H_
diff --git a/api/test/fake_frame_decryptor.h b/api/test/fake_frame_decryptor.h
index e2bcf68..cb370b9 100644
--- a/api/test/fake_frame_decryptor.h
+++ b/api/test/fake_frame_decryptor.h
@@ -16,9 +16,9 @@
 #include <vector>
 
 #include "api/array_view.h"
-#include "api/crypto/framedecryptorinterface.h"
-#include "api/mediatypes.h"
-#include "rtc_base/refcountedobject.h"
+#include "api/crypto/frame_decryptor_interface.h"
+#include "api/media_types.h"
+#include "rtc_base/ref_counted_object.h"
 
 namespace webrtc {
 
diff --git a/api/test/fake_frame_encryptor.h b/api/test/fake_frame_encryptor.h
index 47597ee..074981b 100644
--- a/api/test/fake_frame_encryptor.h
+++ b/api/test/fake_frame_encryptor.h
@@ -15,9 +15,9 @@
 #include <stdint.h>
 
 #include "api/array_view.h"
-#include "api/crypto/frameencryptorinterface.h"
-#include "api/mediatypes.h"
-#include "rtc_base/refcountedobject.h"
+#include "api/crypto/frame_encryptor_interface.h"
+#include "api/media_types.h"
+#include "rtc_base/ref_counted_object.h"
 
 namespace webrtc {
 
diff --git a/api/test/loopback_media_transport.cc b/api/test/loopback_media_transport.cc
index 40415e2..57cc36d 100644
--- a/api/test/loopback_media_transport.cc
+++ b/api/test/loopback_media_transport.cc
@@ -11,7 +11,7 @@
 #include "api/test/loopback_media_transport.h"
 
 #include "absl/memory/memory.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/api/test/loopback_media_transport.h b/api/test/loopback_media_transport.h
index bd26305..64b8ced 100644
--- a/api/test/loopback_media_transport.h
+++ b/api/test/loopback_media_transport.h
@@ -17,8 +17,8 @@
 
 #include "absl/memory/memory.h"
 #include "api/media_transport_interface.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_checker.h"
 
diff --git a/api/test/mock_frame_decryptor.h b/api/test/mock_frame_decryptor.h
index e803965..feac9b3 100644
--- a/api/test/mock_frame_decryptor.h
+++ b/api/test/mock_frame_decryptor.h
@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "api/crypto/framedecryptorinterface.h"
+#include "api/crypto/frame_decryptor_interface.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_frame_encryptor.h b/api/test/mock_frame_encryptor.h
index c4fb1fd..44b5e34 100644
--- a/api/test/mock_frame_encryptor.h
+++ b/api/test/mock_frame_encryptor.h
@@ -11,7 +11,7 @@
 #ifndef API_TEST_MOCK_FRAME_ENCRYPTOR_H_
 #define API_TEST_MOCK_FRAME_ENCRYPTOR_H_
 
-#include "api/crypto/frameencryptorinterface.h"
+#include "api/crypto/frame_encryptor_interface.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_peerconnectioninterface.h b/api/test/mock_peerconnectioninterface.h
index 2e040de..86abad5 100644
--- a/api/test/mock_peerconnectioninterface.h
+++ b/api/test/mock_peerconnectioninterface.h
@@ -16,7 +16,7 @@
 #include <utility>
 #include <vector>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_rtpreceiver.h b/api/test/mock_rtpreceiver.h
index de69cea..c585cbf 100644
--- a/api/test/mock_rtpreceiver.h
+++ b/api/test/mock_rtpreceiver.h
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_rtpsender.h b/api/test/mock_rtpsender.h
index 37d6e0c..dca718f 100644
--- a/api/test/mock_rtpsender.h
+++ b/api/test/mock_rtpsender.h
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "api/rtpsenderinterface.h"
+#include "api/rtp_sender_interface.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/simulated_network.h b/api/test/simulated_network.h
index c03b4ca..404f016 100644
--- a/api/test/simulated_network.h
+++ b/api/test/simulated_network.h
@@ -18,7 +18,7 @@
 #include <vector>
 
 #include "absl/types/optional.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/random.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/api/test/video_quality_test_fixture.h b/api/test/video_quality_test_fixture.h
index 1c82a0d..79b6d67 100644
--- a/api/test/video_quality_test_fixture.h
+++ b/api/test/video_quality_test_fixture.h
@@ -18,7 +18,7 @@
 
 #include "api/bitrate_constraints.h"
 #include "api/fec_controller.h"
-#include "api/mediatypes.h"
+#include "api/media_types.h"
 #include "api/test/simulated_network.h"
 #include "api/video_codecs/video_encoder_config.h"
 
diff --git a/api/turn_customizer.h b/api/turn_customizer.h
index 85c4e77..f0bf0d9 100644
--- a/api/turn_customizer.h
+++ b/api/turn_customizer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_TURNCUSTOMIZER_H_
-#define API_TURNCUSTOMIZER_H_
+#ifndef API_TURN_CUSTOMIZER_H_
+#define API_TURN_CUSTOMIZER_H_
 
 #include <stdlib.h>
 
@@ -42,4 +42,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_TURNCUSTOMIZER_H_
+#endif  // API_TURN_CUSTOMIZER_H_
diff --git a/api/uma_metrics.h b/api/uma_metrics.h
index 239eff3..4336c1e 100644
--- a/api/uma_metrics.h
+++ b/api/uma_metrics.h
@@ -10,10 +10,10 @@
 
 // This file contains enums related to IPv4/IPv6 metrics.
 
-#ifndef API_UMAMETRICS_H_
-#define API_UMAMETRICS_H_
+#ifndef API_UMA_METRICS_H_
+#define API_UMA_METRICS_H_
 
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 
@@ -157,4 +157,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_UMAMETRICS_H_
+#endif  // API_UMA_METRICS_H_
diff --git a/api/video/DEPS b/api/video/DEPS
index a76b554..3dfec07 100644
--- a/api/video/DEPS
+++ b/api/video/DEPS
@@ -21,7 +21,7 @@
   ],
 
   "video_frame_buffer\.h": [
-    "+rtc_base/refcount.h",
+    "+rtc_base/ref_count.h",
     "+rtc_base/scoped_ref_ptr.h",
   ],
 
diff --git a/api/video/i010_buffer.cc b/api/video/i010_buffer.cc
index 557a769..8f4541f 100644
--- a/api/video/i010_buffer.cc
+++ b/api/video/i010_buffer.cc
@@ -13,7 +13,7 @@
 
 #include "api/video/i420_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/scale.h"
 
diff --git a/api/video/i420_buffer.cc b/api/video/i420_buffer.cc
index c468f51..ed45b98 100644
--- a/api/video/i420_buffer.cc
+++ b/api/video/i420_buffer.cc
@@ -14,7 +14,7 @@
 #include <utility>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/planar_functions.h"
 #include "third_party/libyuv/include/libyuv/scale.h"
diff --git a/api/video/video_frame.cc b/api/video/video_frame.cc
index c80ee8b..75a30b2 100644
--- a/api/video/video_frame.cc
+++ b/api/video/video_frame.cc
@@ -11,7 +11,7 @@
 #include "api/video/video_frame.h"
 
 #include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/api/video/video_frame_buffer.h b/api/video/video_frame_buffer.h
index 1e8169a..cdc87ac 100644
--- a/api/video/video_frame_buffer.h
+++ b/api/video/video_frame_buffer.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/api/video/video_stream_encoder_interface.h b/api/video/video_stream_encoder_interface.h
index 2f95e58..6a0adde 100644
--- a/api/video/video_stream_encoder_interface.h
+++ b/api/video/video_stream_encoder_interface.h
@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "api/rtpparameters.h"  // For DegradationPreference.
+#include "api/rtp_parameters.h"  // For DegradationPreference.
 #include "api/video/video_sink_interface.h"
 #include "api/video/video_source_interface.h"
 #include "api/video_codecs/video_encoder.h"
diff --git a/api/video_codecs/builtin_video_decoder_factory.cc b/api/video_codecs/builtin_video_decoder_factory.cc
index 883c1eb..e71e069 100644
--- a/api/video_codecs/builtin_video_decoder_factory.cc
+++ b/api/video_codecs/builtin_video_decoder_factory.cc
@@ -11,7 +11,7 @@
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 
 #include "absl/memory/memory.h"
-#include "media/engine/internaldecoderfactory.h"
+#include "media/engine/internal_decoder_factory.h"
 
 namespace webrtc {
 
diff --git a/api/video_codecs/builtin_video_encoder_factory.cc b/api/video_codecs/builtin_video_encoder_factory.cc
index 1778c21..0df97cc 100644
--- a/api/video_codecs/builtin_video_encoder_factory.cc
+++ b/api/video_codecs/builtin_video_encoder_factory.cc
@@ -17,9 +17,9 @@
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_encoder.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "media/engine/encoder_simulcast_proxy.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/engine/internal_encoder_factory.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
index 9fd5aed..bf08d1c 100644
--- a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
+++ b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
@@ -32,7 +32,7 @@
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "modules/video_coding/utility/simulcast_rate_allocator.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/field_trial.h"
 #include "test/gmock.h"
diff --git a/api/video_codecs/video_encoder_config.h b/api/video_codecs/video_encoder_config.h
index 9dd8e4f..3a35380 100644
--- a/api/video_codecs/video_encoder_config.h
+++ b/api/video_codecs/video_encoder_config.h
@@ -18,7 +18,7 @@
 #include "absl/types/optional.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_codec.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/api/video_track_source_proxy.h b/api/video_track_source_proxy.h
index dbd9045..820cdcb 100644
--- a/api/video_track_source_proxy.h
+++ b/api/video_track_source_proxy.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef API_VIDEOSOURCEPROXY_H_
-#define API_VIDEOSOURCEPROXY_H_
+#ifndef API_VIDEO_TRACK_SOURCE_PROXY_H_
+#define API_VIDEO_TRACK_SOURCE_PROXY_H_
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/proxy.h"
 
 namespace webrtc {
@@ -38,4 +38,4 @@
 
 }  // namespace webrtc
 
-#endif  // API_VIDEOSOURCEPROXY_H_
+#endif  // API_VIDEO_TRACK_SOURCE_PROXY_H_
diff --git a/audio/audio_level.h b/audio/audio_level.h
index 3bbe5fd..bb04cc0 100644
--- a/audio/audio_level.h
+++ b/audio/audio_level.h
@@ -11,7 +11,7 @@
 #ifndef AUDIO_AUDIO_LEVEL_H_
 #define AUDIO_AUDIO_LEVEL_H_
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc
index 2e874ba..690bb90 100644
--- a/audio/audio_receive_stream.cc
+++ b/audio/audio_receive_stream.cc
@@ -17,7 +17,7 @@
 #include "api/array_view.h"
 #include "api/audio_codecs/audio_format.h"
 #include "api/call/audio_sink.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "audio/audio_send_stream.h"
 #include "audio/audio_state.h"
 #include "audio/channel_receive.h"
@@ -27,7 +27,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/audio/audio_receive_stream.h b/audio/audio_receive_stream.h
index 86bcb1c..6596cb4 100644
--- a/audio/audio_receive_stream.h
+++ b/audio/audio_receive_stream.h
@@ -19,7 +19,7 @@
 #include "audio/audio_state.h"
 #include "call/audio_receive_stream.h"
 #include "call/syncable.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/thread_checker.h"
 
 namespace webrtc {
diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc
index c5c25c2..0c9a9ff 100644
--- a/audio/audio_send_stream.cc
+++ b/audio/audio_send_stream.cc
@@ -19,7 +19,7 @@
 #include "api/audio_codecs/audio_encoder_factory.h"
 #include "api/audio_codecs/audio_format.h"
 #include "api/call/transport.h"
-#include "api/crypto/frameencryptorinterface.h"
+#include "api/crypto/frame_encryptor_interface.h"
 #include "audio/audio_state.h"
 #include "audio/channel_send.h"
 #include "audio/conversion.h"
@@ -37,7 +37,7 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/audio_format_to_string.h"
 #include "rtc_base/task_queue.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
diff --git a/audio/audio_send_stream.h b/audio/audio_send_stream.h
index cea8551..2ba8d06 100644
--- a/audio/audio_send_stream.h
+++ b/audio/audio_send_stream.h
@@ -20,7 +20,7 @@
 #include "call/audio_state.h"
 #include "call/bitrate_allocator.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/thread_checker.h"
 
diff --git a/audio/audio_state.cc b/audio/audio_state.cc
index ce9e894..334eaed 100644
--- a/audio/audio_state.cc
+++ b/audio/audio_state.cc
@@ -19,7 +19,7 @@
 #include "modules/audio_device/include/audio_device.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/audio/audio_state.h b/audio/audio_state.h
index f633f2f..60250da 100644
--- a/audio/audio_state.h
+++ b/audio/audio_state.h
@@ -18,9 +18,9 @@
 #include "audio/audio_transport_impl.h"
 #include "audio/null_audio_poller.h"
 #include "call/audio_state.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/thread_checker.h"
 
 namespace webrtc {
diff --git a/audio/audio_state_unittest.cc b/audio/audio_state_unittest.cc
index 790b643..75bf4e1 100644
--- a/audio/audio_state_unittest.cc
+++ b/audio/audio_state_unittest.cc
@@ -16,7 +16,7 @@
 #include "modules/audio_device/include/mock_audio_device.h"
 #include "modules/audio_mixer/audio_mixer_impl.h"
 #include "modules/audio_processing/include/mock_audio_processing.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/audio/audio_transport_impl.h b/audio/audio_transport_impl.h
index 3a3155c..e0aaa5e 100644
--- a/audio/audio_transport_impl.h
+++ b/audio/audio_transport_impl.h
@@ -19,8 +19,8 @@
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "modules/audio_processing/typing_detection.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/audio/channel_receive.cc b/audio/channel_receive.cc
index e5bcad3..bfa85c0 100644
--- a/audio/channel_receive.cc
+++ b/audio/channel_receive.cc
@@ -36,14 +36,14 @@
 #include "modules/rtp_rtcp/source/rtp_rtcp_config.h"
 #include "modules/utility/include/process_thread.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/thread_checker.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace webrtc {
diff --git a/audio/channel_receive.h b/audio/channel_receive.h
index 2c45a8f..d93ddad 100644
--- a/audio/channel_receive.h
+++ b/audio/channel_receive.h
@@ -21,9 +21,9 @@
 #include "api/audio_codecs/audio_decoder_factory.h"
 #include "api/call/audio_sink.h"
 #include "api/call/transport.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
 #include "api/media_transport_interface.h"
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
 #include "call/rtp_packet_sink_interface.h"
 #include "call/syncable.h"
 #include "modules/audio_coding/include/audio_coding_module.h"
diff --git a/audio/channel_send.cc b/audio/channel_send.cc
index fa69422..7899cf7 100644
--- a/audio/channel_send.cc
+++ b/audio/channel_send.cc
@@ -20,7 +20,7 @@
 #include "absl/memory/memory.h"
 #include "api/array_view.h"
 #include "api/call/transport.h"
-#include "api/crypto/frameencryptorinterface.h"
+#include "api/crypto/frame_encryptor_interface.h"
 #include "audio/utility/audio_frame_operations.h"
 #include "call/rtp_transport_controller_send_interface.h"
 #include "logging/rtc_event_log/events/rtc_event_audio_playout.h"
@@ -31,7 +31,7 @@
 #include "modules/pacing/packet_router.h"
 #include "modules/utility/include/process_thread.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/location.h"
@@ -41,7 +41,7 @@
 #include "rtc_base/rate_limiter.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_checker.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/field_trial.h"
 #include "system_wrappers/include/metrics.h"
 
diff --git a/audio/channel_send.h b/audio/channel_send.h
index 8bf53e8..ccd17df 100644
--- a/audio/channel_send.h
+++ b/audio/channel_send.h
@@ -17,7 +17,7 @@
 
 #include "api/audio/audio_frame.h"
 #include "api/audio_codecs/audio_encoder.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
 #include "api/media_transport_interface.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "rtc_base/function_view.h"
diff --git a/audio/null_audio_poller.cc b/audio/null_audio_poller.cc
index d2b1199..063a367 100644
--- a/audio/null_audio_poller.cc
+++ b/audio/null_audio_poller.cc
@@ -15,7 +15,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 namespace internal {
diff --git a/audio/null_audio_poller.h b/audio/null_audio_poller.h
index f91eb7d..9a81426 100644
--- a/audio/null_audio_poller.h
+++ b/audio/null_audio_poller.h
@@ -14,8 +14,8 @@
 #include <stdint.h>
 
 #include "modules/audio_device/include/audio_device_defines.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_checker.h"
 
 namespace webrtc {
diff --git a/audio/test/audio_bwe_integration_test.cc b/audio/test/audio_bwe_integration_test.cc
index 9fa95b1..74eaef0 100644
--- a/audio/test/audio_bwe_integration_test.cc
+++ b/audio/test/audio_bwe_integration_test.cc
@@ -17,7 +17,7 @@
 #include "system_wrappers/include/sleep.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/audio/test/low_bandwidth_audio_test.cc b/audio/test/low_bandwidth_audio_test.cc
index 857f983..54191e8 100644
--- a/audio/test/low_bandwidth_audio_test.cc
+++ b/audio/test/low_bandwidth_audio_test.cc
@@ -12,7 +12,7 @@
 #include "audio/test/audio_end_to_end_test.h"
 #include "rtc_base/flags.h"
 #include "system_wrappers/include/sleep.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 WEBRTC_DEFINE_int(sample_rate_hz,
                   16000,
diff --git a/audio/test/media_transport_test.cc b/audio/test/media_transport_test.cc
index ba24e46..3fd451b 100644
--- a/audio/test/media_transport_test.cc
+++ b/audio/test/media_transport_test.cc
@@ -24,7 +24,7 @@
 #include "modules/audio_processing/include/mock_audio_processing.h"
 #include "modules/utility/include/process_thread.h"
 #include "rtc_base/task_queue.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 #include "test/mock_transport.h"
 
diff --git a/call/BUILD.gn b/call/BUILD.gn
index d457052..6db37a4 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -191,8 +191,8 @@
 rtc_static_library("call") {
   sources = [
     "call.cc",
-    "callfactory.cc",
-    "callfactory.h",
+    "call_factory.cc",
+    "call_factory.h",
     "degraded_call.cc",
     "degraded_call.h",
     "flexfec_receive_stream_impl.cc",
diff --git a/call/audio_receive_stream.h b/call/audio_receive_stream.h
index 476ddab..e850954 100644
--- a/call/audio_receive_stream.h
+++ b/call/audio_receive_stream.h
@@ -19,10 +19,10 @@
 #include "absl/types/optional.h"
 #include "api/audio_codecs/audio_decoder_factory.h"
 #include "api/call/transport.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
 #include "api/media_transport_interface.h"
-#include "api/rtpparameters.h"
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_receiver_interface.h"
 #include "call/rtp_config.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
diff --git a/call/audio_send_stream.cc b/call/audio_send_stream.cc
index 303b49c..0a3555b 100644
--- a/call/audio_send_stream.cc
+++ b/call/audio_send_stream.cc
@@ -12,7 +12,7 @@
 
 #include <stddef.h>
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/strings/audio_format_to_string.h"
 #include "rtc_base/strings/string_builder.h"
 
diff --git a/call/audio_send_stream.h b/call/audio_send_stream.h
index f34a51d..044ec99 100644
--- a/call/audio_send_stream.h
+++ b/call/audio_send_stream.h
@@ -21,10 +21,10 @@
 #include "api/audio_codecs/audio_encoder_factory.h"
 #include "api/audio_codecs/audio_format.h"
 #include "api/call/transport.h"
-#include "api/crypto/cryptooptions.h"
-#include "api/crypto/frameencryptorinterface.h"
+#include "api/crypto/crypto_options.h"
+#include "api/crypto/frame_encryptor_interface.h"
 #include "api/media_transport_interface.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "call/rtp_config.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
 #include "rtc_base/scoped_ref_ptr.h"
diff --git a/call/audio_state.h b/call/audio_state.h
index 104f493..1332c05 100644
--- a/call/audio_state.h
+++ b/call/audio_state.h
@@ -13,7 +13,7 @@
 #include "api/audio/audio_mixer.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/call/bitrate_allocator.h b/call/bitrate_allocator.h
index 56d8bd5..0259da7 100644
--- a/call/bitrate_allocator.h
+++ b/call/bitrate_allocator.h
@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "api/call/bitrate_allocation.h"
-#include "rtc_base/bitrateallocationstrategy.h"
+#include "rtc_base/bitrate_allocation_strategy.h"
 #include "rtc_base/sequenced_task_checker.h"
 
 namespace webrtc {
diff --git a/call/call.cc b/call/call.cc
index 3ffea84..a57a41c 100644
--- a/call/call.cc
+++ b/call/call.cc
@@ -45,7 +45,7 @@
 #include "modules/utility/include/process_thread.h"
 #include "modules/video_coding/fec_controller_default.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_minmax.h"
@@ -54,7 +54,7 @@
 #include "rtc_base/synchronization/rw_lock_wrapper.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/clock.h"
 #include "system_wrappers/include/cpu_info.h"
diff --git a/call/call.h b/call/call.h
index c0e31c0..ab834f3 100644
--- a/call/call.h
+++ b/call/call.h
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "api/mediatypes.h"
+#include "api/media_types.h"
 #include "call/audio_receive_stream.h"
 #include "call/audio_send_stream.h"
 #include "call/call_config.h"
@@ -24,10 +24,10 @@
 #include "call/rtp_transport_controller_send_interface.h"
 #include "call/video_receive_stream.h"
 #include "call/video_send_stream.h"
-#include "rtc_base/bitrateallocationstrategy.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/bitrate_allocation_strategy.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/network/sent_packet.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/network_route.h"
 
 namespace webrtc {
 
diff --git a/call/call_config.h b/call/call_config.h
index 5834175..67ccd51 100644
--- a/call/call_config.h
+++ b/call/call_config.h
@@ -12,7 +12,7 @@
 
 #include "api/bitrate_constraints.h"
 #include "api/fec_controller.h"
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
 #include "api/transport/network_control.h"
 #include "call/audio_state.h"
 
diff --git a/call/call_factory.cc b/call/call_factory.cc
index 4c46a40..309063d 100644
--- a/call/call_factory.cc
+++ b/call/call_factory.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "call/callfactory.h"
+#include "call/call_factory.h"
 
 #include <stdio.h>
 #include <memory>
diff --git a/call/call_factory.h b/call/call_factory.h
index 448ffdc..f0d695c 100644
--- a/call/call_factory.h
+++ b/call/call_factory.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef CALL_CALLFACTORY_H_
-#define CALL_CALLFACTORY_H_
+#ifndef CALL_CALL_FACTORY_H_
+#define CALL_CALL_FACTORY_H_
 
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
 #include "call/call.h"
 #include "call/call_config.h"
 
@@ -25,4 +25,4 @@
 
 }  // namespace webrtc
 
-#endif  // CALL_CALLFACTORY_H_
+#endif  // CALL_CALL_FACTORY_H_
diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc
index 72aa78c..c584bff 100644
--- a/call/call_perf_tests.cc
+++ b/call/call_perf_tests.cc
@@ -27,7 +27,7 @@
 #include "modules/audio_device/include/test_audio_device.h"
 #include "modules/audio_mixer/audio_mixer_impl.h"
 #include "modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "rtc_base/bitrateallocationstrategy.h"
+#include "rtc_base/bitrate_allocation_strategy.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/metrics.h"
@@ -43,7 +43,7 @@
 #include "test/null_transport.h"
 #include "test/rtp_rtcp_observer.h"
 #include "test/single_threaded_task_queue.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "test/testsupport/perf_test.h"
 #include "test/video_encoder_proxy_factory.h"
 #include "video/transport_adapter.h"
diff --git a/call/degraded_call.h b/call/degraded_call.h
index a5db264..8f062c3 100644
--- a/call/degraded_call.h
+++ b/call/degraded_call.h
@@ -18,7 +18,7 @@
 #include "absl/types/optional.h"
 #include "api/call/transport.h"
 #include "api/fec_controller.h"
-#include "api/mediatypes.h"
+#include "api/media_types.h"
 #include "api/rtp_headers.h"
 #include "api/test/simulated_network.h"
 #include "api/video_codecs/video_encoder_config.h"
@@ -33,8 +33,8 @@
 #include "call/video_receive_stream.h"
 #include "call/video_send_stream.h"
 #include "modules/utility/include/process_thread.h"
-#include "rtc_base/bitrateallocationstrategy.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/bitrate_allocation_strategy.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/network/sent_packet.h"
 #include "system_wrappers/include/clock.h"
 
diff --git a/call/fake_network_pipe.cc b/call/fake_network_pipe.cc
index 7c3c3d2..b5c0cb5 100644
--- a/call/fake_network_pipe.cc
+++ b/call/fake_network_pipe.cc
@@ -14,7 +14,7 @@
 #include <utility>
 #include <vector>
 
-#include "api/mediatypes.h"
+#include "api/media_types.h"
 #include "call/fake_network_pipe.h"
 #include "modules/utility/include/process_thread.h"
 #include "rtc_base/checks.h"
diff --git a/call/fake_network_pipe.h b/call/fake_network_pipe.h
index 34e1b50..2c41dbf 100644
--- a/call/fake_network_pipe.h
+++ b/call/fake_network_pipe.h
@@ -23,8 +23,8 @@
 #include "api/test/simulated_network.h"
 #include "call/call.h"
 #include "call/simulated_packet_receiver.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/call/flexfec_receive_stream.h b/call/flexfec_receive_stream.h
index 949ad74..77c9932 100644
--- a/call/flexfec_receive_stream.h
+++ b/call/flexfec_receive_stream.h
@@ -17,7 +17,7 @@
 
 #include "api/call/transport.h"
 #include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "call/rtp_packet_sink_interface.h"
 
 namespace webrtc {
diff --git a/call/flexfec_receive_stream_impl.cc b/call/flexfec_receive_stream_impl.cc
index 3b33be6..8154715 100644
--- a/call/flexfec_receive_stream_impl.cc
+++ b/call/flexfec_receive_stream_impl.cc
@@ -17,7 +17,7 @@
 
 #include "api/array_view.h"
 #include "api/call/transport.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "call/rtp_stream_receiver_controller_interface.h"
 #include "modules/rtp_rtcp/include/flexfec_receiver.h"
 #include "modules/rtp_rtcp/include/receive_statistics.h"
diff --git a/call/flexfec_receive_stream_unittest.cc b/call/flexfec_receive_stream_unittest.cc
index d73a804..a1bacf9 100644
--- a/call/flexfec_receive_stream_unittest.cc
+++ b/call/flexfec_receive_stream_unittest.cc
@@ -16,7 +16,7 @@
 #include "api/array_view.h"
 #include "api/call/transport.h"
 #include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "call/flexfec_receive_stream.h"
 #include "call/flexfec_receive_stream_impl.h"
 #include "call/rtp_stream_receiver_controller.h"
diff --git a/call/packet_receiver.h b/call/packet_receiver.h
index 02a0155..df57d8f 100644
--- a/call/packet_receiver.h
+++ b/call/packet_receiver.h
@@ -15,8 +15,8 @@
 #include <string>
 #include <vector>
 
-#include "api/mediatypes.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "api/media_types.h"
+#include "rtc_base/copy_on_write_buffer.h"
 
 namespace webrtc {
 
diff --git a/call/rampup_tests.cc b/call/rampup_tests.cc
index f629dbe..91788b0 100644
--- a/call/rampup_tests.cc
+++ b/call/rampup_tests.cc
@@ -17,7 +17,7 @@
 #include "rtc_base/flags.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "test/encoder_settings.h"
 #include "test/gtest.h"
 #include "test/testsupport/perf_test.h"
diff --git a/call/receive_time_calculator_unittest.cc b/call/receive_time_calculator_unittest.cc
index 3de759c..4349ee4 100644
--- a/call/receive_time_calculator_unittest.cc
+++ b/call/receive_time_calculator_unittest.cc
@@ -18,7 +18,7 @@
 
 #include "absl/types/optional.h"
 #include "rtc_base/random.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/call/rtp_bitrate_configurator.h b/call/rtp_bitrate_configurator.h
index 1981292..a16dda8 100644
--- a/call/rtp_bitrate_configurator.h
+++ b/call/rtp_bitrate_configurator.h
@@ -14,7 +14,7 @@
 #include "absl/types/optional.h"
 #include "api/bitrate_constraints.h"
 #include "api/transport/bitrate_settings.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/call/rtp_config.h b/call/rtp_config.h
index 06a89f2..b6155c0 100644
--- a/call/rtp_config.h
+++ b/call/rtp_config.h
@@ -17,7 +17,7 @@
 #include <vector>
 
 #include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 
 namespace webrtc {
 // Currently only VP8/VP9 specific.
diff --git a/call/rtp_payload_params.cc b/call/rtp_payload_params.cc
index 95c64b4..a0f123c 100644
--- a/call/rtp_payload_params.cc
+++ b/call/rtp_payload_params.cc
@@ -25,7 +25,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/random.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
diff --git a/call/rtp_stream_receiver_controller.h b/call/rtp_stream_receiver_controller.h
index c523e3f..045af3c 100644
--- a/call/rtp_stream_receiver_controller.h
+++ b/call/rtp_stream_receiver_controller.h
@@ -14,7 +14,7 @@
 
 #include "call/rtp_demuxer.h"
 #include "call/rtp_stream_receiver_controller_interface.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
diff --git a/call/rtp_transport_controller_send.h b/call/rtp_transport_controller_send.h
index 5b14a73..2581a77 100644
--- a/call/rtp_transport_controller_send.h
+++ b/call/rtp_transport_controller_send.h
@@ -25,8 +25,8 @@
 #include "modules/congestion_controller/rtp/transport_feedback_adapter.h"
 #include "modules/pacing/packet_router.h"
 #include "modules/utility/include/process_thread.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/network_route.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/task_queue.h"
 
diff --git a/call/rtp_transport_controller_send_interface.h b/call/rtp_transport_controller_send_interface.h
index 19c1dad..ef6fad2 100644
--- a/call/rtp_transport_controller_send_interface.h
+++ b/call/rtp_transport_controller_send_interface.h
@@ -20,7 +20,7 @@
 
 #include "absl/types/optional.h"
 #include "api/bitrate_constraints.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
 #include "api/fec_controller.h"
 #include "api/transport/bitrate_settings.h"
 #include "call/rtp_config.h"
diff --git a/call/rtp_video_sender.h b/call/rtp_video_sender.h
index d72ef0d..f5ef77e 100644
--- a/call/rtp_video_sender.h
+++ b/call/rtp_video_sender.h
@@ -27,8 +27,8 @@
 #include "modules/rtp_rtcp/include/flexfec_sender.h"
 #include "modules/rtp_rtcp/source/rtp_video_header.h"
 #include "modules/utility/include/process_thread.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/rate_limiter.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
diff --git a/call/simulated_network.h b/call/simulated_network.h
index 7d9d15b..0336bfc 100644
--- a/call/simulated_network.h
+++ b/call/simulated_network.h
@@ -17,7 +17,7 @@
 
 #include "absl/types/optional.h"
 #include "api/test/simulated_network.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/random.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/call/test/mock_rtp_transport_controller_send.h b/call/test/mock_rtp_transport_controller_send.h
index c236041..18bb117 100644
--- a/call/test/mock_rtp_transport_controller_send.h
+++ b/call/test/mock_rtp_transport_controller_send.h
@@ -17,13 +17,13 @@
 #include <vector>
 
 #include "api/bitrate_constraints.h"
-#include "api/crypto/cryptooptions.h"
-#include "api/crypto/frameencryptorinterface.h"
+#include "api/crypto/crypto_options.h"
+#include "api/crypto/frame_encryptor_interface.h"
 #include "call/rtp_transport_controller_send_interface.h"
 #include "modules/congestion_controller/include/network_changed_observer.h"
 #include "modules/pacing/packet_router.h"
 #include "rtc_base/network/sent_packet.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/network_route.h"
 #include "rtc_base/rate_limiter.h"
 #include "test/gmock.h"
 
diff --git a/call/video_receive_stream.h b/call/video_receive_stream.h
index 27f6e95..b469553 100644
--- a/call/video_receive_stream.h
+++ b/call/video_receive_stream.h
@@ -17,11 +17,11 @@
 #include <vector>
 
 #include "api/call/transport.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
 #include "api/media_transport_interface.h"
 #include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
-#include "api/rtpreceiverinterface.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_timing.h"
diff --git a/call/video_send_stream.cc b/call/video_send_stream.cc
index ebd37a7..8d3f62c 100644
--- a/call/video_send_stream.cc
+++ b/call/video_send_stream.cc
@@ -12,7 +12,7 @@
 
 #include <utility>
 
-#include "api/crypto/frameencryptorinterface.h"
+#include "api/crypto/frame_encryptor_interface.h"
 #include "rtc_base/strings/string_builder.h"
 
 namespace webrtc {
diff --git a/call/video_send_stream.h b/call/video_send_stream.h
index 8ee2991..5daec19 100644
--- a/call/video_send_stream.h
+++ b/call/video_send_stream.h
@@ -18,9 +18,9 @@
 
 #include "absl/types/optional.h"
 #include "api/call/transport.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
 #include "api/media_transport_interface.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "api/video/video_content_type.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_sink_interface.h"
diff --git a/common_audio/audio_converter.h b/common_audio/audio_converter.h
index 24a5e72..73ad1ef 100644
--- a/common_audio/audio_converter.h
+++ b/common_audio/audio_converter.h
@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <memory>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/common_audio/resampler/push_sinc_resampler.h b/common_audio/resampler/push_sinc_resampler.h
index db9cdc1..b002ff7 100644
--- a/common_audio/resampler/push_sinc_resampler.h
+++ b/common_audio/resampler/push_sinc_resampler.h
@@ -16,7 +16,7 @@
 #include <memory>
 
 #include "common_audio/resampler/sinc_resampler.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/common_audio/resampler/push_sinc_resampler_unittest.cc b/common_audio/resampler/push_sinc_resampler_unittest.cc
index 2f53a74..6d15a40 100644
--- a/common_audio/resampler/push_sinc_resampler_unittest.cc
+++ b/common_audio/resampler/push_sinc_resampler_unittest.cc
@@ -16,7 +16,7 @@
 #include "common_audio/include/audio_util.h"
 #include "common_audio/resampler/push_sinc_resampler.h"
 #include "common_audio/resampler/sinusoidal_linear_chirp_source.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 
diff --git a/common_audio/resampler/sinc_resampler.h b/common_audio/resampler/sinc_resampler.h
index 0be4318..ffd70d9 100644
--- a/common_audio/resampler/sinc_resampler.h
+++ b/common_audio/resampler/sinc_resampler.h
@@ -17,7 +17,7 @@
 #include <stddef.h>
 #include <memory>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/gtest_prod_util.h"
 #include "rtc_base/memory/aligned_malloc.h"
 #include "rtc_base/system/arch.h"
diff --git a/common_audio/resampler/sinc_resampler_unittest.cc b/common_audio/resampler/sinc_resampler_unittest.cc
index eb5424d..3e0b84b 100644
--- a/common_audio/resampler/sinc_resampler_unittest.cc
+++ b/common_audio/resampler/sinc_resampler_unittest.cc
@@ -24,7 +24,7 @@
 #include "common_audio/resampler/sinusoidal_linear_chirp_source.h"
 #include "rtc_base/stringize_macros.h"
 #include "rtc_base/system/arch.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/cpu_features_wrapper.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/common_audio/resampler/sinusoidal_linear_chirp_source.h b/common_audio/resampler/sinusoidal_linear_chirp_source.h
index 71dcff5..81f6a24 100644
--- a/common_audio/resampler/sinusoidal_linear_chirp_source.h
+++ b/common_audio/resampler/sinusoidal_linear_chirp_source.h
@@ -15,7 +15,7 @@
 #define COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_
 
 #include "common_audio/resampler/sinc_resampler.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/common_audio/smoothing_filter.cc b/common_audio/smoothing_filter.cc
index 0d5aaa4..e5ce987 100644
--- a/common_audio/smoothing_filter.cc
+++ b/common_audio/smoothing_filter.cc
@@ -13,7 +13,7 @@
 #include <cmath>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/common_audio/smoothing_filter.h b/common_audio/smoothing_filter.h
index c467d85..e5f561e 100644
--- a/common_audio/smoothing_filter.h
+++ b/common_audio/smoothing_filter.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 
 #include "absl/types/optional.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/common_audio/smoothing_filter_unittest.cc b/common_audio/smoothing_filter_unittest.cc
index abe4272..5f6711e 100644
--- a/common_audio/smoothing_filter_unittest.cc
+++ b/common_audio/smoothing_filter_unittest.cc
@@ -12,7 +12,7 @@
 #include <memory>
 
 #include "common_audio/smoothing_filter.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/common_audio/sparse_fir_filter.h b/common_audio/sparse_fir_filter.h
index 22bcdff..5197a8e 100644
--- a/common_audio/sparse_fir_filter.h
+++ b/common_audio/sparse_fir_filter.h
@@ -14,7 +14,7 @@
 #include <cstring>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/common_audio/wav_file.h b/common_audio/wav_file.h
index cbce59d..7e790e0 100644
--- a/common_audio/wav_file.h
+++ b/common_audio/wav_file.h
@@ -17,7 +17,7 @@
 #include <cstddef>
 #include <string>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/platform_file.h"
 
 namespace webrtc {
diff --git a/common_audio/wav_file_unittest.cc b/common_audio/wav_file_unittest.cc
index d40229a..b7e5d3f 100644
--- a/common_audio/wav_file_unittest.cc
+++ b/common_audio/wav_file_unittest.cc
@@ -17,7 +17,7 @@
 #include "common_audio/wav_file.h"
 #include "common_audio/wav_header.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 // WavWriterTest.CPPFileDescriptor and WavWriterTest.CPP flaky on Mac.
 // See webrtc:9247.
diff --git a/common_audio/window_generator.h b/common_audio/window_generator.h
index ad3b445..0cbe24a 100644
--- a/common_audio/window_generator.h
+++ b/common_audio/window_generator.h
@@ -13,7 +13,7 @@
 
 #include <stddef.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/common_video/bitrate_adjuster.cc b/common_video/bitrate_adjuster.cc
index ac21f2b..e2d3b3d 100644
--- a/common_video/bitrate_adjuster.cc
+++ b/common_video/bitrate_adjuster.cc
@@ -14,7 +14,7 @@
 #include <cmath>
 
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/common_video/bitrate_adjuster_unittest.cc b/common_video/bitrate_adjuster_unittest.cc
index cd0660d..eae15cd 100644
--- a/common_video/bitrate_adjuster_unittest.cc
+++ b/common_video/bitrate_adjuster_unittest.cc
@@ -11,7 +11,7 @@
 #include "common_video/include/bitrate_adjuster.h"
 
 #include "api/units/time_delta.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/common_video/h264/h264_bitstream_parser.cc b/common_video/h264/h264_bitstream_parser.cc
index f3d2f8a..e71d1ca 100644
--- a/common_video/h264/h264_bitstream_parser.cc
+++ b/common_video/h264/h264_bitstream_parser.cc
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "common_video/h264/h264_common.h"
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 #include "rtc_base/logging.h"
 
 namespace {
diff --git a/common_video/h264/pps_parser.cc b/common_video/h264/pps_parser.cc
index 464f608..ae01652 100644
--- a/common_video/h264/pps_parser.cc
+++ b/common_video/h264/pps_parser.cc
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "common_video/h264/h264_common.h"
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 #include "rtc_base/checks.h"
 
 #define RETURN_EMPTY_ON_FAIL(x) \
diff --git a/common_video/h264/pps_parser_unittest.cc b/common_video/h264/pps_parser_unittest.cc
index 68fe5e9..a279563 100644
--- a/common_video/h264/pps_parser_unittest.cc
+++ b/common_video/h264/pps_parser_unittest.cc
@@ -11,7 +11,7 @@
 #include "common_video/h264/pps_parser.h"
 
 #include "common_video/h264/h264_common.h"
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
 #include "test/gtest.h"
diff --git a/common_video/h264/sps_parser.cc b/common_video/h264/sps_parser.cc
index c6f6d47..3d78184 100644
--- a/common_video/h264/sps_parser.cc
+++ b/common_video/h264/sps_parser.cc
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "common_video/h264/h264_common.h"
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 
 namespace {
 typedef absl::optional<webrtc::SpsParser::SpsState> OptionalSps;
diff --git a/common_video/h264/sps_parser_unittest.cc b/common_video/h264/sps_parser_unittest.cc
index 94c9a0c..73157ff 100644
--- a/common_video/h264/sps_parser_unittest.cc
+++ b/common_video/h264/sps_parser_unittest.cc
@@ -12,7 +12,7 @@
 
 #include "common_video/h264/h264_common.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 #include "rtc_base/buffer.h"
 #include "test/gtest.h"
 
diff --git a/common_video/h264/sps_vui_rewriter.cc b/common_video/h264/sps_vui_rewriter.cc
index 3eab11f..946604d 100644
--- a/common_video/h264/sps_vui_rewriter.cc
+++ b/common_video/h264/sps_vui_rewriter.cc
@@ -17,7 +17,7 @@
 
 #include "common_video/h264/h264_common.h"
 #include "common_video/h264/sps_parser.h"
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_minmax.h"
diff --git a/common_video/h264/sps_vui_rewriter_unittest.cc b/common_video/h264/sps_vui_rewriter_unittest.cc
index 432606d..7061dc0 100644
--- a/common_video/h264/sps_vui_rewriter_unittest.cc
+++ b/common_video/h264/sps_vui_rewriter_unittest.cc
@@ -13,7 +13,7 @@
 
 #include "common_video/h264/h264_common.h"
 #include "common_video/h264/sps_vui_rewriter.h"
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/logging.h"
 #include "test/gtest.h"
diff --git a/common_video/include/bitrate_adjuster.h b/common_video/include/bitrate_adjuster.h
index bc2c6bb..8ede3f9 100644
--- a/common_video/include/bitrate_adjuster.h
+++ b/common_video/include/bitrate_adjuster.h
@@ -15,7 +15,7 @@
 #include <stdint.h>
 
 #include "absl/types/optional.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/rate_statistics.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/common_video/include/i420_buffer_pool.h b/common_video/include/i420_buffer_pool.h
index 2dcee19..8b0f08c 100644
--- a/common_video/include/i420_buffer_pool.h
+++ b/common_video/include/i420_buffer_pool.h
@@ -16,7 +16,7 @@
 
 #include "api/video/i420_buffer.h"
 #include "rtc_base/race_checker.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/common_video/include/video_frame_buffer.h b/common_video/include/video_frame_buffer.h
index f813851..f35f107 100644
--- a/common_video/include/video_frame_buffer.h
+++ b/common_video/include/video_frame_buffer.h
@@ -15,7 +15,7 @@
 
 #include "api/video/video_frame_buffer.h"
 #include "rtc_base/callback.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/common_video/libyuv/libyuv_unittest.cc b/common_video/libyuv/libyuv_unittest.cc
index 9f2c241..0ea4775 100644
--- a/common_video/libyuv/libyuv_unittest.cc
+++ b/common_video/libyuv/libyuv_unittest.cc
@@ -20,7 +20,7 @@
 #include "test/frame_utils.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "third_party/libyuv/include/libyuv.h"
 
 namespace webrtc {
diff --git a/common_video/video_frame_buffer.cc b/common_video/video_frame_buffer.cc
index 1253d36..823c5ad 100644
--- a/common_video/video_frame_buffer.cc
+++ b/common_video/video_frame_buffer.cc
@@ -11,7 +11,7 @@
 
 #include "api/video/i420_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
 
 namespace webrtc {
diff --git a/common_video/video_frame_unittest.cc b/common_video/video_frame_unittest.cc
index 6a2c452..d65dd48 100644
--- a/common_video/video_frame_unittest.cc
+++ b/common_video/video_frame_unittest.cc
@@ -15,7 +15,7 @@
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame.h"
 #include "rtc_base/bind.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/fake_texture_frame.h"
 #include "test/frame_utils.h"
 #include "test/gtest.h"
diff --git a/common_video/video_render_frames.cc b/common_video/video_render_frames.cc
index 8152625..5ef51f2 100644
--- a/common_video/video_render_frames.cc
+++ b/common_video/video_render_frames.cc
@@ -15,7 +15,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace webrtc {
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index ace85fe..5fd3041 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -492,8 +492,8 @@
         "objcnativeapi/objc/NADAppDelegate.m",
         "objcnativeapi/objc/NADViewController.h",
         "objcnativeapi/objc/NADViewController.mm",
-        "objcnativeapi/objc/objccallclient.h",
-        "objcnativeapi/objc/objccallclient.mm",
+        "objcnativeapi/objc/objc_call_client.h",
+        "objcnativeapi/objc/objc_call_client.mm",
       ]
 
       if (!build_with_chromium && is_clang) {
@@ -706,7 +706,7 @@
     ]
     if (is_win) {
       sources += [
-        "peerconnection/client/flagdefs.h",
+        "peerconnection/client/flag_defs.h",
         "peerconnection/client/main.cc",
         "peerconnection/client/main_wnd.cc",
         "peerconnection/client/main_wnd.h",
@@ -842,8 +842,8 @@
 
     if (is_android) {
       sources += [
-        "unityplugin/classreferenceholder.cc",
-        "unityplugin/classreferenceholder.h",
+        "unityplugin/class_reference_holder.cc",
+        "unityplugin/class_reference_holder.h",
         "unityplugin/jni_onload.cc",
       ]
       suppressed_configs += [ "//build/config/android:hide_all_but_jni_onload" ]
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
index 6fdd36c..2d0438b 100644
--- a/examples/androidnativeapi/BUILD.gn
+++ b/examples/androidnativeapi/BUILD.gn
@@ -37,8 +37,8 @@
   rtc_shared_library("examples_androidnativeapi_jni") {
     testonly = true
     sources = [
-      "jni/androidcallclient.cc",
-      "jni/androidcallclient.h",
+      "jni/android_call_client.cc",
+      "jni/android_call_client.h",
       "jni/onload.cc",
     ]
 
diff --git a/examples/androidnativeapi/jni/android_call_client.cc b/examples/androidnativeapi/jni/android_call_client.cc
index e0dc8cc..119444b5 100644
--- a/examples/androidnativeapi/jni/android_call_client.cc
+++ b/examples/androidnativeapi/jni/android_call_client.cc
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "examples/androidnativeapi/jni/androidcallclient.h"
+#include "examples/androidnativeapi/jni/android_call_client.h"
 
 #include <utility>
 
 #include "absl/memory/memory.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "api/video/builtin_video_bitrate_allocator_factory.h"
 #include "examples/androidnativeapi/generated_jni/jni/CallClient_jni.h"
 #include "logging/rtc_event_log/rtc_event_log_factory.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
+#include "media/engine/webrtc_media_engine.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/native_api/video/wrapper.h"
diff --git a/examples/androidnativeapi/jni/android_call_client.h b/examples/androidnativeapi/jni/android_call_client.h
index d456e9c..5ab61f4 100644
--- a/examples/androidnativeapi/jni/android_call_client.h
+++ b/examples/androidnativeapi/jni/android_call_client.h
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_
-#define EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_
+#ifndef EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_
+#define EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_
 
 #include <jni.h>
 
 #include <memory>
 #include <string>
 
-#include "api/peerconnectioninterface.h"
-#include "rtc_base/criticalsection.h"
+#include "api/peer_connection_interface.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_checker.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
-#include "sdk/android/native_api/video/videosource.h"
+#include "sdk/android/native_api/video/video_source.h"
 
 namespace webrtc_examples {
 
@@ -76,4 +76,4 @@
 
 }  // namespace webrtc_examples
 
-#endif  // EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROIDCALLCLIENT_H_
+#endif  // EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_
diff --git a/examples/androidnativeapi/jni/onload.cc b/examples/androidnativeapi/jni/onload.cc
index 4b4b5d9..6ea5275 100644
--- a/examples/androidnativeapi/jni/onload.cc
+++ b/examples/androidnativeapi/jni/onload.cc
@@ -11,7 +11,7 @@
 #include <jni.h>
 
 #include "modules/utility/include/jvm_android.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
 #include "sdk/android/native_api/base/init.h"
 
 namespace webrtc_examples {
diff --git a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
index 0fc0113..c58a731 100644
--- a/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
+++ b/examples/objc/AppRTCMobile/tests/ARDAppClient_xctest.mm
@@ -13,7 +13,7 @@
 #import <QuartzCore/CoreAnimation.h>
 #import <XCTest/XCTest.h>
 
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
 
 #import <WebRTC/RTCMediaConstraints.h>
 #import <WebRTC/RTCPeerConnectionFactory.h>
diff --git a/examples/objcnativeapi/objc/NADViewController.mm b/examples/objcnativeapi/objc/NADViewController.mm
index f905600..d96f649 100644
--- a/examples/objcnativeapi/objc/NADViewController.mm
+++ b/examples/objcnativeapi/objc/NADViewController.mm
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "examples/objcnativeapi/objc/objccallclient.h"
+#include "examples/objcnativeapi/objc/objc_call_client.h"
 
 @interface NADViewController ()
 
diff --git a/examples/objcnativeapi/objc/objc_call_client.h b/examples/objcnativeapi/objc/objc_call_client.h
index e48aae4..43a48c5 100644
--- a/examples/objcnativeapi/objc/objc_call_client.h
+++ b/examples/objcnativeapi/objc/objc_call_client.h
@@ -14,8 +14,8 @@
 #include <memory>
 #include <string>
 
-#include "api/peerconnectioninterface.h"
-#include "rtc_base/criticalsection.h"
+#include "api/peer_connection_interface.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_checker.h"
 
diff --git a/examples/objcnativeapi/objc/objc_call_client.mm b/examples/objcnativeapi/objc/objc_call_client.mm
index 54015b2..a30f7f6 100644
--- a/examples/objcnativeapi/objc/objc_call_client.mm
+++ b/examples/objcnativeapi/objc/objc_call_client.mm
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "examples/objcnativeapi/objc/objccallclient.h"
+#include "examples/objcnativeapi/objc/objc_call_client.h"
 
 #include <utility>
 
@@ -20,10 +20,10 @@
 #include "absl/memory/memory.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "api/video/builtin_video_bitrate_allocator_factory.h"
 #include "logging/rtc_event_log/rtc_event_log_factory.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtc_media_engine.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "sdk/objc/native/api/video_capturer.h"
 #include "sdk/objc/native/api/video_decoder_factory.h"
diff --git a/examples/peerconnection/client/conductor.cc b/examples/peerconnection/client/conductor.cc
index 096ff58..03f820a 100644
--- a/examples/peerconnection/client/conductor.cc
+++ b/examples/peerconnection/client/conductor.cc
@@ -25,7 +25,7 @@
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/audio_options.h"
 #include "api/create_peerconnection_factory.h"
-#include "api/rtpsenderinterface.h"
+#include "api/rtp_sender_interface.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
 #include "api/video_codecs/video_decoder_factory.h"
@@ -36,12 +36,12 @@
 #include "modules/audio_processing/include/audio_processing.h"
 #include "modules/video_capture/video_capture.h"
 #include "modules/video_capture/video_capture_factory.h"
-#include "p2p/base/portallocator.h"
-#include "pc/videotracksource.h"
+#include "p2p/base/port_allocator.h"
+#include "pc/video_track_source.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
 #include "rtc_base/strings/json.h"
 #include "test/vcm_capturer.h"
 
diff --git a/examples/peerconnection/client/conductor.h b/examples/peerconnection/client/conductor.h
index 76c1dbe..58286b0 100644
--- a/examples/peerconnection/client/conductor.h
+++ b/examples/peerconnection/client/conductor.h
@@ -17,8 +17,8 @@
 #include <string>
 #include <vector>
 
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
 #include "examples/peerconnection/client/main_wnd.h"
 #include "examples/peerconnection/client/peer_connection_client.h"
 
diff --git a/examples/peerconnection/client/flag_defs.h b/examples/peerconnection/client/flag_defs.h
index 51f9c9a..6834de6 100644
--- a/examples/peerconnection/client/flag_defs.h
+++ b/examples/peerconnection/client/flag_defs.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
-#define EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
+#ifndef EXAMPLES_PEERCONNECTION_CLIENT_FLAG_DEFS_H_
+#define EXAMPLES_PEERCONNECTION_CLIENT_FLAG_DEFS_H_
 
 #include "rtc_base/flags.h"
 
@@ -44,4 +44,4 @@
     "will assign the group Enabled to field trial WebRTC-FooFeature. Multiple "
     "trials are separated by \"/\"");
 
-#endif  // EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
+#endif  // EXAMPLES_PEERCONNECTION_CLIENT_FLAG_DEFS_H_
diff --git a/examples/peerconnection/client/linux/main.cc b/examples/peerconnection/client/linux/main.cc
index b3978cf..74fc17a 100644
--- a/examples/peerconnection/client/linux/main.cc
+++ b/examples/peerconnection/client/linux/main.cc
@@ -13,15 +13,15 @@
 #include <stdio.h>
 
 #include "examples/peerconnection/client/conductor.h"
-#include "examples/peerconnection/client/flagdefs.h"
+#include "examples/peerconnection/client/flag_defs.h"
 #include "examples/peerconnection/client/linux/main_wnd.h"
 #include "examples/peerconnection/client/peer_connection_client.h"
 #include "rtc_base/flags.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
 #include "rtc_base/thread.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/field_trial.h"
diff --git a/examples/peerconnection/client/linux/main_wnd.h b/examples/peerconnection/client/linux/main_wnd.h
index b94d034..a30ec27 100644
--- a/examples/peerconnection/client/linux/main_wnd.h
+++ b/examples/peerconnection/client/linux/main_wnd.h
@@ -15,7 +15,7 @@
 #include <memory>
 #include <string>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_sink_interface.h"
 #include "examples/peerconnection/client/main_wnd.h"
diff --git a/examples/peerconnection/client/main.cc b/examples/peerconnection/client/main.cc
index f92e606..dc6b5d5 100644
--- a/examples/peerconnection/client/main.cc
+++ b/examples/peerconnection/client/main.cc
@@ -9,13 +9,13 @@
  */
 
 #include "examples/peerconnection/client/conductor.h"
-#include "examples/peerconnection/client/flagdefs.h"
+#include "examples/peerconnection/client/flag_defs.h"
 #include "examples/peerconnection/client/main_wnd.h"
 #include "examples/peerconnection/client/peer_connection_client.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/win32socketinit.h"
-#include "rtc_base/win32socketserver.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/win32_socket_init.h"
+#include "rtc_base/win32_socket_server.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/field_trial.h"
 
diff --git a/examples/peerconnection/client/main_wnd.h b/examples/peerconnection/client/main_wnd.h
index 5700258..898fea9 100644
--- a/examples/peerconnection/client/main_wnd.h
+++ b/examples/peerconnection/client/main_wnd.h
@@ -15,11 +15,11 @@
 #include <memory>
 #include <string>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/video/video_frame.h"
 #include "examples/peerconnection/client/peer_connection_client.h"
-#include "media/base/mediachannel.h"
-#include "media/base/videocommon.h"
+#include "media/base/media_channel.h"
+#include "media/base/video_common.h"
 #if defined(WEBRTC_WIN)
 #include "rtc_base/win32.h"
 #endif  // WEBRTC_WIN
diff --git a/examples/peerconnection/client/peer_connection_client.cc b/examples/peerconnection/client/peer_connection_client.cc
index f173e42..3203941 100644
--- a/examples/peerconnection/client/peer_connection_client.cc
+++ b/examples/peerconnection/client/peer_connection_client.cc
@@ -13,10 +13,10 @@
 #include "examples/peerconnection/client/defaults.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
 
 #ifdef WIN32
-#include "rtc_base/win32socketserver.h"
+#include "rtc_base/win32_socket_server.h"
 #endif
 
 namespace {
diff --git a/examples/peerconnection/client/peer_connection_client.h b/examples/peerconnection/client/peer_connection_client.h
index 8dd28f7..56c235a 100644
--- a/examples/peerconnection/client/peer_connection_client.h
+++ b/examples/peerconnection/client/peer_connection_client.h
@@ -15,9 +15,9 @@
 #include <memory>
 #include <string>
 
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/signalthread.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/signal_thread.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 typedef std::map<int, std::string> Peers;
diff --git a/examples/peerconnection/server/peer_channel.cc b/examples/peerconnection/server/peer_channel.cc
index 7710d6a..91f5ff7 100644
--- a/examples/peerconnection/server/peer_channel.cc
+++ b/examples/peerconnection/server/peer_channel.cc
@@ -17,7 +17,7 @@
 
 #include "examples/peerconnection/server/data_socket.h"
 #include "examples/peerconnection/server/utils.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 
 // Set to the peer id of the originator when messages are being
 // exchanged between peers, but set to the id of the receiving peer
diff --git a/examples/peerconnection/server/utils.cc b/examples/peerconnection/server/utils.cc
index dcd1ef7..5e61e60 100644
--- a/examples/peerconnection/server/utils.cc
+++ b/examples/peerconnection/server/utils.cc
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 
 using rtc::ToString;
 
diff --git a/examples/relayserver/relayserver_main.cc b/examples/relayserver/relayserver_main.cc
index 7d7d977..2045cb4 100644
--- a/examples/relayserver/relayserver_main.cc
+++ b/examples/relayserver/relayserver_main.cc
@@ -11,10 +11,10 @@
 #include <iostream>  // NOLINT
 #include <memory>
 
-#include "p2p/base/relayserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketserver.h"
+#include "p2p/base/relay_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/thread.h"
 
 int main(int argc, char** argv) {
diff --git a/examples/stunprober/main.cc b/examples/stunprober/main.cc
index d7ea30b..72f05014 100644
--- a/examples/stunprober/main.cc
+++ b/examples/stunprober/main.cc
@@ -14,16 +14,16 @@
 #include <string>
 #include <vector>
 
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/stunprober/stunprober.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/stunprober/stun_prober.h"
 #include "rtc_base/flags.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/network.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_adapter.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 using stunprober::StunProber;
 using stunprober::AsyncCallback;
diff --git a/examples/stunserver/stunserver_main.cc b/examples/stunserver/stunserver_main.cc
index 741ddec..8180069 100644
--- a/examples/stunserver/stunserver_main.cc
+++ b/examples/stunserver/stunserver_main.cc
@@ -9,10 +9,10 @@
  */
 #include <iostream>
 
-#include "p2p/base/stunserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketserver.h"
+#include "p2p/base/stun_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/thread.h"
 
 using cricket::StunServer;
diff --git a/examples/turnserver/read_auth_file.cc b/examples/turnserver/read_auth_file.cc
index 0ae40cb..3ad5c2b 100644
--- a/examples/turnserver/read_auth_file.cc
+++ b/examples/turnserver/read_auth_file.cc
@@ -12,7 +12,7 @@
 
 #include <stddef.h>
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 
 namespace webrtc_examples {
 
diff --git a/examples/turnserver/turnserver_main.cc b/examples/turnserver/turnserver_main.cc
index 3e3ea9c..5e2a747 100644
--- a/examples/turnserver/turnserver_main.cc
+++ b/examples/turnserver/turnserver_main.cc
@@ -15,13 +15,13 @@
 #include <utility>
 
 #include "examples/turnserver/read_auth_file.h"
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/portinterface.h"
-#include "p2p/base/turnserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketserver.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/turn_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/thread.h"
 
 namespace {
diff --git a/examples/unityplugin/class_reference_holder.cc b/examples/unityplugin/class_reference_holder.cc
index 0ad96c5..00ca772 100644
--- a/examples/unityplugin/class_reference_holder.cc
+++ b/examples/unityplugin/class_reference_holder.cc
@@ -7,7 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "examples/unityplugin/classreferenceholder.h"
+#include "examples/unityplugin/class_reference_holder.h"
 
 #include <utility>
 
diff --git a/examples/unityplugin/class_reference_holder.h b/examples/unityplugin/class_reference_holder.h
index 31d6efc..2b0eba4 100644
--- a/examples/unityplugin/class_reference_holder.h
+++ b/examples/unityplugin/class_reference_holder.h
@@ -13,8 +13,8 @@
 // specific java class into JNI c++ side, so that our c++ code can
 // call those java functions.
 
-#ifndef EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
-#define EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
+#ifndef EXAMPLES_UNITYPLUGIN_CLASS_REFERENCE_HOLDER_H_
+#define EXAMPLES_UNITYPLUGIN_CLASS_REFERENCE_HOLDER_H_
 
 #include <jni.h>
 #include <map>
@@ -34,4 +34,4 @@
 
 }  // namespace unity_plugin
 
-#endif  // EXAMPLES_UNITYPLUGIN_CLASSREFERENCEHOLDER_H_
+#endif  // EXAMPLES_UNITYPLUGIN_CLASS_REFERENCE_HOLDER_H_
diff --git a/examples/unityplugin/jni_onload.cc b/examples/unityplugin/jni_onload.cc
index ebb5bfa..089e9a2 100644
--- a/examples/unityplugin/jni_onload.cc
+++ b/examples/unityplugin/jni_onload.cc
@@ -12,9 +12,9 @@
 #undef JNIEXPORT
 #define JNIEXPORT __attribute__((visibility("default")))
 
-#include "examples/unityplugin/classreferenceholder.h"
-#include "rtc_base/ssladapter.h"
-#include "sdk/android/src/jni/classreferenceholder.h"
+#include "examples/unityplugin/class_reference_holder.h"
+#include "rtc_base/ssl_adapter.h"
+#include "sdk/android/src/jni/class_reference_holder.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
diff --git a/examples/unityplugin/simple_peer_connection.cc b/examples/unityplugin/simple_peer_connection.cc
index e1a2552..0b0a810 100644
--- a/examples/unityplugin/simple_peer_connection.cc
+++ b/examples/unityplugin/simple_peer_connection.cc
@@ -16,22 +16,22 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/create_peerconnection_factory.h"
-#include "api/videosourceproxy.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
-#include "media/engine/multiplexcodecfactory.h"
-#include "media/engine/webrtcvideodecoderfactory.h"
-#include "media/engine/webrtcvideoencoderfactory.h"
+#include "api/video_track_source_proxy.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
+#include "media/engine/multiplex_codec_factory.h"
+#include "media/engine/webrtc_video_decoder_factory.h"
+#include "media/engine/webrtc_video_encoder_factory.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "modules/video_capture/video_capture_factory.h"
-#include "pc/videotracksource.h"
+#include "pc/video_track_source.h"
 #include "test/vcm_capturer.h"
 
 #if defined(WEBRTC_ANDROID)
-#include "examples/unityplugin/classreferenceholder.h"
+#include "examples/unityplugin/class_reference_holder.h"
 #include "modules/utility/include/helpers_android.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 #endif
 
diff --git a/examples/unityplugin/simple_peer_connection.h b/examples/unityplugin/simple_peer_connection.h
index e4d8a1b..b99bde9 100644
--- a/examples/unityplugin/simple_peer_connection.h
+++ b/examples/unityplugin/simple_peer_connection.h
@@ -16,9 +16,9 @@
 #include <string>
 #include <vector>
 
-#include "api/datachannelinterface.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
+#include "api/data_channel_interface.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
 #include "examples/unityplugin/unity_plugin_apis.h"
 #include "examples/unityplugin/video_observer.h"
 
diff --git a/examples/unityplugin/video_observer.h b/examples/unityplugin/video_observer.h
index 84c03d3..01ccd21 100644
--- a/examples/unityplugin/video_observer.h
+++ b/examples/unityplugin/video_observer.h
@@ -13,7 +13,7 @@
 
 #include <mutex>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/video/video_sink_interface.h"
 #include "examples/unityplugin/unity_plugin_apis.h"
 
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 14ce79a..5089515 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -164,8 +164,8 @@
     "rtc_event_log/encoder/delta_encoding.h",
     "rtc_event_log/encoder/rtc_event_log_encoder_common.cc",
     "rtc_event_log/encoder/rtc_event_log_encoder_common.h",
-    "rtc_event_log/encoder/varint.cc",
-    "rtc_event_log/encoder/varint.h",
+    "rtc_event_log/encoder/var_int.cc",
+    "rtc_event_log/encoder/var_int.h",
   ]
 
   defines = []
@@ -412,8 +412,8 @@
     "rtc_event_log/events/rtc_event_ice_candidate_pair.h",
     "rtc_event_log/events/rtc_event_ice_candidate_pair_config.cc",
     "rtc_event_log/events/rtc_event_ice_candidate_pair_config.h",
-    "rtc_event_log/icelogger.cc",
-    "rtc_event_log/icelogger.h",
+    "rtc_event_log/ice_logger.cc",
+    "rtc_event_log/ice_logger.h",
   ]
 
   deps = [
diff --git a/logging/rtc_event_log/encoder/blob_encoding.cc b/logging/rtc_event_log/encoder/blob_encoding.cc
index c11e7ba..48316b0 100644
--- a/logging/rtc_event_log/encoder/blob_encoding.cc
+++ b/logging/rtc_event_log/encoder/blob_encoding.cc
@@ -12,7 +12,7 @@
 
 #include <cstdint>
 
-#include "logging/rtc_event_log/encoder/varint.h"
+#include "logging/rtc_event_log/encoder/var_int.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 
diff --git a/logging/rtc_event_log/encoder/blob_encoding_unittest.cc b/logging/rtc_event_log/encoder/blob_encoding_unittest.cc
index 1d08e0f..a25923f 100644
--- a/logging/rtc_event_log/encoder/blob_encoding_unittest.cc
+++ b/logging/rtc_event_log/encoder/blob_encoding_unittest.cc
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include "logging/rtc_event_log/encoder/varint.h"
+#include "logging/rtc_event_log/encoder/var_int.h"
 #include "rtc_base/checks.h"
 #include "test/gtest.h"
 
diff --git a/logging/rtc_event_log/encoder/delta_encoding.cc b/logging/rtc_event_log/encoder/delta_encoding.cc
index 5e334b9..ca2589f 100644
--- a/logging/rtc_event_log/encoder/delta_encoding.cc
+++ b/logging/rtc_event_log/encoder/delta_encoding.cc
@@ -16,10 +16,10 @@
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "logging/rtc_event_log/encoder/varint.h"
-#include "rtc_base/bitbuffer.h"
+#include "logging/rtc_event_log/encoder/var_int.h"
+#include "rtc_base/bit_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
 
diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc
index 28a1b5d..7e42e3c 100644
--- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc
+++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc
@@ -15,7 +15,7 @@
 
 #include "absl/types/optional.h"
 #include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "api/transport/network_types.h"
 #include "logging/rtc_event_log/events/rtc_event_alr_state.h"
 #include "logging/rtc_event_log/events/rtc_event_audio_network_adaptation.h"
diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc
index 2225d87..5246b21 100644
--- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc
+++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_unittest.cc
@@ -37,7 +37,7 @@
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "modules/rtp_rtcp/source/rtp_header_extensions.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/random.h"
 #include "test/gtest.h"
 
diff --git a/logging/rtc_event_log/encoder/var_int.cc b/logging/rtc_event_log/encoder/var_int.cc
index 41e29e8..b2c695e 100644
--- a/logging/rtc_event_log/encoder/var_int.cc
+++ b/logging/rtc_event_log/encoder/var_int.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "logging/rtc_event_log/encoder/varint.h"
+#include "logging/rtc_event_log/encoder/var_int.h"
 
 #include "rtc_base/checks.h"
 
diff --git a/logging/rtc_event_log/encoder/var_int.h b/logging/rtc_event_log/encoder/var_int.h
index 86bc7ca..390ac90 100644
--- a/logging/rtc_event_log/encoder/var_int.h
+++ b/logging/rtc_event_log/encoder/var_int.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_
-#define LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_
+#ifndef LOGGING_RTC_EVENT_LOG_ENCODER_VAR_INT_H_
+#define LOGGING_RTC_EVENT_LOG_ENCODER_VAR_INT_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 
 namespace webrtc {
 
@@ -44,4 +44,4 @@
 
 }  // namespace webrtc
 
-#endif  // LOGGING_RTC_EVENT_LOG_ENCODER_VARINT_H_
+#endif  // LOGGING_RTC_EVENT_LOG_ENCODER_VAR_INT_H_
diff --git a/logging/rtc_event_log/events/rtc_event.h b/logging/rtc_event_log/events/rtc_event.h
index e2ac357..a3564f0 100644
--- a/logging/rtc_event_log/events/rtc_event.h
+++ b/logging/rtc_event_log/events/rtc_event.h
@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/logging/rtc_event_log/fake_rtc_event_log.h b/logging/rtc_event_log/fake_rtc_event_log.h
index c5ea08a..8c0e498 100644
--- a/logging/rtc_event_log/fake_rtc_event_log.h
+++ b/logging/rtc_event_log/fake_rtc_event_log.h
@@ -16,7 +16,7 @@
 
 #include "logging/rtc_event_log/events/rtc_event.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
-#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/async_invoker.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/logging/rtc_event_log/ice_logger.cc b/logging/rtc_event_log/ice_logger.cc
index c1dbcd8..9e69b52 100644
--- a/logging/rtc_event_log/ice_logger.cc
+++ b/logging/rtc_event_log/ice_logger.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "logging/rtc_event_log/icelogger.h"
+#include "logging/rtc_event_log/ice_logger.h"
 
 #include "absl/memory/memory.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
diff --git a/logging/rtc_event_log/ice_logger.h b/logging/rtc_event_log/ice_logger.h
index f14cf0d..0dea43b 100644
--- a/logging/rtc_event_log/ice_logger.h
+++ b/logging/rtc_event_log/ice_logger.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef LOGGING_RTC_EVENT_LOG_ICELOGGER_H_
-#define LOGGING_RTC_EVENT_LOG_ICELOGGER_H_
+#ifndef LOGGING_RTC_EVENT_LOG_ICE_LOGGER_H_
+#define LOGGING_RTC_EVENT_LOG_ICE_LOGGER_H_
 
 #include <unordered_map>
 
@@ -53,4 +53,4 @@
 
 }  // namespace webrtc
 
-#endif  // LOGGING_RTC_EVENT_LOG_ICELOGGER_H_
+#endif  // LOGGING_RTC_EVENT_LOG_ICE_LOGGER_H_
diff --git a/logging/rtc_event_log/output/rtc_event_log_output_file.h b/logging/rtc_event_log/output/rtc_event_log_output_file.h
index ae2febb..5325c5f 100644
--- a/logging/rtc_event_log/output/rtc_event_log_output_file.h
+++ b/logging/rtc_event_log/output/rtc_event_log_output_file.h
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string>
 
-#include "api/rtceventlogoutput.h"
+#include "api/rtc_event_log_output.h"
 #include "rtc_base/platform_file.h"  // Can't neatly forward PlatformFile.
 
 namespace webrtc {
diff --git a/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc b/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc
index 2893c93..7d7cdf7 100644
--- a/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc
+++ b/logging/rtc_event_log/output/rtc_event_log_output_file_unittest.cc
@@ -18,7 +18,7 @@
 #include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/logging/rtc_event_log/rtc_event_log.h b/logging/rtc_event_log/rtc_event_log.h
index 8db0e62..60fbf0f 100644
--- a/logging/rtc_event_log/rtc_event_log.h
+++ b/logging/rtc_event_log/rtc_event_log.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <memory>
 
-#include "api/rtceventlogoutput.h"
+#include "api/rtc_event_log_output.h"
 #include "logging/rtc_event_log/events/rtc_event.h"
 
 namespace webrtc {
diff --git a/logging/rtc_event_log/rtc_event_log_impl.cc b/logging/rtc_event_log/rtc_event_log_impl.cc
index 9a64788..66a7fb7 100644
--- a/logging/rtc_event_log/rtc_event_log_impl.cc
+++ b/logging/rtc_event_log/rtc_event_log_impl.cc
@@ -19,11 +19,11 @@
 
 #include "absl/memory/memory.h"
 #include "absl/types/optional.h"
-#include "api/rtceventlogoutput.h"
+#include "api/rtc_event_log_output.h"
 #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.h"
 #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/event.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc
index 6f9f979..abf6c7b 100644
--- a/logging/rtc_event_log/rtc_event_log_parser.cc
+++ b/logging/rtc_event_log/rtc_event_log_parser.cc
@@ -23,7 +23,7 @@
 #include "absl/memory/memory.h"
 #include "absl/types/optional.h"
 #include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "logging/rtc_event_log/encoder/blob_encoding.h"
 #include "logging/rtc_event_log/encoder/delta_encoding.h"
 #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.h"
diff --git a/logging/rtc_event_log/rtc_event_log_unittest.cc b/logging/rtc_event_log/rtc_event_log_unittest.cc
index 842687e..ec68ad2 100644
--- a/logging/rtc_event_log/rtc_event_log_unittest.cc
+++ b/logging/rtc_event_log/rtc_event_log_unittest.cc
@@ -43,10 +43,10 @@
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/random.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
index e30d989..dff2952 100644
--- a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
+++ b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
@@ -24,7 +24,7 @@
 #include "absl/types/optional.h"
 #include "api/array_view.h"
 #include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "modules/rtp_rtcp/include/rtp_cvo.h"
diff --git a/logging/rtc_event_log/rtc_stream_config.h b/logging/rtc_event_log/rtc_stream_config.h
index a9da481..6522f99 100644
--- a/logging/rtc_event_log/rtc_stream_config.h
+++ b/logging/rtc_event_log/rtc_stream_config.h
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 
 namespace webrtc {
 namespace rtclog {
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 515496b..c2eeeb5 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -51,7 +51,7 @@
 rtc_source_set("rtc_media_config") {
   visibility = [ "*" ]
   sources = [
-    "base/mediaconfig.h",
+    "base/media_config.h",
   ]
 }
 
@@ -85,38 +85,38 @@
     "../rtc_base:stringutils",
   ]
   sources = [
-    "base/adaptedvideotracksource.cc",
-    "base/adaptedvideotracksource.h",
-    "base/audiosource.h",
+    "base/adapted_video_track_source.cc",
+    "base/adapted_video_track_source.h",
+    "base/audio_source.h",
     "base/codec.cc",
     "base/codec.h",
     "base/device.h",
-    "base/mediachannel.cc",
-    "base/mediachannel.h",
-    "base/mediaconstants.cc",
-    "base/mediaconstants.h",
-    "base/mediaengine.cc",
-    "base/mediaengine.h",
-    "base/riddescription.cc",
-    "base/riddescription.h",
-    "base/rtpdataengine.cc",
-    "base/rtpdataengine.h",
-    "base/rtputils.cc",
-    "base/rtputils.h",
-    "base/streamparams.cc",
-    "base/streamparams.h",
-    "base/turnutils.cc",
-    "base/turnutils.h",
-    "base/videoadapter.cc",
-    "base/videoadapter.h",
-    "base/videobroadcaster.cc",
-    "base/videobroadcaster.h",
-    "base/videocapturer.cc",
-    "base/videocapturer.h",
-    "base/videocommon.cc",
-    "base/videocommon.h",
-    "base/videosourcebase.cc",
-    "base/videosourcebase.h",
+    "base/media_channel.cc",
+    "base/media_channel.h",
+    "base/media_constants.cc",
+    "base/media_constants.h",
+    "base/media_engine.cc",
+    "base/media_engine.h",
+    "base/rid_description.cc",
+    "base/rid_description.h",
+    "base/rtp_data_engine.cc",
+    "base/rtp_data_engine.h",
+    "base/rtp_utils.cc",
+    "base/rtp_utils.h",
+    "base/stream_params.cc",
+    "base/stream_params.h",
+    "base/turn_utils.cc",
+    "base/turn_utils.h",
+    "base/video_adapter.cc",
+    "base/video_adapter.h",
+    "base/video_broadcaster.cc",
+    "base/video_broadcaster.h",
+    "base/video_capturer.cc",
+    "base/video_capturer.h",
+    "base/video_common.cc",
+    "base/video_common.h",
+    "base/video_source_base.cc",
+    "base/video_source_base.h",
   ]
 
   if (!build_with_chromium && is_clang) {
@@ -234,22 +234,22 @@
   sources = [
     "engine/convert_legacy_video_factory.cc",
     "engine/convert_legacy_video_factory.h",
-    "engine/internaldecoderfactory.cc",
-    "engine/internaldecoderfactory.h",
-    "engine/internalencoderfactory.cc",
-    "engine/internalencoderfactory.h",
-    "engine/multiplexcodecfactory.cc",
-    "engine/multiplexcodecfactory.h",
-    "engine/scopedvideodecoder.cc",
-    "engine/scopedvideodecoder.h",
-    "engine/scopedvideoencoder.cc",
-    "engine/scopedvideoencoder.h",
+    "engine/internal_decoder_factory.cc",
+    "engine/internal_decoder_factory.h",
+    "engine/internal_encoder_factory.cc",
+    "engine/internal_encoder_factory.h",
+    "engine/multiplex_codec_factory.cc",
+    "engine/multiplex_codec_factory.h",
+    "engine/scoped_video_decoder.cc",
+    "engine/scoped_video_decoder.h",
+    "engine/scoped_video_encoder.cc",
+    "engine/scoped_video_encoder.h",
 
     # TODO(bugs.webrtc.org/7925): stop exporting this header once downstream
     # targets depend on :rtc_encoder_simulcast_proxy directly.
     "engine/encoder_simulcast_proxy.h",
-    "engine/webrtcvideodecoderfactory.h",
-    "engine/webrtcvideoencoderfactory.h",
+    "engine/webrtc_video_decoder_factory.h",
+    "engine/webrtc_video_encoder_factory.h",
   ]
 
   if (!build_with_chromium && is_clang) {
@@ -311,21 +311,21 @@
     "engine/adm_helpers.h",
     "engine/apm_helpers.cc",
     "engine/apm_helpers.h",
-    "engine/nullwebrtcvideoengine.h",
+    "engine/null_webrtc_video_engine.h",
     "engine/payload_type_mapper.cc",
     "engine/payload_type_mapper.h",
     "engine/simulcast.cc",
     "engine/simulcast.h",
-    "engine/webrtcmediaengine.cc",
-    "engine/webrtcmediaengine.h",
-    "engine/webrtcvideodecoderfactory.cc",
-    "engine/webrtcvideodecoderfactory.h",
-    "engine/webrtcvideoencoderfactory.cc",
-    "engine/webrtcvideoencoderfactory.h",
-    "engine/webrtcvideoengine.cc",
-    "engine/webrtcvideoengine.h",
-    "engine/webrtcvoiceengine.cc",
-    "engine/webrtcvoiceengine.h",
+    "engine/webrtc_media_engine.cc",
+    "engine/webrtc_media_engine.h",
+    "engine/webrtc_video_decoder_factory.cc",
+    "engine/webrtc_video_decoder_factory.h",
+    "engine/webrtc_video_encoder_factory.cc",
+    "engine/webrtc_video_encoder_factory.h",
+    "engine/webrtc_video_engine.cc",
+    "engine/webrtc_video_engine.h",
+    "engine/webrtc_voice_engine.cc",
+    "engine/webrtc_voice_engine.h",
   ]
 
   if (!build_with_chromium && is_clang) {
@@ -396,9 +396,9 @@
 
   if (rtc_enable_sctp) {
     sources = [
-      "sctp/sctptransport.cc",
-      "sctp/sctptransport.h",
-      "sctp/sctptransportinternal.h",
+      "sctp/sctp_transport.cc",
+      "sctp/sctp_transport.h",
+      "sctp/sctp_transport_internal.h",
     ]
   } else {
     # libtool on mac does not like empty targets.
@@ -474,23 +474,23 @@
       "//third_party/abseil-cpp/absl/strings",
     ]
     sources = [
-      "base/fakeframesource.cc",
-      "base/fakeframesource.h",
-      "base/fakemediaengine.cc",
-      "base/fakemediaengine.h",
-      "base/fakenetworkinterface.h",
-      "base/fakertp.cc",
-      "base/fakertp.h",
-      "base/fakevideocapturer.cc",
-      "base/fakevideocapturer.h",
-      "base/fakevideorenderer.cc",
-      "base/fakevideorenderer.h",
-      "base/testutils.cc",
-      "base/testutils.h",
-      "engine/fakewebrtccall.cc",
-      "engine/fakewebrtccall.h",
-      "engine/fakewebrtcvideoengine.cc",
-      "engine/fakewebrtcvideoengine.h",
+      "base/fake_frame_source.cc",
+      "base/fake_frame_source.h",
+      "base/fake_media_engine.cc",
+      "base/fake_media_engine.h",
+      "base/fake_network_interface.h",
+      "base/fake_rtp.cc",
+      "base/fake_rtp.h",
+      "base/fake_video_capturer.cc",
+      "base/fake_video_capturer.h",
+      "base/fake_video_renderer.cc",
+      "base/fake_video_renderer.h",
+      "base/test_utils.cc",
+      "base/test_utils.h",
+      "engine/fake_webrtc_call.cc",
+      "engine/fake_webrtc_call.h",
+      "engine/fake_webrtc_video_engine.cc",
+      "engine/fake_webrtc_video_engine.h",
     ]
 
     if (!build_with_chromium && is_clang) {
@@ -577,35 +577,35 @@
     ]
     sources = [
       "base/codec_unittest.cc",
-      "base/rtpdataengine_unittest.cc",
-      "base/rtputils_unittest.cc",
-      "base/streamparams_unittest.cc",
-      "base/turnutils_unittest.cc",
-      "base/videoadapter_unittest.cc",
-      "base/videobroadcaster_unittest.cc",
-      "base/videocapturer_unittest.cc",
-      "base/videocommon_unittest.cc",
+      "base/rtp_data_engine_unittest.cc",
+      "base/rtp_utils_unittest.cc",
+      "base/stream_params_unittest.cc",
+      "base/turn_utils_unittest.cc",
+      "base/video_adapter_unittest.cc",
+      "base/video_broadcaster_unittest.cc",
+      "base/video_capturer_unittest.cc",
+      "base/video_common_unittest.cc",
       "engine/apm_helpers_unittest.cc",
       "engine/encoder_simulcast_proxy_unittest.cc",
-      "engine/internaldecoderfactory_unittest.cc",
-      "engine/multiplexcodecfactory_unittest.cc",
-      "engine/nullwebrtcvideoengine_unittest.cc",
+      "engine/internal_decoder_factory_unittest.cc",
+      "engine/multiplex_codec_factory_unittest.cc",
+      "engine/null_webrtc_video_engine_unittest.cc",
       "engine/payload_type_mapper_unittest.cc",
       "engine/simulcast_encoder_adapter_unittest.cc",
       "engine/simulcast_unittest.cc",
-      "engine/webrtcmediaengine_unittest.cc",
-      "engine/webrtcvideoencoderfactory_unittest.cc",
-      "engine/webrtcvideoengine_unittest.cc",
+      "engine/webrtc_media_engine_unittest.cc",
+      "engine/webrtc_video_encoder_factory_unittest.cc",
+      "engine/webrtc_video_engine_unittest.cc",
     ]
 
     # TODO(kthelgason): Reenable this test on iOS.
     # See bugs.webrtc.org/5569
     if (!is_ios) {
-      sources += [ "engine/webrtcvoiceengine_unittest.cc" ]
+      sources += [ "engine/webrtc_voice_engine_unittest.cc" ]
     }
 
     if (rtc_enable_sctp) {
-      sources += [ "sctp/sctptransport_unittest.cc" ]
+      sources += [ "sctp/sctp_transport_unittest.cc" ]
     }
 
     if (rtc_use_h264) {
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_
diff --git a/media/engine/convert_legacy_video_factory.cc b/media/engine/convert_legacy_video_factory.cc
index 45fd420..221b6bc 100644
--- a/media/engine/convert_legacy_video_factory.cc
+++ b/media/engine/convert_legacy_video_factory.cc
@@ -25,15 +25,15 @@
 #include "api/video_codecs/video_encoder_factory.h"
 #include "api/video_codecs/video_encoder_software_fallback_wrapper.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "media/engine/encoder_simulcast_proxy.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
-#include "media/engine/scopedvideodecoder.h"
-#include "media/engine/scopedvideoencoder.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
+#include "media/engine/scoped_video_decoder.h"
+#include "media/engine/scoped_video_encoder.h"
 #include "media/engine/simulcast_encoder_adapter.h"
-#include "media/engine/webrtcvideodecoderfactory.h"
-#include "media/engine/webrtcvideoencoderfactory.h"
+#include "media/engine/webrtc_video_decoder_factory.h"
+#include "media/engine/webrtc_video_encoder_factory.h"
 #include "rtc_base/checks.h"
 
 namespace cricket {
diff --git a/media/engine/convert_legacy_video_factory.h b/media/engine/convert_legacy_video_factory.h
index f83415a..1fb19dd 100644
--- a/media/engine/convert_legacy_video_factory.h
+++ b/media/engine/convert_legacy_video_factory.h
@@ -14,8 +14,8 @@
 #include <memory>
 #include <utility>
 
-#include "media/engine/webrtcvideodecoderfactory.h"
-#include "media/engine/webrtcvideoencoderfactory.h"
+#include "media/engine/webrtc_video_decoder_factory.h"
+#include "media/engine/webrtc_video_encoder_factory.h"
 #include "rtc_base/deprecation.h"
 #include "rtc_base/system/rtc_export.h"
 
diff --git a/media/engine/encoder_simulcast_proxy_unittest.cc b/media/engine/encoder_simulcast_proxy_unittest.cc
index d1a8876..20ea36e 100644
--- a/media/engine/encoder_simulcast_proxy_unittest.cc
+++ b/media/engine/encoder_simulcast_proxy_unittest.cc
@@ -14,7 +14,7 @@
 
 #include "api/test/mock_video_encoder_factory.h"
 #include "api/video_codecs/vp8_temporal_layers.h"
-#include "media/engine/webrtcvideoencoderfactory.h"
+#include "media/engine/webrtc_video_encoder_factory.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/media/engine/fake_webrtc_call.cc b/media/engine/fake_webrtc_call.cc
index 6c5b8c7..c223064 100644
--- a/media/engine/fake_webrtc_call.cc
+++ b/media/engine/fake_webrtc_call.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/fakewebrtccall.h"
+#include "media/engine/fake_webrtc_call.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "api/call/audio_sink.h"
-#include "media/base/rtputils.h"
+#include "media/base/rtp_utils.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/gunit.h"
 
diff --git a/media/engine/fake_webrtc_call.h b/media/engine/fake_webrtc_call.h
index 1b6deb0..4e8aa03 100644
--- a/media/engine/fake_webrtc_call.h
+++ b/media/engine/fake_webrtc_call.h
@@ -17,8 +17,8 @@
 //   webrtc::VideoSendStream
 //   webrtc::VideoReceiveStream
 
-#ifndef MEDIA_ENGINE_FAKEWEBRTCCALL_H_
-#define MEDIA_ENGINE_FAKEWEBRTCCALL_H_
+#ifndef MEDIA_ENGINE_FAKE_WEBRTC_CALL_H_
+#define MEDIA_ENGINE_FAKE_WEBRTC_CALL_H_
 
 #include <memory>
 #include <string>
@@ -344,4 +344,4 @@
 };
 
 }  // namespace cricket
-#endif  // MEDIA_ENGINE_FAKEWEBRTCCALL_H_
+#endif  // MEDIA_ENGINE_FAKE_WEBRTC_CALL_H_
diff --git a/media/engine/fake_webrtc_video_engine.cc b/media/engine/fake_webrtc_video_engine.cc
index 897f8f4..70bf922 100644
--- a/media/engine/fake_webrtc_video_engine.cc
+++ b/media/engine/fake_webrtc_video_engine.cc
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/fakewebrtcvideoengine.h"
+#include "media/engine/fake_webrtc_video_engine.h"
 
 #include <algorithm>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "media/engine/simulcast_encoder_adapter.h"
 #include "modules/video_coding/include/video_error_codes.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace cricket {
 
diff --git a/media/engine/fake_webrtc_video_engine.h b/media/engine/fake_webrtc_video_engine.h
index 1d1839a..1505f49 100644
--- a/media/engine/fake_webrtc_video_engine.h
+++ b/media/engine/fake_webrtc_video_engine.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
-#define MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
+#ifndef MEDIA_ENGINE_FAKE_WEBRTC_VIDEO_ENGINE_H_
+#define MEDIA_ENGINE_FAKE_WEBRTC_VIDEO_ENGINE_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -28,7 +28,7 @@
 #include "api/video_codecs/video_encoder_factory.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_codec_interface.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/thread_annotations.h"
 
@@ -140,4 +140,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_ENGINE_FAKEWEBRTCVIDEOENGINE_H_
+#endif  // MEDIA_ENGINE_FAKE_WEBRTC_VIDEO_ENGINE_H_
diff --git a/media/engine/internal_decoder_factory.cc b/media/engine/internal_decoder_factory.cc
index a5624ee..5180b28 100644
--- a/media/engine/internal_decoder_factory.cc
+++ b/media/engine/internal_decoder_factory.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/internaldecoderfactory.h"
+#include "media/engine/internal_decoder_factory.h"
 
 #include "absl/strings/match.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
diff --git a/media/engine/internal_decoder_factory.h b/media/engine/internal_decoder_factory.h
index 4002490..feb8f53 100644
--- a/media/engine/internal_decoder_factory.h
+++ b/media/engine/internal_decoder_factory.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
-#define MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
+#ifndef MEDIA_ENGINE_INTERNAL_DECODER_FACTORY_H_
+#define MEDIA_ENGINE_INTERNAL_DECODER_FACTORY_H_
 
 #include <memory>
 #include <vector>
@@ -29,4 +29,4 @@
 
 }  // namespace webrtc
 
-#endif  // MEDIA_ENGINE_INTERNALDECODERFACTORY_H_
+#endif  // MEDIA_ENGINE_INTERNAL_DECODER_FACTORY_H_
diff --git a/media/engine/internal_decoder_factory_unittest.cc b/media/engine/internal_decoder_factory_unittest.cc
index 147293d..5e2bfbf 100644
--- a/media/engine/internal_decoder_factory_unittest.cc
+++ b/media/engine/internal_decoder_factory_unittest.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/internaldecoderfactory.h"
+#include "media/engine/internal_decoder_factory.h"
 
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_decoder.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/media/engine/internal_encoder_factory.cc b/media/engine/internal_encoder_factory.cc
index bf940a1..331f22b 100644
--- a/media/engine/internal_encoder_factory.cc
+++ b/media/engine/internal_encoder_factory.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/internalencoderfactory.h"
+#include "media/engine/internal_encoder_factory.h"
 
 #include <string>
 
 #include "absl/strings/match.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
diff --git a/media/engine/internal_encoder_factory.h b/media/engine/internal_encoder_factory.h
index d30335e..c2442f1 100644
--- a/media/engine/internal_encoder_factory.h
+++ b/media/engine/internal_encoder_factory.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
-#define MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
+#ifndef MEDIA_ENGINE_INTERNAL_ENCODER_FACTORY_H_
+#define MEDIA_ENGINE_INTERNAL_ENCODER_FACTORY_H_
 
 #include <memory>
 #include <vector>
@@ -32,4 +32,4 @@
 
 }  // namespace webrtc
 
-#endif  // MEDIA_ENGINE_INTERNALENCODERFACTORY_H_
+#endif  // MEDIA_ENGINE_INTERNAL_ENCODER_FACTORY_H_
diff --git a/media/engine/multiplex_codec_factory.cc b/media/engine/multiplex_codec_factory.cc
index 76f60ec..5a220d5 100644
--- a/media/engine/multiplex_codec_factory.cc
+++ b/media/engine/multiplex_codec_factory.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/multiplexcodecfactory.h"
+#include "media/engine/multiplex_codec_factory.h"
 
 #include <map>
 #include <string>
@@ -17,7 +17,7 @@
 #include "absl/strings/match.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h"
 #include "modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h"
 #include "rtc_base/logging.h"
diff --git a/media/engine/multiplex_codec_factory.h b/media/engine/multiplex_codec_factory.h
index 48a2984..b8a15e2 100644
--- a/media/engine/multiplex_codec_factory.h
+++ b/media/engine/multiplex_codec_factory.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_
-#define MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_
+#ifndef MEDIA_ENGINE_MULTIPLEX_CODEC_FACTORY_H_
+#define MEDIA_ENGINE_MULTIPLEX_CODEC_FACTORY_H_
 
 #include <memory>
 #include <vector>
@@ -77,4 +77,4 @@
 
 }  // namespace webrtc
 
-#endif  // MEDIA_ENGINE_MULTIPLEXCODECFACTORY_H_
+#endif  // MEDIA_ENGINE_MULTIPLEX_CODEC_FACTORY_H_
diff --git a/media/engine/multiplex_codec_factory_unittest.cc b/media/engine/multiplex_codec_factory_unittest.cc
index bc30f60..1cde2f3 100644
--- a/media/engine/multiplex_codec_factory_unittest.cc
+++ b/media/engine/multiplex_codec_factory_unittest.cc
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/multiplexcodecfactory.h"
+#include "media/engine/multiplex_codec_factory.h"
 
 #include <utility>
 
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_decoder.h"
 #include "api/video_codecs/video_encoder.h"
-#include "media/base/mediaconstants.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/base/media_constants.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/media/engine/null_webrtc_video_engine.h b/media/engine/null_webrtc_video_engine.h
index 62326dd..8702b73 100644
--- a/media/engine/null_webrtc_video_engine.h
+++ b/media/engine/null_webrtc_video_engine.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
-#define MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
+#ifndef MEDIA_ENGINE_NULL_WEBRTC_VIDEO_ENGINE_H_
+#define MEDIA_ENGINE_NULL_WEBRTC_VIDEO_ENGINE_H_
 
 #include <vector>
 
-#include "media/base/mediachannel.h"
-#include "media/base/mediaengine.h"
+#include "media/base/media_channel.h"
+#include "media/base/media_engine.h"
 
 namespace webrtc {
 
@@ -49,4 +49,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_ENGINE_NULLWEBRTCVIDEOENGINE_H_
+#endif  // MEDIA_ENGINE_NULL_WEBRTC_VIDEO_ENGINE_H_
diff --git a/media/engine/null_webrtc_video_engine_unittest.cc b/media/engine/null_webrtc_video_engine_unittest.cc
index e718d1b..85eaea3 100644
--- a/media/engine/null_webrtc_video_engine_unittest.cc
+++ b/media/engine/null_webrtc_video_engine_unittest.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/nullwebrtcvideoengine.h"
+#include "media/engine/null_webrtc_video_engine.h"
 #include "absl/memory/memory.h"
-#include "media/engine/webrtcvoiceengine.h"
+#include "media/engine/webrtc_voice_engine.h"
 #include "modules/audio_device/include/mock_audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "test/gtest.h"
diff --git a/media/engine/payload_type_mapper.cc b/media/engine/payload_type_mapper.cc
index ae4e309..fcacd44 100644
--- a/media/engine/payload_type_mapper.cc
+++ b/media/engine/payload_type_mapper.cc
@@ -14,7 +14,7 @@
 
 #include "absl/strings/ascii.h"
 #include "api/audio_codecs/audio_format.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 
 namespace cricket {
 
diff --git a/media/engine/payload_type_mapper_unittest.cc b/media/engine/payload_type_mapper_unittest.cc
index a802d27..eed797b 100644
--- a/media/engine/payload_type_mapper_unittest.cc
+++ b/media/engine/payload_type_mapper_unittest.cc
@@ -12,7 +12,7 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "media/engine/payload_type_mapper.h"
 #include "test/gtest.h"
 
diff --git a/media/engine/scoped_video_decoder.cc b/media/engine/scoped_video_decoder.cc
index 118ab41..c33cc13 100644
--- a/media/engine/scoped_video_decoder.cc
+++ b/media/engine/scoped_video_decoder.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/scopedvideodecoder.h"
+#include "media/engine/scoped_video_decoder.h"
 
 #include <stdint.h>
 
diff --git a/media/engine/scoped_video_decoder.h b/media/engine/scoped_video_decoder.h
index fcb3145..15b6ca5 100644
--- a/media/engine/scoped_video_decoder.h
+++ b/media/engine/scoped_video_decoder.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_SCOPEDVIDEODECODER_H_
-#define MEDIA_ENGINE_SCOPEDVIDEODECODER_H_
+#ifndef MEDIA_ENGINE_SCOPED_VIDEO_DECODER_H_
+#define MEDIA_ENGINE_SCOPED_VIDEO_DECODER_H_
 
 #include <memory>
 
 #include "api/video_codecs/video_decoder.h"
 #include "media/base/codec.h"
-#include "media/engine/webrtcvideodecoderfactory.h"
+#include "media/engine/webrtc_video_decoder_factory.h"
 #include "rtc_base/deprecation.h"
 
 namespace cricket {
@@ -41,4 +41,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_ENGINE_SCOPEDVIDEODECODER_H_
+#endif  // MEDIA_ENGINE_SCOPED_VIDEO_DECODER_H_
diff --git a/media/engine/scoped_video_encoder.cc b/media/engine/scoped_video_encoder.cc
index 4ff2c72..7c631f6 100644
--- a/media/engine/scoped_video_encoder.cc
+++ b/media/engine/scoped_video_encoder.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/scopedvideoencoder.h"
+#include "media/engine/scoped_video_encoder.h"
 
 #include <stddef.h>
 #include <stdint.h>
diff --git a/media/engine/scoped_video_encoder.h b/media/engine/scoped_video_encoder.h
index 46ad8b0..e9c4dd3 100644
--- a/media/engine/scoped_video_encoder.h
+++ b/media/engine/scoped_video_encoder.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_
-#define MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_
+#ifndef MEDIA_ENGINE_SCOPED_VIDEO_ENCODER_H_
+#define MEDIA_ENGINE_SCOPED_VIDEO_ENCODER_H_
 
 #include <memory>
 
 #include "api/video_codecs/video_encoder.h"
 #include "media/base/codec.h"
-#include "media/engine/webrtcvideoencoderfactory.h"
+#include "media/engine/webrtc_video_encoder_factory.h"
 #include "rtc_base/deprecation.h"
 
 namespace cricket {
@@ -39,4 +39,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_ENGINE_SCOPEDVIDEOENCODER_H_
+#endif  // MEDIA_ENGINE_SCOPED_VIDEO_ENCODER_H_
diff --git a/media/engine/simulcast.cc b/media/engine/simulcast.cc
index 0103051..ac49b57 100644
--- a/media/engine/simulcast.cc
+++ b/media/engine/simulcast.cc
@@ -15,7 +15,7 @@
 
 #include "absl/types/optional.h"
 #include "api/video/video_bitrate_allocation.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "media/engine/constants.h"
 #include "media/engine/simulcast.h"
 #include "modules/video_coding/utility/simulcast_rate_allocator.h"
diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc
index 563ca45..7acb726 100644
--- a/media/engine/simulcast_encoder_adapter.cc
+++ b/media/engine/simulcast_encoder_adapter.cc
@@ -24,7 +24,7 @@
 #include "api/video_codecs/video_encoder_factory.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "modules/video_coding/utility/simulcast_rate_allocator.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "system_wrappers/include/field_trial.h"
diff --git a/media/engine/simulcast_encoder_adapter.h b/media/engine/simulcast_encoder_adapter.h
index 783c342..696503d 100644
--- a/media/engine/simulcast_encoder_adapter.h
+++ b/media/engine/simulcast_encoder_adapter.h
@@ -21,7 +21,7 @@
 #include "absl/types/optional.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "modules/video_coding/include/video_codec_interface.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/sequenced_task_checker.h"
 
 namespace webrtc {
diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc
index 741e3fc..9fa354f 100644
--- a/media/engine/simulcast_encoder_adapter_unittest.cc
+++ b/media/engine/simulcast_encoder_adapter_unittest.cc
@@ -20,8 +20,8 @@
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_encoder_factory.h"
 #include "common_video/include/video_frame_buffer.h"
-#include "media/base/mediaconstants.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/base/media_constants.h"
+#include "media/engine/internal_encoder_factory.h"
 #include "media/engine/simulcast_encoder_adapter.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/include/video_codec_interface.h"
diff --git a/media/engine/simulcast_unittest.cc b/media/engine/simulcast_unittest.cc
index ecc697c..ec4d0d0 100644
--- a/media/engine/simulcast_unittest.cc
+++ b/media/engine/simulcast_unittest.cc
@@ -10,7 +10,7 @@
 
 #include "media/engine/simulcast.h"
 
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "media/engine/constants.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
diff --git a/media/engine/webrtc_media_engine.cc b/media/engine/webrtc_media_engine.cc
index 844f463..4819e2d 100644
--- a/media/engine/webrtc_media_engine.cc
+++ b/media/engine/webrtc_media_engine.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtc_media_engine.h"
 
 #include <algorithm>
 #include <utility>
@@ -17,16 +17,16 @@
 #include "api/video/builtin_video_bitrate_allocator_factory.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "media/engine/webrtcvoiceengine.h"
+#include "media/engine/webrtc_voice_engine.h"
 
 #if defined(USE_BUILTIN_SW_CODECS)
 #include "media/engine/convert_legacy_video_factory.h"
 #endif
 
 #ifdef HAVE_WEBRTC_VIDEO
-#include "media/engine/webrtcvideoengine.h"
+#include "media/engine/webrtc_video_engine.h"
 #else
-#include "media/engine/nullwebrtcvideoengine.h"
+#include "media/engine/null_webrtc_video_engine.h"
 #endif
 
 namespace cricket {
diff --git a/media/engine/webrtc_media_engine.h b/media/engine/webrtc_media_engine.h
index 9256c0c..837634a 100644
--- a/media/engine/webrtc_media_engine.h
+++ b/media/engine/webrtc_media_engine.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
-#define MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
+#ifndef MEDIA_ENGINE_WEBRTC_MEDIA_ENGINE_H_
+#define MEDIA_ENGINE_WEBRTC_MEDIA_ENGINE_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "call/call.h"
-#include "media/base/mediaengine.h"
+#include "media/base/media_engine.h"
 #include "modules/audio_device/include/audio_device.h"
 
 namespace webrtc {
@@ -128,4 +128,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
+#endif  // MEDIA_ENGINE_WEBRTC_MEDIA_ENGINE_H_
diff --git a/media/engine/webrtc_media_engine_unittest.cc b/media/engine/webrtc_media_engine_unittest.cc
index eec7dc3..0241607 100644
--- a/media/engine/webrtc_media_engine_unittest.cc
+++ b/media/engine/webrtc_media_engine_unittest.cc
@@ -15,7 +15,7 @@
 #include "api/video/builtin_video_bitrate_allocator_factory.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtc_media_engine.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "test/gtest.h"
 
diff --git a/media/engine/webrtc_video_decoder_factory.cc b/media/engine/webrtc_video_decoder_factory.cc
index 8d79cf5..5f8743e 100644
--- a/media/engine/webrtc_video_decoder_factory.cc
+++ b/media/engine/webrtc_video_decoder_factory.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/webrtcvideodecoderfactory.h"
+#include "media/engine/webrtc_video_decoder_factory.h"
 
 #include "api/video_codecs/video_codec.h"
 #include "rtc_base/checks.h"
diff --git a/media/engine/webrtc_video_decoder_factory.h b/media/engine/webrtc_video_decoder_factory.h
index f00d9a6..72deca1 100644
--- a/media/engine/webrtc_video_decoder_factory.h
+++ b/media/engine/webrtc_video_decoder_factory.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
-#define MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
+#ifndef MEDIA_ENGINE_WEBRTC_VIDEO_DECODER_FACTORY_H_
+#define MEDIA_ENGINE_WEBRTC_VIDEO_DECODER_FACTORY_H_
 
 #include <string>
 
 #include "api/video/video_codec_type.h"
 #include "media/base/codec.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
@@ -54,4 +54,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
+#endif  // MEDIA_ENGINE_WEBRTC_VIDEO_DECODER_FACTORY_H_
diff --git a/media/engine/webrtc_video_encoder_factory.cc b/media/engine/webrtc_video_encoder_factory.cc
index 815613e..bf254e8 100644
--- a/media/engine/webrtc_video_encoder_factory.cc
+++ b/media/engine/webrtc_video_encoder_factory.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/webrtcvideoencoderfactory.h"
+#include "media/engine/webrtc_video_encoder_factory.h"
 
 namespace cricket {
 
diff --git a/media/engine/webrtc_video_encoder_factory.h b/media/engine/webrtc_video_encoder_factory.h
index d39e0fd..027340b 100644
--- a/media/engine/webrtc_video_encoder_factory.h
+++ b/media/engine/webrtc_video_encoder_factory.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
-#define MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
+#ifndef MEDIA_ENGINE_WEBRTC_VIDEO_ENCODER_FACTORY_H_
+#define MEDIA_ENGINE_WEBRTC_VIDEO_ENCODER_FACTORY_H_
 
 #include <string>
 #include <vector>
@@ -48,4 +48,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_ENGINE_WEBRTCVIDEOENCODERFACTORY_H_
+#endif  // MEDIA_ENGINE_WEBRTC_VIDEO_ENCODER_FACTORY_H_
diff --git a/media/engine/webrtc_video_encoder_factory_unittest.cc b/media/engine/webrtc_video_encoder_factory_unittest.cc
index 2b156a8..be6c2d1 100644
--- a/media/engine/webrtc_video_encoder_factory_unittest.cc
+++ b/media/engine/webrtc_video_encoder_factory_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/webrtcvideoencoderfactory.h"
+#include "media/engine/webrtc_video_encoder_factory.h"
 
 #include "test/gtest.h"
 
diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc
index babe05d..5fe0e62 100644
--- a/media/engine/webrtc_video_engine.cc
+++ b/media/engine/webrtc_video_engine.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "media/engine/webrtcvideoengine.h"
+#include "media/engine/webrtc_video_engine.h"
 
 #include <stdio.h>
 #include <algorithm>
@@ -27,12 +27,12 @@
 #include "media/engine/convert_legacy_video_factory.h"  // nogncheck
 #endif
 #include "media/engine/simulcast.h"
-#include "media/engine/webrtcmediaengine.h"
-#include "media/engine/webrtcvoiceengine.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "media/engine/webrtc_media_engine.h"
+#include "media/engine/webrtc_voice_engine.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/media/engine/webrtc_video_engine.h b/media/engine/webrtc_video_engine.h
index a93453d..68db82c 100644
--- a/media/engine/webrtc_video_engine.h
+++ b/media/engine/webrtc_video_engine.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
-#define MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
+#ifndef MEDIA_ENGINE_WEBRTC_VIDEO_ENGINE_H_
+#define MEDIA_ENGINE_WEBRTC_VIDEO_ENGINE_H_
 
 #include <map>
 #include <memory>
@@ -28,12 +28,12 @@
 #include "call/flexfec_receive_stream.h"
 #include "call/video_receive_stream.h"
 #include "call/video_send_stream.h"
-#include "media/base/mediaengine.h"
-#include "media/engine/webrtcvideodecoderfactory.h"
-#include "media/engine/webrtcvideoencoderfactory.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/networkroute.h"
+#include "media/base/media_engine.h"
+#include "media/engine/webrtc_video_decoder_factory.h"
+#include "media/engine/webrtc_video_encoder_factory.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/network_route.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
 
@@ -546,4 +546,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
+#endif  // MEDIA_ENGINE_WEBRTC_VIDEO_ENGINE_H_
diff --git a/media/engine/webrtc_video_engine_unittest.cc b/media/engine/webrtc_video_engine_unittest.cc
index 590d8bc..9b5abd6 100644
--- a/media/engine/webrtc_video_engine_unittest.cc
+++ b/media/engine/webrtc_video_engine_unittest.cc
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "absl/strings/match.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "api/test/mock_video_bitrate_allocator.h"
 #include "api/test/mock_video_bitrate_allocator_factory.h"
 #include "api/test/mock_video_decoder_factory.h"
@@ -32,21 +32,21 @@
 #include "call/flexfec_receive_stream.h"
 #include "common_video/h264/profile_level_id.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
-#include "media/base/fakenetworkinterface.h"
-#include "media/base/fakevideocapturer.h"
-#include "media/base/fakevideorenderer.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/rtputils.h"
-#include "media/base/testutils.h"
+#include "media/base/fake_network_interface.h"
+#include "media/base/fake_video_capturer.h"
+#include "media/base/fake_video_renderer.h"
+#include "media/base/media_constants.h"
+#include "media/base/rtp_utils.h"
+#include "media/base/test_utils.h"
 #include "media/engine/constants.h"
-#include "media/engine/fakewebrtccall.h"
-#include "media/engine/fakewebrtcvideoengine.h"
+#include "media/engine/fake_webrtc_call.h"
+#include "media/engine/fake_webrtc_video_engine.h"
 #include "media/engine/simulcast.h"
-#include "media/engine/webrtcvideoengine.h"
-#include "media/engine/webrtcvoiceengine.h"
+#include "media/engine/webrtc_video_engine.h"
+#include "media/engine/webrtc_voice_engine.h"
 #include "modules/rtp_rtcp/include/rtp_header_parser.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "test/field_trial.h"
diff --git a/media/engine/webrtc_voice_engine.cc b/media/engine/webrtc_voice_engine.cc
index 2bb4b28..88fc4d8 100644
--- a/media/engine/webrtc_voice_engine.cc
+++ b/media/engine/webrtc_voice_engine.cc
@@ -10,7 +10,7 @@
 
 #ifdef HAVE_WEBRTC_VOICE
 
-#include "media/engine/webrtcvoiceengine.h"
+#include "media/engine/webrtc_voice_engine.h"
 
 #include <algorithm>
 #include <cstdio>
@@ -23,20 +23,20 @@
 #include "api/audio_codecs/audio_codec_pair_id.h"
 #include "api/call/audio_sink.h"
 #include "api/media_transport_interface.h"
-#include "media/base/audiosource.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/streamparams.h"
+#include "media/base/audio_source.h"
+#include "media/base/media_constants.h"
+#include "media/base/stream_params.h"
 #include "media/engine/adm_helpers.h"
 #include "media/engine/apm_helpers.h"
 #include "media/engine/payload_type_mapper.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtc_media_engine.h"
 #include "modules/audio_device/audio_device_impl.h"
 #include "modules/audio_mixer/audio_mixer_impl.h"
 #include "modules/audio_processing/aec_dump/aec_dump_factory.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/byteorder.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/race_checker.h"
diff --git a/media/engine/webrtc_voice_engine.h b/media/engine/webrtc_voice_engine.h
index 494b4f6..701942d 100644
--- a/media/engine/webrtc_voice_engine.h
+++ b/media/engine/webrtc_voice_engine.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
-#define MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
+#ifndef MEDIA_ENGINE_WEBRTC_VOICE_ENGINE_H_
+#define MEDIA_ENGINE_WEBRTC_VOICE_ENGINE_H_
 
 #include <map>
 #include <memory>
@@ -17,16 +17,16 @@
 #include <vector>
 
 #include "api/audio_codecs/audio_encoder_factory.h"
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
 #include "call/audio_state.h"
 #include "call/call.h"
-#include "media/base/rtputils.h"
+#include "media/base/rtp_utils.h"
 #include "media/engine/apm_helpers.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "pc/channel.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/network_route.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_checker.h"
@@ -326,4 +326,4 @@
 };
 }  // namespace cricket
 
-#endif  // MEDIA_ENGINE_WEBRTCVOICEENGINE_H_
+#endif  // MEDIA_ENGINE_WEBRTC_VOICE_ENGINE_H_
diff --git a/media/engine/webrtc_voice_engine_unittest.cc b/media/engine/webrtc_voice_engine_unittest.cc
index ff0d8c6..06bf3fd 100644
--- a/media/engine/webrtc_voice_engine_unittest.cc
+++ b/media/engine/webrtc_voice_engine_unittest.cc
@@ -14,20 +14,20 @@
 #include "absl/strings/match.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "call/call.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
-#include "media/base/fakemediaengine.h"
-#include "media/base/fakenetworkinterface.h"
-#include "media/base/fakertp.h"
-#include "media/base/mediaconstants.h"
-#include "media/engine/fakewebrtccall.h"
-#include "media/engine/webrtcvoiceengine.h"
+#include "media/base/fake_media_engine.h"
+#include "media/base/fake_network_interface.h"
+#include "media/base/fake_rtp.h"
+#include "media/base/media_constants.h"
+#include "media/engine/fake_webrtc_call.h"
+#include "media/engine/webrtc_voice_engine.h"
 #include "modules/audio_device/include/mock_audio_device.h"
 #include "modules/audio_processing/include/mock_audio_processing.h"
 #include "pc/channel.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/field_trial.h"
diff --git a/media/sctp/sctp_transport.cc b/media/sctp/sctp_transport.cc
index 73e4185..65c2181 100644
--- a/media/sctp/sctp_transport.cc
+++ b/media/sctp/sctp_transport.cc
@@ -18,7 +18,7 @@
 };
 }  // namespace
 
-#include "media/sctp/sctptransport.h"
+#include "media/sctp/sctp_transport.h"
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -27,12 +27,12 @@
 #include <memory>
 
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/streamparams.h"
-#include "p2p/base/dtlstransportinternal.h"  // For PF_NORMAL
+#include "media/base/media_constants.h"
+#include "media/base/stream_params.h"
+#include "p2p/base/dtls_transport_internal.h"  // For PF_NORMAL
 #include "rtc_base/arraysize.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
diff --git a/media/sctp/sctp_transport.h b/media/sctp/sctp_transport.h
index 5c2a750..f7ddd87 100644
--- a/media/sctp/sctp_transport.h
+++ b/media/sctp/sctp_transport.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_SCTP_SCTPTRANSPORT_H_
-#define MEDIA_SCTP_SCTPTRANSPORT_H_
+#ifndef MEDIA_SCTP_SCTP_TRANSPORT_H_
+#define MEDIA_SCTP_SCTP_TRANSPORT_H_
 
 #include <errno.h>
 
@@ -19,14 +19,14 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
 // For SendDataParams/ReceiveDataParams.
-#include "media/base/mediachannel.h"
-#include "media/sctp/sctptransportinternal.h"
+#include "media/base/media_channel.h"
+#include "media/sctp/sctp_transport_internal.h"
 
 // Defined by "usrsctplib/usrsctp.h"
 struct sockaddr_conn;
@@ -228,4 +228,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_SCTP_SCTPTRANSPORT_H_
+#endif  // MEDIA_SCTP_SCTP_TRANSPORT_H_
diff --git a/media/sctp/sctp_transport_internal.h b/media/sctp/sctp_transport_internal.h
index 4c3b542..12f1782 100644
--- a/media/sctp/sctp_transport_internal.h
+++ b/media/sctp/sctp_transport_internal.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_
-#define MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_
+#ifndef MEDIA_SCTP_SCTP_TRANSPORT_INTERNAL_H_
+#define MEDIA_SCTP_SCTP_TRANSPORT_INTERNAL_H_
 
 // TODO(deadbeef): Move SCTP code out of media/, and make it not depend on
 // anything in media/.
@@ -18,13 +18,13 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/thread.h"
 // For SendDataParams/ReceiveDataParams.
 // TODO(deadbeef): Use something else for SCTP. It's confusing that we use an
 // SSRC field for SID.
-#include "media/base/mediachannel.h"
-#include "p2p/base/packettransportinternal.h"
+#include "media/base/media_channel.h"
+#include "p2p/base/packet_transport_internal.h"
 
 namespace cricket {
 
@@ -138,4 +138,4 @@
 
 }  // namespace cricket
 
-#endif  // MEDIA_SCTP_SCTPTRANSPORTINTERNAL_H_
+#endif  // MEDIA_SCTP_SCTP_TRANSPORT_INTERNAL_H_
diff --git a/media/sctp/sctp_transport_unittest.cc b/media/sctp/sctp_transport_unittest.cc
index c63bde8..0170785 100644
--- a/media/sctp/sctp_transport_unittest.cc
+++ b/media/sctp/sctp_transport_unittest.cc
@@ -15,12 +15,12 @@
 #include <string>
 #include <vector>
 
-#include "media/sctp/sctptransport.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "media/sctp/sctp_transport.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_queue.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
 
diff --git a/modules/audio_coding/acm2/acm_receive_test.h b/modules/audio_coding/acm2/acm_receive_test.h
index 04aefc7..23e48a0 100644
--- a/modules/audio_coding/acm2/acm_receive_test.h
+++ b/modules/audio_coding/acm2/acm_receive_test.h
@@ -16,7 +16,7 @@
 #include <string>
 
 #include "api/audio_codecs/audio_decoder_factory.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "system_wrappers/include/clock.h"
 
diff --git a/modules/audio_coding/acm2/acm_receiver.h b/modules/audio_coding/acm2/acm_receiver.h
index 0cbaa9a..d3b41c8 100644
--- a/modules/audio_coding/acm2/acm_receiver.h
+++ b/modules/audio_coding/acm2/acm_receiver.h
@@ -25,7 +25,7 @@
 #include "modules/audio_coding/acm2/acm_resampler.h"
 #include "modules/audio_coding/acm2/call_statistics.h"
 #include "modules/audio_coding/include/audio_coding_module.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/acm2/acm_receiver_unittest.cc b/modules/audio_coding/acm2/acm_receiver_unittest.cc
index 8b3d2e4..d5392dc 100644
--- a/modules/audio_coding/acm2/acm_receiver_unittest.cc
+++ b/modules/audio_coding/acm2/acm_receiver_unittest.cc
@@ -23,7 +23,7 @@
 #include "rtc_base/numerics/safe_conversions.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/acm2/acm_send_test.cc b/modules/audio_coding/acm2/acm_send_test.cc
index cf9c8eb..98d673f 100644
--- a/modules/audio_coding/acm2/acm_send_test.cc
+++ b/modules/audio_coding/acm2/acm_send_test.cc
@@ -22,7 +22,7 @@
 #include "modules/audio_coding/neteq/tools/input_audio_file.h"
 #include "modules/audio_coding/neteq/tools/packet.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/acm2/acm_send_test.h b/modules/audio_coding/acm2/acm_send_test.h
index 3479de0..24d230b 100644
--- a/modules/audio_coding/acm2/acm_send_test.h
+++ b/modules/audio_coding/acm2/acm_send_test.h
@@ -17,7 +17,7 @@
 #include "api/audio/audio_frame.h"
 #include "modules/audio_coding/include/audio_coding_module.h"
 #include "modules/audio_coding/neteq/tools/packet_source.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/acm2/audio_coding_module.cc b/modules/audio_coding/acm2/audio_coding_module.cc
index 60da679..2ce768b 100644
--- a/modules/audio_coding/acm2/audio_coding_module.cc
+++ b/modules/audio_coding/acm2/audio_coding_module.cc
@@ -22,7 +22,7 @@
 #include "modules/include/module_common_types_public.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
index a016481..5037bc6 100644
--- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc
+++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
@@ -34,12 +34,12 @@
 #include "modules/audio_coding/neteq/tools/output_wav_file.h"
 #include "modules/audio_coding/neteq/tools/packet.h"
 #include "modules/audio_coding/neteq/tools/rtp_file_source.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/system/arch.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
@@ -47,7 +47,7 @@
 #include "test/gtest.h"
 #include "test/mock_audio_decoder.h"
 #include "test/mock_audio_encoder.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 using ::testing::AtLeast;
 using ::testing::Invoke;
diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc
index 9e47a06..6731d50 100644
--- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc
+++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc
@@ -18,7 +18,7 @@
 #include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h"
 #include "modules/audio_coding/audio_network_adaptor/event_log_writer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h
index 4c1c19b..fc2358b 100644
--- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h
+++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h
@@ -20,7 +20,7 @@
 #include "modules/audio_coding/audio_network_adaptor/debug_dump_writer.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
index be9550a..76531d0 100644
--- a/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
@@ -18,7 +18,7 @@
 #include "modules/audio_coding/audio_network_adaptor/mock/mock_controller.h"
 #include "modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h"
 #include "modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
 
diff --git a/modules/audio_coding/audio_network_adaptor/bitrate_controller.h b/modules/audio_coding/audio_network_adaptor/bitrate_controller.h
index 6b6330b..41bfbd1 100644
--- a/modules/audio_coding/audio_network_adaptor/bitrate_controller.h
+++ b/modules/audio_coding/audio_network_adaptor/bitrate_controller.h
@@ -16,7 +16,7 @@
 #include "absl/types/optional.h"
 #include "modules/audio_coding/audio_network_adaptor/controller.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace audio_network_adaptor {
diff --git a/modules/audio_coding/audio_network_adaptor/channel_controller.h b/modules/audio_coding/audio_network_adaptor/channel_controller.h
index 0d775b1..f211f40 100644
--- a/modules/audio_coding/audio_network_adaptor/channel_controller.h
+++ b/modules/audio_coding/audio_network_adaptor/channel_controller.h
@@ -16,7 +16,7 @@
 #include "absl/types/optional.h"
 #include "modules/audio_coding/audio_network_adaptor/controller.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/audio_network_adaptor/controller_manager.cc b/modules/audio_coding/audio_network_adaptor/controller_manager.cc
index 6c99561..91c359d 100644
--- a/modules/audio_coding/audio_network_adaptor/controller_manager.cc
+++ b/modules/audio_coding/audio_network_adaptor/controller_manager.cc
@@ -22,7 +22,7 @@
 #include "modules/audio_coding/audio_network_adaptor/frame_length_controller.h"
 #include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h"
 #include "rtc_base/ignore_wundef.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 #if WEBRTC_ENABLE_PROTOBUF
 RTC_PUSH_IGNORING_WUNDEF()
diff --git a/modules/audio_coding/audio_network_adaptor/controller_manager.h b/modules/audio_coding/audio_network_adaptor/controller_manager.h
index 1ff9bbf..4980085 100644
--- a/modules/audio_coding/audio_network_adaptor/controller_manager.h
+++ b/modules/audio_coding/audio_network_adaptor/controller_manager.h
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "modules/audio_coding/audio_network_adaptor/controller.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/protobuf_utils.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc b/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
index 061e4aa..2bdea19 100644
--- a/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
+++ b/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
@@ -13,7 +13,7 @@
 #include "modules/audio_coding/audio_network_adaptor/controller_manager.h"
 #include "modules/audio_coding/audio_network_adaptor/mock/mock_controller.h"
 #include "modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/ignore_wundef.h"
 #include "rtc_base/protobuf_utils.h"
 #include "test/gtest.h"
diff --git a/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h
index b464eb6..367f659 100644
--- a/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h
+++ b/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h
@@ -15,7 +15,7 @@
 
 #include "modules/audio_coding/audio_network_adaptor/controller.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/ignore_wundef.h"
 #include "rtc_base/system/file_wrapper.h"
 #if WEBRTC_ENABLE_PROTOBUF
diff --git a/modules/audio_coding/audio_network_adaptor/dtx_controller.h b/modules/audio_coding/audio_network_adaptor/dtx_controller.h
index d3334ec..83fdf3d 100644
--- a/modules/audio_coding/audio_network_adaptor/dtx_controller.h
+++ b/modules/audio_coding/audio_network_adaptor/dtx_controller.h
@@ -14,7 +14,7 @@
 #include "absl/types/optional.h"
 #include "modules/audio_coding/audio_network_adaptor/controller.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/audio_network_adaptor/event_log_writer.h b/modules/audio_coding/audio_network_adaptor/event_log_writer.h
index 72b5245..c5e57e6 100644
--- a/modules/audio_coding/audio_network_adaptor/event_log_writer.h
+++ b/modules/audio_coding/audio_network_adaptor/event_log_writer.h
@@ -12,7 +12,7 @@
 #define MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_
 
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 class RtcEventLog;
diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h
index b7d3d56..87afe2e 100644
--- a/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h
+++ b/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h
@@ -18,7 +18,7 @@
 #include "modules/audio_coding/audio_network_adaptor/controller.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
 #include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h
index 421cb70..c547bff 100644
--- a/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h
+++ b/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h
@@ -15,7 +15,7 @@
 #include "modules/audio_coding/audio_network_adaptor/controller.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
 #include "modules/audio_coding/audio_network_adaptor/util/threshold_curve.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/audio_network_adaptor/frame_length_controller.h b/modules/audio_coding/audio_network_adaptor/frame_length_controller.h
index c852704..e182247 100644
--- a/modules/audio_coding/audio_network_adaptor/frame_length_controller.h
+++ b/modules/audio_coding/audio_network_adaptor/frame_length_controller.h
@@ -18,7 +18,7 @@
 #include "absl/types/optional.h"
 #include "modules/audio_coding/audio_network_adaptor/controller.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
index e3655b4..3ecefd4 100644
--- a/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
+++ b/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc
@@ -13,7 +13,7 @@
 
 #include "common_audio/vad/mock/mock_vad.h"
 #include "modules/audio_coding/codecs/cng/audio_encoder_cng.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 #include "test/mock_audio_encoder.h"
diff --git a/modules/audio_coding/codecs/cng/cng_unittest.cc b/modules/audio_coding/codecs/cng/cng_unittest.cc
index 81688b1..80349e2 100644
--- a/modules/audio_coding/codecs/cng/cng_unittest.cc
+++ b/modules/audio_coding/codecs/cng/cng_unittest.cc
@@ -12,7 +12,7 @@
 
 #include "modules/audio_coding/codecs/cng/webrtc_cng.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/g711/audio_decoder_pcm.h b/modules/audio_coding/codecs/g711/audio_decoder_pcm.h
index 9a01b8a..8fae71c 100644
--- a/modules/audio_coding/codecs/g711/audio_decoder_pcm.h
+++ b/modules/audio_coding/codecs/g711/audio_decoder_pcm.h
@@ -18,7 +18,7 @@
 #include "api/audio_codecs/audio_decoder.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/g711/audio_encoder_pcm.h b/modules/audio_coding/codecs/g711/audio_encoder_pcm.h
index 88668d9..e41c2a3 100644
--- a/modules/audio_coding/codecs/g711/audio_encoder_pcm.h
+++ b/modules/audio_coding/codecs/g711/audio_encoder_pcm.h
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "api/audio_codecs/audio_encoder.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/g722/audio_decoder_g722.h b/modules/audio_coding/codecs/g722/audio_decoder_g722.h
index 3240448..6911e0b 100644
--- a/modules/audio_coding/codecs/g722/audio_decoder_g722.h
+++ b/modules/audio_coding/codecs/g722/audio_decoder_g722.h
@@ -12,7 +12,7 @@
 #define MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_
 
 #include "api/audio_codecs/audio_decoder.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 typedef struct WebRtcG722DecInst G722DecInst;
 
diff --git a/modules/audio_coding/codecs/g722/audio_encoder_g722.h b/modules/audio_coding/codecs/g722/audio_encoder_g722.h
index d0d23ca..cf45fb5 100644
--- a/modules/audio_coding/codecs/g722/audio_encoder_g722.h
+++ b/modules/audio_coding/codecs/g722/audio_encoder_g722.h
@@ -17,7 +17,7 @@
 #include "api/audio_codecs/g722/audio_encoder_g722_config.h"
 #include "modules/audio_coding/codecs/g722/g722_interface.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h
index fcb2074..d73ef0d 100644
--- a/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h
+++ b/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h
@@ -17,7 +17,7 @@
 
 #include "api/audio_codecs/audio_decoder.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 typedef struct iLBC_decinst_t_ IlbcDecoderInstance;
 
diff --git a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h
index 675dc7d..ada613b 100644
--- a/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h
+++ b/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h
@@ -14,7 +14,7 @@
 #include "api/audio_codecs/audio_encoder.h"
 #include "api/audio_codecs/ilbc/audio_encoder_ilbc_config.h"
 #include "modules/audio_coding/codecs/ilbc/ilbc.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h b/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h
index f840ffa..ab9a6ed 100644
--- a/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h
+++ b/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h
@@ -16,7 +16,7 @@
 #include "absl/types/optional.h"
 #include "api/audio_codecs/audio_decoder.h"
 #include "modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h b/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h
index 2989898..91eb1fd 100644
--- a/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h
+++ b/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h
@@ -15,7 +15,7 @@
 
 #include "api/audio_codecs/audio_encoder.h"
 #include "modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/codecs/isac/locked_bandwidth_info.h b/modules/audio_coding/codecs/isac/locked_bandwidth_info.h
index 37074f8..0b1bc7d 100644
--- a/modules/audio_coding/codecs/isac/locked_bandwidth_info.h
+++ b/modules/audio_coding/codecs/isac/locked_bandwidth_info.h
@@ -12,8 +12,8 @@
 #define MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_
 
 #include "modules/audio_coding/codecs/isac/bandwidth_info.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc b/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
index 3ec28cc..6d9b013 100644
--- a/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
+++ b/modules/audio_coding/codecs/isac/main/source/isac_unittest.cc
@@ -11,7 +11,7 @@
 
 #include "modules/audio_coding/codecs/isac/main/include/isac.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 struct WebRtcISACStruct;
 
diff --git a/modules/audio_coding/codecs/isac/unittest.cc b/modules/audio_coding/codecs/isac/unittest.cc
index 5855d56..6791745 100644
--- a/modules/audio_coding/codecs/isac/unittest.cc
+++ b/modules/audio_coding/codecs/isac/unittest.cc
@@ -19,7 +19,7 @@
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/opus/audio_decoder_opus.h b/modules/audio_coding/codecs/opus/audio_decoder_opus.h
index 8043425..d8cc5c1 100644
--- a/modules/audio_coding/codecs/opus/audio_decoder_opus.h
+++ b/modules/audio_coding/codecs/opus/audio_decoder_opus.h
@@ -18,7 +18,7 @@
 #include "api/audio_codecs/audio_decoder.h"
 #include "modules/audio_coding/codecs/opus/opus_interface.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
index a5c4380..0b8f29f 100644
--- a/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
+++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
@@ -27,7 +27,7 @@
 #include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/protobuf_utils.h"
 #include "rtc_base/string_to_number.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus.h b/modules/audio_coding/codecs/opus/audio_encoder_opus.h
index 7d051d5..4533d73 100644
--- a/modules/audio_coding/codecs/opus/audio_encoder_opus.h
+++ b/modules/audio_coding/codecs/opus/audio_encoder_opus.h
@@ -23,7 +23,7 @@
 #include "common_audio/smoothing_filter.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
 #include "modules/audio_coding/codecs/opus/opus_interface.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/protobuf_utils.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
index a0e24da..6b34361 100644
--- a/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
+++ b/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
@@ -20,11 +20,11 @@
 #include "modules/audio_coding/codecs/opus/opus_interface.h"
 #include "modules/audio_coding/neteq/tools/audio_loop.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "test/field_trial.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 using ::testing::NiceMock;
diff --git a/modules/audio_coding/codecs/opus/opus_bandwidth_unittest.cc b/modules/audio_coding/codecs/opus/opus_bandwidth_unittest.cc
index 7e6b626..2c8edf0 100644
--- a/modules/audio_coding/codecs/opus/opus_bandwidth_unittest.cc
+++ b/modules/audio_coding/codecs/opus/opus_bandwidth_unittest.cc
@@ -16,7 +16,7 @@
 #include "modules/audio_coding/neteq/tools/audio_loop.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace {
diff --git a/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc b/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc
index 4c9174d..84bad33 100644
--- a/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc
+++ b/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc
@@ -11,9 +11,9 @@
 #include "api/audio_codecs/opus/audio_encoder_opus.h"
 #include "modules/audio_coding/neteq/tools/audio_loop.h"
 #include "rtc_base/format_macros.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "test/testsupport/perf_test.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/codecs/opus/opus_fec_test.cc b/modules/audio_coding/codecs/opus/opus_fec_test.cc
index 4fab8a7..cd70821 100644
--- a/modules/audio_coding/codecs/opus/opus_fec_test.cc
+++ b/modules/audio_coding/codecs/opus/opus_fec_test.cc
@@ -13,7 +13,7 @@
 #include "modules/audio_coding/codecs/opus/opus_interface.h"
 #include "rtc_base/format_macros.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 using std::string;
 using std::tuple;
diff --git a/modules/audio_coding/codecs/opus/opus_unittest.cc b/modules/audio_coding/codecs/opus/opus_unittest.cc
index 034f8cd..e5f0464 100644
--- a/modules/audio_coding/codecs/opus/opus_unittest.cc
+++ b/modules/audio_coding/codecs/opus/opus_unittest.cc
@@ -17,7 +17,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h
index 9b478d8..0334104 100644
--- a/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h
+++ b/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h
@@ -17,7 +17,7 @@
 
 #include "api/audio_codecs/audio_decoder.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h
index 6a20843..71c7572 100644
--- a/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h
+++ b/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h
@@ -12,7 +12,7 @@
 #define MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_
 
 #include "modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/red/audio_encoder_copy_red.h b/modules/audio_coding/codecs/red/audio_encoder_copy_red.h
index 5a68876..f05de19 100644
--- a/modules/audio_coding/codecs/red/audio_encoder_copy_red.h
+++ b/modules/audio_coding/codecs/red/audio_encoder_copy_red.h
@@ -19,7 +19,7 @@
 #include "api/array_view.h"
 #include "api/audio_codecs/audio_encoder.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
index c539152..1e6b4f0 100644
--- a/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
+++ b/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
@@ -12,7 +12,7 @@
 
 #include "rtc_base/format_macros.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 using ::std::get;
 
diff --git a/modules/audio_coding/neteq/accelerate.h b/modules/audio_coding/neteq/accelerate.h
index 1a3af42..124b633 100644
--- a/modules/audio_coding/neteq/accelerate.h
+++ b/modules/audio_coding/neteq/accelerate.h
@@ -15,7 +15,7 @@
 #include <stdint.h>
 
 #include "modules/audio_coding/neteq/time_stretch.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/audio_decoder_unittest.cc b/modules/audio_coding/neteq/audio_decoder_unittest.cc
index 1ad4835..42d96db 100644
--- a/modules/audio_coding/neteq/audio_decoder_unittest.cc
+++ b/modules/audio_coding/neteq/audio_decoder_unittest.cc
@@ -31,7 +31,7 @@
 #include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
 #include "modules/audio_coding/neteq/tools/resample_input_audio_file.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/audio_multi_vector.h b/modules/audio_coding/neteq/audio_multi_vector.h
index a2dd3c3..a21bf57 100644
--- a/modules/audio_coding/neteq/audio_multi_vector.h
+++ b/modules/audio_coding/neteq/audio_multi_vector.h
@@ -17,7 +17,7 @@
 
 #include "api/array_view.h"
 #include "modules/audio_coding/neteq/audio_vector.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/audio_vector.h b/modules/audio_coding/neteq/audio_vector.h
index d0db332..c8279da 100644
--- a/modules/audio_coding/neteq/audio_vector.h
+++ b/modules/audio_coding/neteq/audio_vector.h
@@ -16,7 +16,7 @@
 #include <memory>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/background_noise.h b/modules/audio_coding/neteq/background_noise.h
index 84d7eb9..d047942 100644
--- a/modules/audio_coding/neteq/background_noise.h
+++ b/modules/audio_coding/neteq/background_noise.h
@@ -14,7 +14,7 @@
 #include <string.h>  // size_t
 #include <memory>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/buffer_level_filter.h b/modules/audio_coding/neteq/buffer_level_filter.h
index c8d27dc..83388fb 100644
--- a/modules/audio_coding/neteq/buffer_level_filter.h
+++ b/modules/audio_coding/neteq/buffer_level_filter.h
@@ -13,7 +13,7 @@
 
 #include <stddef.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/comfort_noise.h b/modules/audio_coding/neteq/comfort_noise.h
index 3a9bfde..f748772 100644
--- a/modules/audio_coding/neteq/comfort_noise.h
+++ b/modules/audio_coding/neteq/comfort_noise.h
@@ -13,7 +13,7 @@
 
 #include <stddef.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/decision_logic.h b/modules/audio_coding/neteq/decision_logic.h
index 2a53359..75f8a88 100644
--- a/modules/audio_coding/neteq/decision_logic.h
+++ b/modules/audio_coding/neteq/decision_logic.h
@@ -13,7 +13,7 @@
 
 #include "modules/audio_coding/neteq/defines.h"
 #include "modules/audio_coding/neteq/tick_timer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/decoder_database.h b/modules/audio_coding/neteq/decoder_database.h
index f016337..1992272 100644
--- a/modules/audio_coding/neteq/decoder_database.h
+++ b/modules/audio_coding/neteq/decoder_database.h
@@ -19,7 +19,7 @@
 #include "api/audio_codecs/audio_format.h"
 #include "modules/audio_coding/codecs/cng/webrtc_cng.h"
 #include "modules/audio_coding/neteq/packet.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/neteq/decoder_database_unittest.cc b/modules/audio_coding/neteq/decoder_database_unittest.cc
index 0d7e57a..9a28cac 100644
--- a/modules/audio_coding/neteq/decoder_database_unittest.cc
+++ b/modules/audio_coding/neteq/decoder_database_unittest.cc
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 #include "test/mock_audio_decoder.h"
diff --git a/modules/audio_coding/neteq/delay_manager.h b/modules/audio_coding/neteq/delay_manager.h
index ce05bcc..25eaba3 100644
--- a/modules/audio_coding/neteq/delay_manager.h
+++ b/modules/audio_coding/neteq/delay_manager.h
@@ -18,7 +18,7 @@
 
 #include "absl/types/optional.h"
 #include "modules/audio_coding/neteq/tick_timer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/delay_peak_detector.h b/modules/audio_coding/neteq/delay_peak_detector.h
index 5c74117..8cd198d 100644
--- a/modules/audio_coding/neteq/delay_peak_detector.h
+++ b/modules/audio_coding/neteq/delay_peak_detector.h
@@ -17,7 +17,7 @@
 #include <memory>
 
 #include "modules/audio_coding/neteq/tick_timer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/dsp_helper.h b/modules/audio_coding/neteq/dsp_helper.h
index 8379461..82fe14e 100644
--- a/modules/audio_coding/neteq/dsp_helper.h
+++ b/modules/audio_coding/neteq/dsp_helper.h
@@ -16,7 +16,7 @@
 
 #include "modules/audio_coding/neteq/audio_multi_vector.h"
 #include "modules/audio_coding/neteq/audio_vector.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/dtmf_buffer.h b/modules/audio_coding/neteq/dtmf_buffer.h
index 24b14ec..a994e3a 100644
--- a/modules/audio_coding/neteq/dtmf_buffer.h
+++ b/modules/audio_coding/neteq/dtmf_buffer.h
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include <list>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/dtmf_tone_generator.h b/modules/audio_coding/neteq/dtmf_tone_generator.h
index 22e166e..968bc7f 100644
--- a/modules/audio_coding/neteq/dtmf_tone_generator.h
+++ b/modules/audio_coding/neteq/dtmf_tone_generator.h
@@ -15,7 +15,7 @@
 #include <stdint.h>
 
 #include "modules/audio_coding/neteq/audio_multi_vector.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/expand.h b/modules/audio_coding/neteq/expand.h
index 30c34a2..7c041b8 100644
--- a/modules/audio_coding/neteq/expand.h
+++ b/modules/audio_coding/neteq/expand.h
@@ -15,7 +15,7 @@
 #include <memory>
 
 #include "modules/audio_coding/neteq/audio_vector.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/expand_uma_logger.h b/modules/audio_coding/neteq/expand_uma_logger.h
index bd079c6..7cb11b1 100644
--- a/modules/audio_coding/neteq/expand_uma_logger.h
+++ b/modules/audio_coding/neteq/expand_uma_logger.h
@@ -16,7 +16,7 @@
 
 #include "absl/types/optional.h"
 #include "modules/audio_coding/neteq/tick_timer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/expand_unittest.cc b/modules/audio_coding/neteq/expand_unittest.cc
index 09914da..4c8c174 100644
--- a/modules/audio_coding/neteq/expand_unittest.cc
+++ b/modules/audio_coding/neteq/expand_unittest.cc
@@ -20,7 +20,7 @@
 #include "modules/audio_coding/neteq/tools/resample_input_audio_file.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/include/neteq.h b/modules/audio_coding/neteq/include/neteq.h
index dec49c1..6eecc65 100644
--- a/modules/audio_coding/neteq/include/neteq.h
+++ b/modules/audio_coding/neteq/include/neteq.h
@@ -23,7 +23,7 @@
 #include "api/audio_codecs/audio_format.h"
 #include "api/rtp_headers.h"
 #include "modules/audio_coding/neteq/defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/neteq/merge.h b/modules/audio_coding/neteq/merge.h
index e7e0bf9..a062a95 100644
--- a/modules/audio_coding/neteq/merge.h
+++ b/modules/audio_coding/neteq/merge.h
@@ -12,7 +12,7 @@
 #define MODULES_AUDIO_CODING_NETEQ_MERGE_H_
 
 #include "modules/audio_coding/neteq/audio_multi_vector.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc b/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc
index 0474e4a..21b15a9 100644
--- a/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_decoder_plc_unittest.cc
@@ -24,10 +24,10 @@
 #include "modules/audio_coding/neteq/tools/input_audio_file.h"
 #include "modules/audio_coding/neteq/tools/neteq_test.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/audio_decoder_proxy_factory.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
index 6daa42e..8214ed2 100644
--- a/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc
@@ -20,7 +20,7 @@
 #include "modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gmock.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/neteq_impl.h b/modules/audio_coding/neteq/neteq_impl.h
index 4dcab2a..d239627 100644
--- a/modules/audio_coding/neteq/neteq_impl.h
+++ b/modules/audio_coding/neteq/neteq_impl.h
@@ -24,8 +24,8 @@
 #include "modules/audio_coding/neteq/random_vector.h"
 #include "modules/audio_coding/neteq/statistics_calculator.h"
 #include "modules/audio_coding/neteq/tick_timer.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
index 72a75d1..79059b7 100644
--- a/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_network_stats_unittest.cc
@@ -17,7 +17,7 @@
 
 #include "modules/audio_coding/neteq/include/neteq.h"
 #include "modules/audio_coding/neteq/tools/rtp_generator.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/audio_decoder_proxy_factory.h"
 #include "test/gmock.h"
 
diff --git a/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/modules/audio_coding/neteq/neteq_stereo_unittest.cc
index 85dfc08..289a38d 100644
--- a/modules/audio_coding/neteq/neteq_stereo_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_stereo_unittest.cc
@@ -23,7 +23,7 @@
 #include "modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc
index 6e00413..b562ede 100644
--- a/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_unittest.cc
@@ -31,15 +31,15 @@
 #include "modules/rtp_rtcp/include/rtcp_statistics.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "rtc_base/ignore_wundef.h"
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/protobuf_utils.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/system/arch.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 // This must come after test/gtest.h
 #include "rtc_base/flags.h"  // NOLINT(build/include)
diff --git a/modules/audio_coding/neteq/normal.h b/modules/audio_coding/neteq/normal.h
index 80451b5..2059c5a 100644
--- a/modules/audio_coding/neteq/normal.h
+++ b/modules/audio_coding/neteq/normal.h
@@ -16,7 +16,7 @@
 
 #include "modules/audio_coding/neteq/defines.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/numerics/safe_conversions.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/neteq/packet_buffer.h b/modules/audio_coding/neteq/packet_buffer.h
index 0f5cd7f..c594d19 100644
--- a/modules/audio_coding/neteq/packet_buffer.h
+++ b/modules/audio_coding/neteq/packet_buffer.h
@@ -15,7 +15,7 @@
 #include "modules/audio_coding/neteq/decoder_database.h"
 #include "modules/audio_coding/neteq/packet.h"
 #include "modules/include/module_common_types_public.h"  // IsNewerTimestamp
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/post_decode_vad.h b/modules/audio_coding/neteq/post_decode_vad.h
index 27d69a6..ca7cabf 100644
--- a/modules/audio_coding/neteq/post_decode_vad.h
+++ b/modules/audio_coding/neteq/post_decode_vad.h
@@ -16,7 +16,7 @@
 
 #include "api/audio_codecs/audio_decoder.h"
 #include "common_audio/vad/include/webrtc_vad.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/preemptive_expand.h b/modules/audio_coding/neteq/preemptive_expand.h
index 0f7b3bc..e7d2bad 100644
--- a/modules/audio_coding/neteq/preemptive_expand.h
+++ b/modules/audio_coding/neteq/preemptive_expand.h
@@ -15,7 +15,7 @@
 #include <stdint.h>
 
 #include "modules/audio_coding/neteq/time_stretch.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/random_vector.h b/modules/audio_coding/neteq/random_vector.h
index e8c7ba8..1d37600 100644
--- a/modules/audio_coding/neteq/random_vector.h
+++ b/modules/audio_coding/neteq/random_vector.h
@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/red_payload_splitter.h b/modules/audio_coding/neteq/red_payload_splitter.h
index 55063e7..c2e0a44 100644
--- a/modules/audio_coding/neteq/red_payload_splitter.h
+++ b/modules/audio_coding/neteq/red_payload_splitter.h
@@ -12,7 +12,7 @@
 #define MODULES_AUDIO_CODING_NETEQ_RED_PAYLOAD_SPLITTER_H_
 
 #include "modules/audio_coding/neteq/packet.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/statistics_calculator.h b/modules/audio_coding/neteq/statistics_calculator.h
index 49b74a0..1dee643 100644
--- a/modules/audio_coding/neteq/statistics_calculator.h
+++ b/modules/audio_coding/neteq/statistics_calculator.h
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "modules/audio_coding/neteq/include/neteq.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/sync_buffer.h b/modules/audio_coding/neteq/sync_buffer.h
index d645e91..7f6c111 100644
--- a/modules/audio_coding/neteq/sync_buffer.h
+++ b/modules/audio_coding/neteq/sync_buffer.h
@@ -19,7 +19,7 @@
 #include "modules/audio_coding/neteq/audio_multi_vector.h"
 #include "modules/audio_coding/neteq/audio_vector.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc b/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc
index b88c856..09b3728 100644
--- a/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc
+++ b/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc
@@ -15,7 +15,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/flags.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 using testing::InitGoogleTest;
 
diff --git a/modules/audio_coding/neteq/test/neteq_pcm16b_quality_test.cc b/modules/audio_coding/neteq/test/neteq_pcm16b_quality_test.cc
index cd38433..3557b11 100644
--- a/modules/audio_coding/neteq/test/neteq_pcm16b_quality_test.cc
+++ b/modules/audio_coding/neteq/test/neteq_pcm16b_quality_test.cc
@@ -16,7 +16,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/flags.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 using testing::InitGoogleTest;
 
diff --git a/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc b/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc
index 421e5f2..ce399a4 100644
--- a/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc
+++ b/modules/audio_coding/neteq/test/neteq_pcmu_quality_test.cc
@@ -15,7 +15,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/flags.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 using testing::InitGoogleTest;
 
diff --git a/modules/audio_coding/neteq/tick_timer.h b/modules/audio_coding/neteq/tick_timer.h
index 02f083e..724dd12 100644
--- a/modules/audio_coding/neteq/tick_timer.h
+++ b/modules/audio_coding/neteq/tick_timer.h
@@ -15,7 +15,7 @@
 #include <memory>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/time_stretch.h b/modules/audio_coding/neteq/time_stretch.h
index 13ad2c8..9f86649 100644
--- a/modules/audio_coding/neteq/time_stretch.h
+++ b/modules/audio_coding/neteq/time_stretch.h
@@ -15,7 +15,7 @@
 #include <string.h>  // memset, size_t
 
 #include "modules/audio_coding/neteq/audio_multi_vector.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/time_stretch_unittest.cc b/modules/audio_coding/neteq/time_stretch_unittest.cc
index c96c7d4..6fced38 100644
--- a/modules/audio_coding/neteq/time_stretch_unittest.cc
+++ b/modules/audio_coding/neteq/time_stretch_unittest.cc
@@ -21,7 +21,7 @@
 #include "modules/audio_coding/neteq/tools/input_audio_file.h"
 #include "rtc_base/checks.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/timestamp_scaler.h b/modules/audio_coding/neteq/timestamp_scaler.h
index 62f535c..93cb953 100644
--- a/modules/audio_coding/neteq/timestamp_scaler.h
+++ b/modules/audio_coding/neteq/timestamp_scaler.h
@@ -12,7 +12,7 @@
 #define MODULES_AUDIO_CODING_NETEQ_TIMESTAMP_SCALER_H_
 
 #include "modules/audio_coding/neteq/packet.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/tools/audio_checksum.h b/modules/audio_coding/neteq/tools/audio_checksum.h
index ee8c582..e4306fa 100644
--- a/modules/audio_coding/neteq/tools/audio_checksum.h
+++ b/modules/audio_coding/neteq/tools/audio_checksum.h
@@ -16,9 +16,9 @@
 
 #include "modules/audio_coding/neteq/tools/audio_sink.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/system/arch.h"
 
 namespace webrtc {
diff --git a/modules/audio_coding/neteq/tools/audio_loop.h b/modules/audio_coding/neteq/tools/audio_loop.h
index c7788a6..cd764cc 100644
--- a/modules/audio_coding/neteq/tools/audio_loop.h
+++ b/modules/audio_coding/neteq/tools/audio_loop.h
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "api/array_view.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/tools/audio_sink.h b/modules/audio_coding/neteq/tools/audio_sink.h
index be2a315..68825eb 100644
--- a/modules/audio_coding/neteq/tools/audio_sink.h
+++ b/modules/audio_coding/neteq/tools/audio_sink.h
@@ -12,7 +12,7 @@
 #define MODULES_AUDIO_CODING_NETEQ_TOOLS_AUDIO_SINK_H_
 
 #include "api/audio/audio_frame.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h b/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h
index 117fabd..7adb15b 100644
--- a/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h
+++ b/modules/audio_coding/neteq/tools/constant_pcm_packet_source.h
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "modules/audio_coding/neteq/tools/packet_source.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/tools/input_audio_file.h b/modules/audio_coding/neteq/tools/input_audio_file.h
index b36dc24..4335a99 100644
--- a/modules/audio_coding/neteq/tools/input_audio_file.h
+++ b/modules/audio_coding/neteq/tools/input_audio_file.h
@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/tools/neteq_performance_test.cc b/modules/audio_coding/neteq/tools/neteq_performance_test.cc
index bd78ca4..61f52bb 100644
--- a/modules/audio_coding/neteq/tools/neteq_performance_test.cc
+++ b/modules/audio_coding/neteq/tools/neteq_performance_test.cc
@@ -18,7 +18,7 @@
 #include "modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "rtc_base/checks.h"
 #include "system_wrappers/include/clock.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 using webrtc::NetEq;
 using webrtc::test::AudioLoop;
diff --git a/modules/audio_coding/neteq/tools/neteq_quality_test.cc b/modules/audio_coding/neteq/tools/neteq_quality_test.cc
index 5a38255..a0e7667 100644
--- a/modules/audio_coding/neteq/tools/neteq_quality_test.cc
+++ b/modules/audio_coding/neteq/tools/neteq_quality_test.cc
@@ -17,7 +17,7 @@
 #include "modules/audio_coding/neteq/tools/output_wav_file.h"
 #include "modules/audio_coding/neteq/tools/resample_input_audio_file.h"
 #include "rtc_base/checks.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/tools/neteq_stats_getter.cc b/modules/audio_coding/neteq/tools/neteq_stats_getter.cc
index 1a52176..291fc24 100644
--- a/modules/audio_coding/neteq/tools/neteq_stats_getter.cc
+++ b/modules/audio_coding/neteq/tools/neteq_stats_getter.cc
@@ -16,7 +16,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/tools/neteq_test_factory.cc b/modules/audio_coding/neteq/tools/neteq_test_factory.cc
index 76ff56c..accaaed 100644
--- a/modules/audio_coding/neteq/tools/neteq_test_factory.cc
+++ b/modules/audio_coding/neteq/tools/neteq_test_factory.cc
@@ -38,9 +38,9 @@
 #include "modules/audio_coding/neteq/tools/rtp_file_source.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/flags.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/function_audio_decoder_factory.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/tools/output_audio_file.h b/modules/audio_coding/neteq/tools/output_audio_file.h
index 7e65bc2..c923a1e 100644
--- a/modules/audio_coding/neteq/tools/output_audio_file.h
+++ b/modules/audio_coding/neteq/tools/output_audio_file.h
@@ -16,7 +16,7 @@
 #include <string>
 
 #include "modules/audio_coding/neteq/tools/audio_sink.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/tools/output_wav_file.h b/modules/audio_coding/neteq/tools/output_wav_file.h
index 031a8cb..3ffcfc6 100644
--- a/modules/audio_coding/neteq/tools/output_wav_file.h
+++ b/modules/audio_coding/neteq/tools/output_wav_file.h
@@ -15,7 +15,7 @@
 
 #include "common_audio/wav_file.h"
 #include "modules/audio_coding/neteq/tools/audio_sink.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/tools/packet.h b/modules/audio_coding/neteq/tools/packet.h
index 1fe1000..5748ba2 100644
--- a/modules/audio_coding/neteq/tools/packet.h
+++ b/modules/audio_coding/neteq/tools/packet.h
@@ -15,7 +15,7 @@
 #include <memory>
 
 #include "api/rtp_headers.h"  // NOLINT(build/include)
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/tools/packet_source.h b/modules/audio_coding/neteq/tools/packet_source.h
index cb86a98..975680f 100644
--- a/modules/audio_coding/neteq/tools/packet_source.h
+++ b/modules/audio_coding/neteq/tools/packet_source.h
@@ -15,7 +15,7 @@
 #include <memory>
 
 #include "modules/audio_coding/neteq/tools/packet.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/tools/resample_input_audio_file.h b/modules/audio_coding/neteq/tools/resample_input_audio_file.h
index 4e2e9b0..d961f33 100644
--- a/modules/audio_coding/neteq/tools/resample_input_audio_file.h
+++ b/modules/audio_coding/neteq/tools/resample_input_audio_file.h
@@ -15,7 +15,7 @@
 
 #include "common_audio/resampler/include/resampler.h"
 #include "modules/audio_coding/neteq/tools/input_audio_file.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/neteq/tools/rtc_event_log_source.h b/modules/audio_coding/neteq/tools/rtc_event_log_source.h
index ea620da..5238efb 100644
--- a/modules/audio_coding/neteq/tools/rtc_event_log_source.h
+++ b/modules/audio_coding/neteq/tools/rtc_event_log_source.h
@@ -19,7 +19,7 @@
 #include "logging/rtc_event_log/rtc_event_log_parser.h"
 #include "modules/audio_coding/neteq/tools/packet_source.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/tools/rtp_file_source.h b/modules/audio_coding/neteq/tools/rtp_file_source.h
index 7cb9a89..77e435a 100644
--- a/modules/audio_coding/neteq/tools/rtp_file_source.h
+++ b/modules/audio_coding/neteq/tools/rtp_file_source.h
@@ -19,7 +19,7 @@
 #include "absl/types/optional.h"
 #include "modules/audio_coding/neteq/tools/packet_source.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/neteq/tools/rtp_generator.h b/modules/audio_coding/neteq/tools/rtp_generator.h
index a1a360f..1454c57 100644
--- a/modules/audio_coding/neteq/tools/rtp_generator.h
+++ b/modules/audio_coding/neteq/tools/rtp_generator.h
@@ -12,7 +12,7 @@
 #define MODULES_AUDIO_CODING_NETEQ_TOOLS_RTP_GENERATOR_H_
 
 #include "api/rtp_headers.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_coding/test/Channel.cc b/modules/audio_coding/test/Channel.cc
index 8cb5baa..4cb6c35 100644
--- a/modules/audio_coding/test/Channel.cc
+++ b/modules/audio_coding/test/Channel.cc
@@ -14,7 +14,7 @@
 #include <iostream>
 
 #include "rtc_base/format_macros.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/test/Channel.h b/modules/audio_coding/test/Channel.h
index eb197c6..e428a71 100644
--- a/modules/audio_coding/test/Channel.h
+++ b/modules/audio_coding/test/Channel.h
@@ -15,7 +15,7 @@
 
 #include "modules/audio_coding/include/audio_coding_module.h"
 #include "modules/include/module_common_types.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/test/EncodeDecodeTest.cc b/modules/audio_coding/test/EncodeDecodeTest.cc
index 6ca7408..fbbc9d3 100644
--- a/modules/audio_coding/test/EncodeDecodeTest.cc
+++ b/modules/audio_coding/test/EncodeDecodeTest.cc
@@ -19,7 +19,7 @@
 #include "modules/audio_coding/include/audio_coding_module.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/test/PacketLossTest.cc b/modules/audio_coding/test/PacketLossTest.cc
index 6f87659..000041b 100644
--- a/modules/audio_coding/test/PacketLossTest.cc
+++ b/modules/audio_coding/test/PacketLossTest.cc
@@ -15,7 +15,7 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/test/TestAllCodecs.cc b/modules/audio_coding/test/TestAllCodecs.cc
index aad80e8..75ba60a 100644
--- a/modules/audio_coding/test/TestAllCodecs.cc
+++ b/modules/audio_coding/test/TestAllCodecs.cc
@@ -20,10 +20,10 @@
 #include "modules/audio_coding/include/audio_coding_module_typedefs.h"
 #include "modules/include/module_common_types.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 // Description of the test:
 // In this test we set up a one-way communication channel from a participant
diff --git a/modules/audio_coding/test/TestRedFec.cc b/modules/audio_coding/test/TestRedFec.cc
index b284205..0cb2415 100644
--- a/modules/audio_coding/test/TestRedFec.cc
+++ b/modules/audio_coding/test/TestRedFec.cc
@@ -31,7 +31,7 @@
 #include "modules/audio_coding/include/audio_coding_module_typedefs.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc
index dd4be6a5..70065fb 100644
--- a/modules/audio_coding/test/TestStereo.cc
+++ b/modules/audio_coding/test/TestStereo.cc
@@ -19,7 +19,7 @@
 #include "modules/include/module_common_types.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/test/TestVADDTX.cc b/modules/audio_coding/test/TestVADDTX.cc
index 8e16280..7c04b22 100644
--- a/modules/audio_coding/test/TestVADDTX.cc
+++ b/modules/audio_coding/test/TestVADDTX.cc
@@ -25,7 +25,7 @@
 #include "modules/audio_coding/test/PCMFile.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/test/Tester.cc b/modules/audio_coding/test/Tester.cc
index 750656f..56e2c46 100644
--- a/modules/audio_coding/test/Tester.cc
+++ b/modules/audio_coding/test/Tester.cc
@@ -23,7 +23,7 @@
 #include "modules/audio_coding/test/iSACTest.h"
 #include "modules/audio_coding/test/opus_test.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 TEST(AudioCodingModuleTest, TestAllCodecs) {
   webrtc::TestAllCodecs().Perform();
diff --git a/modules/audio_coding/test/TwoWayCommunication.cc b/modules/audio_coding/test/TwoWayCommunication.cc
index 3af114e..585c1db 100644
--- a/modules/audio_coding/test/TwoWayCommunication.cc
+++ b/modules/audio_coding/test/TwoWayCommunication.cc
@@ -20,7 +20,7 @@
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "modules/audio_coding/test/PCMFile.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/test/iSACTest.cc b/modules/audio_coding/test/iSACTest.cc
index 0dceca7..7776a60 100644
--- a/modules/audio_coding/test/iSACTest.cc
+++ b/modules/audio_coding/test/iSACTest.cc
@@ -18,11 +18,11 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/isac/audio_encoder_isac_float.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/test/opus_test.cc b/modules/audio_coding/test/opus_test.cc
index 1e24e5d..b8d8e67 100644
--- a/modules/audio_coding/test/opus_test.cc
+++ b/modules/audio_coding/test/opus_test.cc
@@ -17,7 +17,7 @@
 #include "modules/audio_coding/include/audio_coding_module_typedefs.h"
 #include "modules/audio_coding/test/TestStereo.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_coding/test/target_delay_unittest.cc b/modules/audio_coding/test/target_delay_unittest.cc
index 8d82b6e..c972e62 100644
--- a/modules/audio_coding/test/target_delay_unittest.cc
+++ b/modules/audio_coding/test/target_delay_unittest.cc
@@ -16,7 +16,7 @@
 #include "modules/audio_coding/include/audio_coding_module.h"
 #include "modules/include/module_common_types.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_device/android/aaudio_player.h b/modules/audio_device/android/aaudio_player.h
index a92d508..7173a25 100644
--- a/modules/audio_device/android/aaudio_player.h
+++ b/modules/audio_device/android/aaudio_player.h
@@ -16,7 +16,7 @@
 
 #include "modules/audio_device/android/aaudio_wrapper.h"
 #include "modules/audio_device/include/audio_device_defines.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
diff --git a/modules/audio_device/android/aaudio_recorder.cc b/modules/audio_device/android/aaudio_recorder.cc
index 7eb7b1c..446512e 100644
--- a/modules/audio_device/android/aaudio_recorder.cc
+++ b/modules/audio_device/android/aaudio_recorder.cc
@@ -16,7 +16,7 @@
 #include "modules/audio_device/fine_audio_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/sleep.h"
 
 namespace webrtc {
diff --git a/modules/audio_device/android/aaudio_recorder.h b/modules/audio_device/android/aaudio_recorder.h
index 1b78a01..cfd463f 100644
--- a/modules/audio_device/android/aaudio_recorder.h
+++ b/modules/audio_device/android/aaudio_recorder.h
@@ -16,7 +16,7 @@
 
 #include "modules/audio_device/android/aaudio_wrapper.h"
 #include "modules/audio_device/include/audio_device_defines.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_checker.h"
 
diff --git a/modules/audio_device/android/aaudio_wrapper.cc b/modules/audio_device/android/aaudio_wrapper.cc
index d95a9b4..7e0c9a0 100644
--- a/modules/audio_device/android/aaudio_wrapper.cc
+++ b/modules/audio_device/android/aaudio_wrapper.cc
@@ -13,7 +13,7 @@
 #include "modules/audio_device/android/audio_manager.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 #define LOG_ON_ERROR(op)                                                      \
   do {                                                                        \
diff --git a/modules/audio_device/android/audio_device_unittest.cc b/modules/audio_device/android/audio_device_unittest.cc
index 6e09139c..ec6646c 100644
--- a/modules/audio_device/android/audio_device_unittest.cc
+++ b/modules/audio_device/android/audio_device_unittest.cc
@@ -24,14 +24,14 @@
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_device/include/mock_audio_transport.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 using std::cout;
 using std::endl;
diff --git a/modules/audio_device/android/audio_record_jni.cc b/modules/audio_device/android/audio_record_jni.cc
index 97ba6c6..9205489 100644
--- a/modules/audio_device/android/audio_record_jni.cc
+++ b/modules/audio_device/android/audio_record_jni.cc
@@ -19,7 +19,7 @@
 #include "rtc_base/format_macros.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace webrtc {
diff --git a/modules/audio_device/android/opensles_player.cc b/modules/audio_device/android/opensles_player.cc
index 6f86ba5..921ffd2 100644
--- a/modules/audio_device/android/opensles_player.cc
+++ b/modules/audio_device/android/opensles_player.cc
@@ -21,7 +21,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 #define TAG "OpenSLESPlayer"
 #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__)
diff --git a/modules/audio_device/android/opensles_recorder.cc b/modules/audio_device/android/opensles_recorder.cc
index 6bc1bf5..2d5dbb9 100644
--- a/modules/audio_device/android/opensles_recorder.cc
+++ b/modules/audio_device/android/opensles_recorder.cc
@@ -21,7 +21,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 #define TAG "OpenSLESRecorder"
 #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__)
diff --git a/modules/audio_device/audio_device_buffer.cc b/modules/audio_device/audio_device_buffer.cc
index 8f920cf..052071a 100644
--- a/modules/audio_device/audio_device_buffer.cc
+++ b/modules/audio_device/audio_device_buffer.cc
@@ -18,7 +18,7 @@
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace webrtc {
diff --git a/modules/audio_device/audio_device_buffer.h b/modules/audio_device/audio_device_buffer.h
index bbe2969..37d9ffb 100644
--- a/modules/audio_device/audio_device_buffer.h
+++ b/modules/audio_device/audio_device_buffer.h
@@ -17,7 +17,7 @@
 
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
diff --git a/modules/audio_device/audio_device_data_observer.cc b/modules/audio_device/audio_device_data_observer.cc
index 994c2ef..56ba32b 100644
--- a/modules/audio_device/audio_device_data_observer.cc
+++ b/modules/audio_device/audio_device_data_observer.cc
@@ -12,7 +12,7 @@
 
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc
index c5f4332..3fa95d3 100644
--- a/modules/audio_device/audio_device_impl.cc
+++ b/modules/audio_device/audio_device_impl.cc
@@ -16,7 +16,7 @@
 #include "modules/audio_device/audio_device_generic.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "system_wrappers/include/metrics.h"
 
diff --git a/modules/audio_device/audio_device_unittest.cc b/modules/audio_device/audio_device_unittest.cc
index 5ae48d8..f0ede1b 100644
--- a/modules/audio_device/audio_device_unittest.cc
+++ b/modules/audio_device/audio_device_unittest.cc
@@ -20,7 +20,7 @@
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_device/include/mock_audio_transport.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
@@ -28,7 +28,7 @@
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/modules/audio_device/dummy/file_audio_device.cc b/modules/audio_device/dummy/file_audio_device.cc
index 2848eea..ea736e0 100644
--- a/modules/audio_device/dummy/file_audio_device.cc
+++ b/modules/audio_device/dummy/file_audio_device.cc
@@ -15,7 +15,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/sleep.h"
 
 namespace webrtc {
diff --git a/modules/audio_device/dummy/file_audio_device.h b/modules/audio_device/dummy/file_audio_device.h
index 210c8f7..375c6f6 100644
--- a/modules/audio_device/dummy/file_audio_device.h
+++ b/modules/audio_device/dummy/file_audio_device.h
@@ -17,9 +17,9 @@
 #include <string>
 
 #include "modules/audio_device/audio_device_generic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/system/file_wrapper.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 class PlatformThread;
diff --git a/modules/audio_device/include/audio_device.h b/modules/audio_device/include/audio_device.h
index d73c1e6..c8f7503 100644
--- a/modules/audio_device/include/audio_device.h
+++ b/modules/audio_device/include/audio_device.h
@@ -12,7 +12,7 @@
 #define MODULES_AUDIO_DEVICE_INCLUDE_AUDIO_DEVICE_H_
 
 #include "modules/audio_device/include/audio_device_defines.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/audio_device/include/test_audio_device.cc b/modules/audio_device/include/test_audio_device.cc
index 8aea1d2..98c1612 100644
--- a/modules/audio_device/include/test_audio_device.cc
+++ b/modules/audio_device/include/test_audio_device.cc
@@ -23,16 +23,16 @@
 #include "modules/audio_device/include/test_audio_device.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/random.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_device/include/test_audio_device_unittest.cc b/modules/audio_device/include/test_audio_device_unittest.cc
index bdb1285..8d62084 100644
--- a/modules/audio_device/include/test_audio_device_unittest.cc
+++ b/modules/audio_device/include/test_audio_device_unittest.cc
@@ -18,7 +18,7 @@
 #include "rtc_base/logging.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_device/ios/audio_device_ios.mm b/modules/audio_device/ios/audio_device_ios.mm
index 1aaff1f..8fa34d1 100644
--- a/modules/audio_device/ios/audio_device_ios.mm
+++ b/modules/audio_device/ios/audio_device_ios.mm
@@ -17,14 +17,14 @@
 
 #include "api/array_view.h"
 #include "modules/audio_device/fine_audio_buffer.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/objc/native/src/audio/helpers.h"
 #include "system_wrappers/include/metrics.h"
 
diff --git a/modules/audio_device/ios/audio_device_unittest_ios.mm b/modules/audio_device/ios/audio_device_unittest_ios.mm
index 19ff9c9..983ad5d 100644
--- a/modules/audio_device/ios/audio_device_unittest_ios.mm
+++ b/modules/audio_device/ios/audio_device_unittest_ios.mm
@@ -21,15 +21,15 @@
 #include "modules/audio_device/include/mock_audio_transport.h"
 #include "modules/audio_device/ios/audio_device_ios.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 #import "sdk/objc/components/audio/RTCAudioSession+Private.h"
 #import "sdk/objc/components/audio/RTCAudioSession.h"
diff --git a/modules/audio_device/ios/audio_session_observer.h b/modules/audio_device/ios/audio_session_observer.h
index 13a979b..c79cdd14 100644
--- a/modules/audio_device/ios/audio_session_observer.h
+++ b/modules/audio_device/ios/audio_session_observer.h
@@ -11,7 +11,7 @@
 #ifndef MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_
 #define MODULES_AUDIO_DEVICE_IOS_AUDIO_SESSION_OBSERVER_H_
 
-#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/async_invoker.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/modules/audio_device/linux/audio_device_alsa_linux.h b/modules/audio_device/linux/audio_device_alsa_linux.h
index d60dcaf..69e6e50 100644
--- a/modules/audio_device/linux/audio_device_alsa_linux.h
+++ b/modules/audio_device/linux/audio_device_alsa_linux.h
@@ -15,7 +15,7 @@
 
 #include "modules/audio_device/audio_device_generic.h"
 #include "modules/audio_device/linux/audio_mixer_manager_alsa_linux.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/platform_thread.h"
 
 #if defined(WEBRTC_USE_X11)
diff --git a/modules/audio_device/linux/audio_device_pulse_linux.h b/modules/audio_device/linux/audio_device_pulse_linux.h
index 4de87fc..367d657 100644
--- a/modules/audio_device/linux/audio_device_pulse_linux.h
+++ b/modules/audio_device/linux/audio_device_pulse_linux.h
@@ -19,7 +19,7 @@
 #include "modules/audio_device/include/audio_device_defines.h"
 #include "modules/audio_device/linux/audio_mixer_manager_pulse_linux.h"
 #include "modules/audio_device/linux/pulseaudiosymboltable_linux.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
index 5d40e08..4cd563a 100644
--- a/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
+++ b/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
@@ -13,7 +13,7 @@
 
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_device/linux/alsasymboltable_linux.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 #include <alsa/asoundlib.h>
 
diff --git a/modules/audio_device/linux/latebindingsymboltable_linux.h b/modules/audio_device/linux/latebindingsymboltable_linux.h
index 57314a6..edb62ae 100644
--- a/modules/audio_device/linux/latebindingsymboltable_linux.h
+++ b/modules/audio_device/linux/latebindingsymboltable_linux.h
@@ -15,7 +15,7 @@
 #include <stddef.h>  // for NULL
 #include <string.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 // This file provides macros for creating "symbol table" classes to simplify the
 // dynamic loading of symbols from DLLs. Currently the implementation only
diff --git a/modules/audio_device/mac/audio_device_mac.h b/modules/audio_device/mac/audio_device_mac.h
index 5a70760..e9ea7a7 100644
--- a/modules/audio_device/mac/audio_device_mac.h
+++ b/modules/audio_device/mac/audio_device_mac.h
@@ -15,7 +15,7 @@
 
 #include "modules/audio_device/audio_device_generic.h"
 #include "modules/audio_device/mac/audio_mixer_manager_mac.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/modules/audio_device/mac/audio_mixer_manager_mac.h b/modules/audio_device/mac/audio_mixer_manager_mac.h
index bb67f20..c073e6c 100644
--- a/modules/audio_device/mac/audio_mixer_manager_mac.h
+++ b/modules/audio_device/mac/audio_mixer_manager_mac.h
@@ -12,7 +12,7 @@
 #define AUDIO_DEVICE_AUDIO_MIXER_MANAGER_MAC_H_
 
 #include "modules/audio_device/include/audio_device.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/logging.h"
 
 #include <CoreAudio/CoreAudio.h>
diff --git a/modules/audio_device/win/audio_device_core_win.cc b/modules/audio_device/win/audio_device_core_win.cc
index fef8e50..159db92 100644
--- a/modules/audio_device/win/audio_device_core_win.cc
+++ b/modules/audio_device/win/audio_device_core_win.cc
@@ -40,7 +40,7 @@
 
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/sleep.h"
 
diff --git a/modules/audio_device/win/audio_device_core_win.h b/modules/audio_device/win/audio_device_core_win.h
index 7d06c8c..9945552 100644
--- a/modules/audio_device/win/audio_device_core_win.h
+++ b/modules/audio_device/win/audio_device_core_win.h
@@ -26,7 +26,7 @@
 #include <mediaobj.h>     // IMediaObject
 #include <mmdeviceapi.h>  // MMDevice
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 // Use Multimedia Class Scheduler Service (MMCSS) to boost the thread priority
diff --git a/modules/audio_device/win/audio_device_module_win.cc b/modules/audio_device/win/audio_device_module_win.cc
index f5d9c54..2b9d692 100644
--- a/modules/audio_device/win/audio_device_module_win.cc
+++ b/modules/audio_device/win/audio_device_module_win.cc
@@ -17,8 +17,8 @@
 #include "modules/audio_device/include/audio_device.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/string_utils.h"
 #include "rtc_base/thread_checker.h"
 
 namespace webrtc {
diff --git a/modules/audio_device/win/core_audio_base_win.cc b/modules/audio_device/win/core_audio_base_win.cc
index 43e7bba..c336c42 100644
--- a/modules/audio_device/win/core_audio_base_win.cc
+++ b/modules/audio_device/win/core_audio_base_win.cc
@@ -18,7 +18,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/win/windows_version.h"
 
 using Microsoft::WRL::ComPtr;
diff --git a/modules/audio_device/win/core_audio_output_win.cc b/modules/audio_device/win/core_audio_output_win.cc
index d40d4f1..c0dc185 100644
--- a/modules/audio_device/win/core_audio_output_win.cc
+++ b/modules/audio_device/win/core_audio_output_win.cc
@@ -16,7 +16,7 @@
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 using Microsoft::WRL::ComPtr;
 
diff --git a/modules/audio_device/win/core_audio_utility_win.cc b/modules/audio_device/win/core_audio_utility_win.cc
index a19ab77..83ac8aa 100644
--- a/modules/audio_device/win/core_audio_utility_win.cc
+++ b/modules/audio_device/win/core_audio_utility_win.cc
@@ -22,8 +22,8 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread_types.h"
+#include "rtc_base/string_utils.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/win/windows_version.h"
 
 using ATL::CComHeapPtr;
diff --git a/modules/audio_mixer/audio_mixer_impl.cc b/modules/audio_mixer/audio_mixer_impl.cc
index 6957c65..bca2a57 100644
--- a/modules/audio_mixer/audio_mixer_impl.cc
+++ b/modules/audio_mixer/audio_mixer_impl.cc
@@ -20,7 +20,7 @@
 #include "modules/audio_mixer/default_output_rate_calculator.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 
 namespace webrtc {
 namespace {
diff --git a/modules/audio_mixer/audio_mixer_impl.h b/modules/audio_mixer/audio_mixer_impl.h
index adaf2bd..94361c7 100644
--- a/modules/audio_mixer/audio_mixer_impl.h
+++ b/modules/audio_mixer/audio_mixer_impl.h
@@ -19,8 +19,8 @@
 #include "api/audio/audio_mixer.h"
 #include "modules/audio_mixer/frame_combiner.h"
 #include "modules/audio_mixer/output_rate_calculator.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/modules/audio_processing/aec/aec_core.h b/modules/audio_processing/aec/aec_core.h
index 35a6c9b..06ae2a4 100644
--- a/modules/audio_processing/aec/aec_core.h
+++ b/modules/audio_processing/aec/aec_core.h
@@ -25,7 +25,7 @@
 #include "modules/audio_processing/aec/aec_common.h"
 #include "modules/audio_processing/utility/block_mean_calculator.h"
 #include "modules/audio_processing/utility/ooura_fft.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/adaptive_fir_filter.h b/modules/audio_processing/aec3/adaptive_fir_filter.h
index 7c832a6..ed1f0d0 100644
--- a/modules/audio_processing/aec3/adaptive_fir_filter.h
+++ b/modules/audio_processing/aec3/adaptive_fir_filter.h
@@ -21,7 +21,7 @@
 #include "modules/audio_processing/aec3/fft_data.h"
 #include "modules/audio_processing/aec3/render_buffer.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/system/arch.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/aec3/aec3_fft.h b/modules/audio_processing/aec3/aec3_fft.h
index 6cd649a..d5db83e 100644
--- a/modules/audio_processing/aec3/aec3_fft.h
+++ b/modules/audio_processing/aec3/aec3_fft.h
@@ -18,7 +18,7 @@
 #include "modules/audio_processing/aec3/fft_data.h"
 #include "modules/audio_processing/utility/ooura_fft.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/aec_state.cc b/modules/audio_processing/aec3/aec_state.cc
index a8f6a01..bf47e2e 100644
--- a/modules/audio_processing/aec3/aec_state.cc
+++ b/modules/audio_processing/aec3/aec_state.cc
@@ -19,7 +19,7 @@
 #include "api/array_view.h"
 #include "modules/audio_processing/aec3/aec3_common.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/modules/audio_processing/aec3/block_framer.h b/modules/audio_processing/aec3/block_framer.h
index 923e4cf..fae4b29 100644
--- a/modules/audio_processing/aec3/block_framer.h
+++ b/modules/audio_processing/aec3/block_framer.h
@@ -15,7 +15,7 @@
 
 #include "api/array_view.h"
 #include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/block_processor.cc b/modules/audio_processing/aec3/block_processor.cc
index ef25e7c..85e2c4b 100644
--- a/modules/audio_processing/aec3/block_processor.cc
+++ b/modules/audio_processing/aec3/block_processor.cc
@@ -17,9 +17,9 @@
 #include "modules/audio_processing/aec3/delay_estimate.h"
 #include "modules/audio_processing/aec3/echo_path_variability.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/aec3/block_processor2.cc b/modules/audio_processing/aec3/block_processor2.cc
index 30bd3ee..1e9e0a0 100644
--- a/modules/audio_processing/aec3/block_processor2.cc
+++ b/modules/audio_processing/aec3/block_processor2.cc
@@ -24,7 +24,7 @@
 #include "modules/audio_processing/aec3/render_delay_buffer.h"
 #include "modules/audio_processing/aec3/render_delay_controller.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 
diff --git a/modules/audio_processing/aec3/block_processor_metrics.h b/modules/audio_processing/aec3/block_processor_metrics.h
index 9b437c0..4ba0536 100644
--- a/modules/audio_processing/aec3/block_processor_metrics.h
+++ b/modules/audio_processing/aec3/block_processor_metrics.h
@@ -11,7 +11,7 @@
 #ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_
 #define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/cascaded_biquad_filter.h b/modules/audio_processing/aec3/cascaded_biquad_filter.h
index 2a3b6d6..3d9b14b 100644
--- a/modules/audio_processing/aec3/cascaded_biquad_filter.h
+++ b/modules/audio_processing/aec3/cascaded_biquad_filter.h
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "api/array_view.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/comfort_noise_generator.h b/modules/audio_processing/aec3/comfort_noise_generator.h
index 3be386b..f78fda2 100644
--- a/modules/audio_processing/aec3/comfort_noise_generator.h
+++ b/modules/audio_processing/aec3/comfort_noise_generator.h
@@ -18,7 +18,7 @@
 #include "modules/audio_processing/aec3/aec3_common.h"
 #include "modules/audio_processing/aec3/aec_state.h"
 #include "modules/audio_processing/aec3/fft_data.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/system/arch.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/aec3/decimator.h b/modules/audio_processing/aec3/decimator.h
index 2bb60a4..a505014 100644
--- a/modules/audio_processing/aec3/decimator.h
+++ b/modules/audio_processing/aec3/decimator.h
@@ -16,7 +16,7 @@
 #include "api/array_view.h"
 #include "modules/audio_processing/aec3/aec3_common.h"
 #include "modules/audio_processing/aec3/cascaded_biquad_filter.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/echo_audibility.h b/modules/audio_processing/aec3/echo_audibility.h
index b903ca0..7b85321 100644
--- a/modules/audio_processing/aec3/echo_audibility.h
+++ b/modules/audio_processing/aec3/echo_audibility.h
@@ -19,7 +19,7 @@
 #include "modules/audio_processing/aec3/render_buffer.h"
 #include "modules/audio_processing/aec3/stationarity_estimator.h"
 #include "modules/audio_processing/aec3/vector_buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/echo_canceller3.cc b/modules/audio_processing/aec3/echo_canceller3.cc
index 38f6510..e384605 100644
--- a/modules/audio_processing/aec3/echo_canceller3.cc
+++ b/modules/audio_processing/aec3/echo_canceller3.cc
@@ -14,7 +14,7 @@
 
 #include "modules/audio_processing/aec3/aec3_common.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/aec3/echo_canceller3.h b/modules/audio_processing/aec3/echo_canceller3.h
index 671d271..c1298d2 100644
--- a/modules/audio_processing/aec3/echo_canceller3.h
+++ b/modules/audio_processing/aec3/echo_canceller3.h
@@ -27,7 +27,7 @@
 #include "modules/audio_processing/audio_buffer.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/swap_queue.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/modules/audio_processing/aec3/echo_path_delay_estimator.h b/modules/audio_processing/aec3/echo_path_delay_estimator.h
index 1f14735..11255a4 100644
--- a/modules/audio_processing/aec3/echo_path_delay_estimator.h
+++ b/modules/audio_processing/aec3/echo_path_delay_estimator.h
@@ -20,7 +20,7 @@
 #include "modules/audio_processing/aec3/delay_estimate.h"
 #include "modules/audio_processing/aec3/matched_filter.h"
 #include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/echo_remover.cc b/modules/audio_processing/aec3/echo_remover.cc
index cfb7395..1a290a7 100644
--- a/modules/audio_processing/aec3/echo_remover.cc
+++ b/modules/audio_processing/aec3/echo_remover.cc
@@ -31,9 +31,9 @@
 #include "modules/audio_processing/aec3/suppression_filter.h"
 #include "modules/audio_processing/aec3/suppression_gain.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/modules/audio_processing/aec3/echo_remover_metrics.h b/modules/audio_processing/aec3/echo_remover_metrics.h
index 0707a5f..da740fb 100644
--- a/modules/audio_processing/aec3/echo_remover_metrics.h
+++ b/modules/audio_processing/aec3/echo_remover_metrics.h
@@ -15,7 +15,7 @@
 
 #include "modules/audio_processing/aec3/aec3_common.h"
 #include "modules/audio_processing/aec3/aec_state.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/erl_estimator.h b/modules/audio_processing/aec3/erl_estimator.h
index 29718c3..060fb91 100644
--- a/modules/audio_processing/aec3/erl_estimator.h
+++ b/modules/audio_processing/aec3/erl_estimator.h
@@ -16,7 +16,7 @@
 
 #include "api/array_view.h"
 #include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/filter_analyzer.cc b/modules/audio_processing/aec3/filter_analyzer.cc
index 3e69be6..9be9d02 100644
--- a/modules/audio_processing/aec3/filter_analyzer.cc
+++ b/modules/audio_processing/aec3/filter_analyzer.cc
@@ -18,7 +18,7 @@
 #include "modules/audio_processing/aec3/aec3_common.h"
 #include "modules/audio_processing/aec3/render_buffer.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/modules/audio_processing/aec3/filter_analyzer.h b/modules/audio_processing/aec3/filter_analyzer.h
index e0fd069..13d599d 100644
--- a/modules/audio_processing/aec3/filter_analyzer.h
+++ b/modules/audio_processing/aec3/filter_analyzer.h
@@ -19,7 +19,7 @@
 #include "api/array_view.h"
 #include "api/audio/echo_canceller3_config.h"
 #include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/frame_blocker.h b/modules/audio_processing/aec3/frame_blocker.h
index 08e1e1d..68cee97 100644
--- a/modules/audio_processing/aec3/frame_blocker.h
+++ b/modules/audio_processing/aec3/frame_blocker.h
@@ -16,7 +16,7 @@
 
 #include "api/array_view.h"
 #include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/main_filter_update_gain.cc b/modules/audio_processing/aec3/main_filter_update_gain.cc
index ef87d14..11a97e2 100644
--- a/modules/audio_processing/aec3/main_filter_update_gain.cc
+++ b/modules/audio_processing/aec3/main_filter_update_gain.cc
@@ -20,7 +20,7 @@
 #include "modules/audio_processing/aec3/render_signal_analyzer.h"
 #include "modules/audio_processing/aec3/subtractor_output.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/aec3/main_filter_update_gain.h b/modules/audio_processing/aec3/main_filter_update_gain.h
index 892ff68..5c817cd 100644
--- a/modules/audio_processing/aec3/main_filter_update_gain.h
+++ b/modules/audio_processing/aec3/main_filter_update_gain.h
@@ -17,7 +17,7 @@
 
 #include "api/audio/echo_canceller3_config.h"
 #include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/matched_filter.h b/modules/audio_processing/aec3/matched_filter.h
index 2a65339..084267f 100644
--- a/modules/audio_processing/aec3/matched_filter.h
+++ b/modules/audio_processing/aec3/matched_filter.h
@@ -16,7 +16,7 @@
 
 #include "api/array_view.h"
 #include "modules/audio_processing/aec3/aec3_common.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/system/arch.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/aec3/matched_filter_lag_aggregator.h b/modules/audio_processing/aec3/matched_filter_lag_aggregator.h
index d7f34ae..0cc7789 100644
--- a/modules/audio_processing/aec3/matched_filter_lag_aggregator.h
+++ b/modules/audio_processing/aec3/matched_filter_lag_aggregator.h
@@ -17,7 +17,7 @@
 #include "api/audio/echo_canceller3_config.h"
 #include "modules/audio_processing/aec3/delay_estimate.h"
 #include "modules/audio_processing/aec3/matched_filter.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/render_buffer.h b/modules/audio_processing/aec3/render_buffer.h
index 4c7c60c..cc6cd1c 100644
--- a/modules/audio_processing/aec3/render_buffer.h
+++ b/modules/audio_processing/aec3/render_buffer.h
@@ -22,7 +22,7 @@
 #include "modules/audio_processing/aec3/matrix_buffer.h"
 #include "modules/audio_processing/aec3/vector_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/render_delay_buffer.cc b/modules/audio_processing/aec3/render_delay_buffer.cc
index 1ec2779..287e7c3 100644
--- a/modules/audio_processing/aec3/render_delay_buffer.cc
+++ b/modules/audio_processing/aec3/render_delay_buffer.cc
@@ -25,9 +25,9 @@
 #include "modules/audio_processing/aec3/matrix_buffer.h"
 #include "modules/audio_processing/aec3/vector_buffer.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/modules/audio_processing/aec3/render_delay_buffer2.cc b/modules/audio_processing/aec3/render_delay_buffer2.cc
index 6992c5b..4c0d55d 100644
--- a/modules/audio_processing/aec3/render_delay_buffer2.cc
+++ b/modules/audio_processing/aec3/render_delay_buffer2.cc
@@ -28,7 +28,7 @@
 #include "modules/audio_processing/aec3/render_delay_buffer.h"
 #include "modules/audio_processing/aec3/vector_buffer.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 
diff --git a/modules/audio_processing/aec3/render_delay_controller.cc b/modules/audio_processing/aec3/render_delay_controller.cc
index c4665ea..4ad5477 100644
--- a/modules/audio_processing/aec3/render_delay_controller.cc
+++ b/modules/audio_processing/aec3/render_delay_controller.cc
@@ -20,9 +20,9 @@
 #include "modules/audio_processing/aec3/render_delay_controller_metrics.h"
 #include "modules/audio_processing/aec3/skew_estimator.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/modules/audio_processing/aec3/render_delay_controller2.cc b/modules/audio_processing/aec3/render_delay_controller2.cc
index 00daf8f..b3a15c0 100644
--- a/modules/audio_processing/aec3/render_delay_controller2.cc
+++ b/modules/audio_processing/aec3/render_delay_controller2.cc
@@ -21,9 +21,9 @@
 #include "modules/audio_processing/aec3/render_delay_controller.h"
 #include "modules/audio_processing/aec3/render_delay_controller_metrics.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/aec3/render_delay_controller_metrics.h b/modules/audio_processing/aec3/render_delay_controller_metrics.h
index 22cc202..8c527a1 100644
--- a/modules/audio_processing/aec3/render_delay_controller_metrics.h
+++ b/modules/audio_processing/aec3/render_delay_controller_metrics.h
@@ -15,7 +15,7 @@
 
 #include "absl/types/optional.h"
 #include "modules/audio_processing/aec3/clockdrift_detector.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/render_signal_analyzer.h b/modules/audio_processing/aec3/render_signal_analyzer.h
index 8a44232..c7a3d8b 100644
--- a/modules/audio_processing/aec3/render_signal_analyzer.h
+++ b/modules/audio_processing/aec3/render_signal_analyzer.h
@@ -20,7 +20,7 @@
 #include "modules/audio_processing/aec3/aec3_common.h"
 #include "modules/audio_processing/aec3/render_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/residual_echo_estimator.h b/modules/audio_processing/aec3/residual_echo_estimator.h
index 52885a5..a25aff7 100644
--- a/modules/audio_processing/aec3/residual_echo_estimator.h
+++ b/modules/audio_processing/aec3/residual_echo_estimator.h
@@ -23,7 +23,7 @@
 #include "modules/audio_processing/aec3/reverb_model_fallback.h"
 #include "modules/audio_processing/aec3/vector_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/skew_estimator.h b/modules/audio_processing/aec3/skew_estimator.h
index b0946d8..8a457cb 100644
--- a/modules/audio_processing/aec3/skew_estimator.h
+++ b/modules/audio_processing/aec3/skew_estimator.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "absl/types/optional.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/stationarity_estimator.cc b/modules/audio_processing/aec3/stationarity_estimator.cc
index 25100bf..47f04bf 100644
--- a/modules/audio_processing/aec3/stationarity_estimator.cc
+++ b/modules/audio_processing/aec3/stationarity_estimator.cc
@@ -18,7 +18,7 @@
 #include "modules/audio_processing/aec3/aec3_common.h"
 #include "modules/audio_processing/aec3/vector_buffer.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/subtractor.h b/modules/audio_processing/aec3/subtractor.h
index bec014d..70463be 100644
--- a/modules/audio_processing/aec3/subtractor.h
+++ b/modules/audio_processing/aec3/subtractor.h
@@ -30,7 +30,7 @@
 #include "modules/audio_processing/aec3/subtractor_output.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/suppression_filter.h b/modules/audio_processing/aec3/suppression_filter.h
index edd1290..63569b1 100644
--- a/modules/audio_processing/aec3/suppression_filter.h
+++ b/modules/audio_processing/aec3/suppression_filter.h
@@ -18,7 +18,7 @@
 #include "modules/audio_processing/aec3/aec3_fft.h"
 #include "modules/audio_processing/aec3/fft_data.h"
 #include "modules/audio_processing/utility/ooura_fft.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/suppression_gain.cc b/modules/audio_processing/aec3/suppression_gain.cc
index c6d2bf6..6f30c8b 100644
--- a/modules/audio_processing/aec3/suppression_gain.cc
+++ b/modules/audio_processing/aec3/suppression_gain.cc
@@ -18,7 +18,7 @@
 #include "modules/audio_processing/aec3/moving_average.h"
 #include "modules/audio_processing/aec3/vector_math.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/aec3/suppression_gain.h b/modules/audio_processing/aec3/suppression_gain.h
index e74cd96..9e33c28 100644
--- a/modules/audio_processing/aec3/suppression_gain.h
+++ b/modules/audio_processing/aec3/suppression_gain.h
@@ -24,7 +24,7 @@
 #include "modules/audio_processing/aec3/moving_average.h"
 #include "modules/audio_processing/aec3/render_signal_analyzer.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec3/suppression_gain_limiter.h b/modules/audio_processing/aec3/suppression_gain_limiter.h
index eade949..482f965 100644
--- a/modules/audio_processing/aec3/suppression_gain_limiter.h
+++ b/modules/audio_processing/aec3/suppression_gain_limiter.h
@@ -13,7 +13,7 @@
 
 #include "api/array_view.h"
 #include "api/audio/echo_canceller3_config.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/aec_dump/aec_dump_unittest.cc b/modules/audio_processing/aec_dump/aec_dump_unittest.cc
index 75ed529..1f9ca0a 100644
--- a/modules/audio_processing/aec_dump/aec_dump_unittest.cc
+++ b/modules/audio_processing/aec_dump/aec_dump_unittest.cc
@@ -14,7 +14,7 @@
 
 #include "rtc_base/task_queue.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 TEST(AecDumper, APICallsDoNotCrash) {
   // Note order of initialization: Task queue has to be initialized
diff --git a/modules/audio_processing/agc/agc_manager_direct.h b/modules/audio_processing/agc/agc_manager_direct.h
index cbfd6a1..8c9fc4d 100644
--- a/modules/audio_processing/agc/agc_manager_direct.h
+++ b/modules/audio_processing/agc/agc_manager_direct.h
@@ -15,7 +15,7 @@
 
 #include "modules/audio_processing/agc/agc.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/gtest_prod_util.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/agc/loudness_histogram_unittest.cc b/modules/audio_processing/agc/loudness_histogram_unittest.cc
index 8c61710..0c291d8 100644
--- a/modules/audio_processing/agc/loudness_histogram_unittest.cc
+++ b/modules/audio_processing/agc/loudness_histogram_unittest.cc
@@ -19,7 +19,7 @@
 
 #include "modules/audio_processing/agc/utility.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/agc2/biquad_filter.h b/modules/audio_processing/agc2/biquad_filter.h
index 3d78c07..7bf3301 100644
--- a/modules/audio_processing/agc2/biquad_filter.h
+++ b/modules/audio_processing/agc2/biquad_filter.h
@@ -15,7 +15,7 @@
 
 #include "api/array_view.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/agc2/down_sampler.h b/modules/audio_processing/agc2/down_sampler.h
index a609ea8..61d1b00 100644
--- a/modules/audio_processing/agc2/down_sampler.h
+++ b/modules/audio_processing/agc2/down_sampler.h
@@ -13,7 +13,7 @@
 
 #include "api/array_view.h"
 #include "modules/audio_processing/agc2/biquad_filter.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/agc2/fixed_digital_level_estimator.h b/modules/audio_processing/agc2/fixed_digital_level_estimator.h
index 84429d3..aa84a2e 100644
--- a/modules/audio_processing/agc2/fixed_digital_level_estimator.h
+++ b/modules/audio_processing/agc2/fixed_digital_level_estimator.h
@@ -16,7 +16,7 @@
 
 #include "modules/audio_processing/agc2/agc2_common.h"
 #include "modules/audio_processing/include/audio_frame_view.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/agc2/interpolated_gain_curve.h b/modules/audio_processing/agc2/interpolated_gain_curve.h
index 68d4532..1ecb94e 100644
--- a/modules/audio_processing/agc2/interpolated_gain_curve.h
+++ b/modules/audio_processing/agc2/interpolated_gain_curve.h
@@ -16,7 +16,7 @@
 
 #include "modules/audio_processing/agc2/agc2_common.h"
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/gtest_prod_util.h"
 #include "system_wrappers/include/metrics.h"
 
diff --git a/modules/audio_processing/agc2/limiter.h b/modules/audio_processing/agc2/limiter.h
index 1e0ab71..599fd0f 100644
--- a/modules/audio_processing/agc2/limiter.h
+++ b/modules/audio_processing/agc2/limiter.h
@@ -17,7 +17,7 @@
 #include "modules/audio_processing/agc2/fixed_digital_level_estimator.h"
 #include "modules/audio_processing/agc2/interpolated_gain_curve.h"
 #include "modules/audio_processing/include/audio_frame_view.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 class ApmDataDumper;
diff --git a/modules/audio_processing/agc2/noise_level_estimator.h b/modules/audio_processing/agc2/noise_level_estimator.h
index 24067a1..ca2f9f2 100644
--- a/modules/audio_processing/agc2/noise_level_estimator.h
+++ b/modules/audio_processing/agc2/noise_level_estimator.h
@@ -13,7 +13,7 @@
 
 #include "modules/audio_processing/agc2/signal_classifier.h"
 #include "modules/audio_processing/include/audio_frame_view.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 class ApmDataDumper;
diff --git a/modules/audio_processing/agc2/noise_spectrum_estimator.h b/modules/audio_processing/agc2/noise_spectrum_estimator.h
index fd1cc13..b22f9bb 100644
--- a/modules/audio_processing/agc2/noise_spectrum_estimator.h
+++ b/modules/audio_processing/agc2/noise_spectrum_estimator.h
@@ -12,7 +12,7 @@
 #define MODULES_AUDIO_PROCESSING_AGC2_NOISE_SPECTRUM_ESTIMATOR_H_
 
 #include "api/array_view.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/agc2/rnn_vad/test_utils.cc b/modules/audio_processing/agc2/rnn_vad/test_utils.cc
index db38cab..8decbd0 100644
--- a/modules/audio_processing/agc2/rnn_vad/test_utils.cc
+++ b/modules/audio_processing/agc2/rnn_vad/test_utils.cc
@@ -13,7 +13,7 @@
 #include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace rnn_vad {
diff --git a/modules/audio_processing/agc2/signal_classifier.h b/modules/audio_processing/agc2/signal_classifier.h
index 23fe315..e0d6771 100644
--- a/modules/audio_processing/agc2/signal_classifier.h
+++ b/modules/audio_processing/agc2/signal_classifier.h
@@ -18,7 +18,7 @@
 #include "modules/audio_processing/agc2/down_sampler.h"
 #include "modules/audio_processing/agc2/noise_spectrum_estimator.h"
 #include "modules/audio_processing/utility/ooura_fft.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/audio_generator/file_audio_generator.h b/modules/audio_processing/audio_generator/file_audio_generator.h
index 01979a4..f322b09 100644
--- a/modules/audio_processing/audio_generator/file_audio_generator.h
+++ b/modules/audio_processing/audio_generator/file_audio_generator.h
@@ -15,7 +15,7 @@
 
 #include "common_audio/wav_file.h"
 #include "modules/audio_processing/include/audio_generator.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/audio_generator/file_audio_generator_unittest.cc b/modules/audio_processing/audio_generator/file_audio_generator_unittest.cc
index 6ed3b94..6569bfe 100644
--- a/modules/audio_processing/audio_generator/file_audio_generator_unittest.cc
+++ b/modules/audio_processing/audio_generator/file_audio_generator_unittest.cc
@@ -13,7 +13,7 @@
 #include "modules/audio_processing/include/audio_generator_factory.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index c0058c7..eec4c33 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -37,12 +37,12 @@
 #include "modules/audio_processing/residual_echo_detector.h"
 #include "modules/audio_processing/transient/transient_suppressor.h"
 #include "modules/audio_processing/voice_detection_impl.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/metrics.h"
 
diff --git a/modules/audio_processing/audio_processing_impl.h b/modules/audio_processing/audio_processing_impl.h
index 815cc95..9b66c26 100644
--- a/modules/audio_processing/audio_processing_impl.h
+++ b/modules/audio_processing/audio_processing_impl.h
@@ -21,7 +21,7 @@
 #include "modules/audio_processing/include/audio_processing_statistics.h"
 #include "modules/audio_processing/render_queue_item_verifier.h"
 #include "modules/audio_processing/rms_level.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/function_view.h"
 #include "rtc_base/gtest_prod_util.h"
 #include "rtc_base/ignore_wundef.h"
diff --git a/modules/audio_processing/audio_processing_impl_locking_unittest.cc b/modules/audio_processing/audio_processing_impl_locking_unittest.cc
index 18ee9cf..3609124 100644
--- a/modules/audio_processing/audio_processing_impl_locking_unittest.cc
+++ b/modules/audio_processing/audio_processing_impl_locking_unittest.cc
@@ -16,7 +16,7 @@
 
 #include "api/array_view.h"
 #include "modules/audio_processing/test/test_utils.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/random.h"
diff --git a/modules/audio_processing/audio_processing_impl_unittest.cc b/modules/audio_processing/audio_processing_impl_unittest.cc
index 3a3133a..c511cb3 100644
--- a/modules/audio_processing/audio_processing_impl_unittest.cc
+++ b/modules/audio_processing/audio_processing_impl_unittest.cc
@@ -17,7 +17,7 @@
 #include "modules/audio_processing/test/echo_control_mock.h"
 #include "modules/audio_processing/test/test_utils.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/modules/audio_processing/audio_processing_performance_unittest.cc b/modules/audio_processing/audio_processing_performance_unittest.cc
index 80c2b38..fa0f1da 100644
--- a/modules/audio_processing/audio_processing_performance_unittest.cc
+++ b/modules/audio_processing/audio_processing_performance_unittest.cc
@@ -17,7 +17,7 @@
 
 #include "api/array_view.h"
 #include "modules/audio_processing/test/test_utils.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/event.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/platform_thread.h"
diff --git a/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc
index 314d777..6ae6765 100644
--- a/modules/audio_processing/audio_processing_unittest.cc
+++ b/modules/audio_processing/audio_processing_unittest.cc
@@ -28,20 +28,20 @@
 #include "modules/audio_processing/test/test_utils.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/gtest_prod_util.h"
 #include "rtc_base/ignore_wundef.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/protobuf_utils.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/swap_queue.h"
 #include "rtc_base/system/arch.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 RTC_PUSH_IGNORING_WUNDEF()
 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
diff --git a/modules/audio_processing/echo_cancellation_impl.h b/modules/audio_processing/echo_cancellation_impl.h
index a8b43a8..79be73b 100644
--- a/modules/audio_processing/echo_cancellation_impl.h
+++ b/modules/audio_processing/echo_cancellation_impl.h
@@ -18,8 +18,8 @@
 
 #include "api/array_view.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/echo_cancellation_impl_unittest.cc b/modules/audio_processing/echo_cancellation_impl_unittest.cc
index 9d81c1d..841ea0d 100644
--- a/modules/audio_processing/echo_cancellation_impl_unittest.cc
+++ b/modules/audio_processing/echo_cancellation_impl_unittest.cc
@@ -13,7 +13,7 @@
 #include "modules/audio_processing/aec/aec_core.h"
 #include "modules/audio_processing/echo_cancellation_impl.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/echo_control_mobile_impl.cc b/modules/audio_processing/echo_control_mobile_impl.cc
index b9fbf42..3655eb1 100644
--- a/modules/audio_processing/echo_control_mobile_impl.cc
+++ b/modules/audio_processing/echo_control_mobile_impl.cc
@@ -17,7 +17,7 @@
 #include "modules/audio_processing/audio_buffer.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/echo_control_mobile_unittest.cc b/modules/audio_processing/echo_control_mobile_unittest.cc
index f0e6048..6b054d1 100644
--- a/modules/audio_processing/echo_control_mobile_unittest.cc
+++ b/modules/audio_processing/echo_control_mobile_unittest.cc
@@ -13,7 +13,7 @@
 
 #include "modules/audio_processing/echo_control_mobile_impl.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/gain_control_for_experimental_agc.cc b/modules/audio_processing/gain_control_for_experimental_agc.cc
index 1479d58..5cb22f8 100644
--- a/modules/audio_processing/gain_control_for_experimental_agc.cc
+++ b/modules/audio_processing/gain_control_for_experimental_agc.cc
@@ -12,8 +12,8 @@
 
 #include "modules/audio_processing/include/audio_processing.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/gain_control_for_experimental_agc.h b/modules/audio_processing/gain_control_for_experimental_agc.h
index b20fbc9..8f5681f 100644
--- a/modules/audio_processing/gain_control_for_experimental_agc.h
+++ b/modules/audio_processing/gain_control_for_experimental_agc.h
@@ -13,8 +13,8 @@
 
 #include "modules/audio_processing/agc/agc_manager_direct.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_checker.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/gain_control_impl.cc b/modules/audio_processing/gain_control_impl.cc
index d5118ba..26ab1b4 100644
--- a/modules/audio_processing/gain_control_impl.cc
+++ b/modules/audio_processing/gain_control_impl.cc
@@ -18,7 +18,7 @@
 #include "modules/audio_processing/include/audio_processing.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/gain_control_impl.h b/modules/audio_processing/gain_control_impl.h
index c21d911..fc781d4 100644
--- a/modules/audio_processing/gain_control_impl.h
+++ b/modules/audio_processing/gain_control_impl.h
@@ -19,8 +19,8 @@
 #include "absl/types/optional.h"
 #include "api/array_view.h"
 #include "modules/audio_processing/include/gain_control.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/gain_controller2.cc b/modules/audio_processing/gain_controller2.cc
index 2a32744..a1bbb1b 100644
--- a/modules/audio_processing/gain_controller2.cc
+++ b/modules/audio_processing/gain_controller2.cc
@@ -14,7 +14,7 @@
 #include "modules/audio_processing/audio_buffer.h"
 #include "modules/audio_processing/include/audio_frame_view.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/strings/string_builder.h"
 
diff --git a/modules/audio_processing/gain_controller2.h b/modules/audio_processing/gain_controller2.h
index 3a11810..7ed310e 100644
--- a/modules/audio_processing/gain_controller2.h
+++ b/modules/audio_processing/gain_controller2.h
@@ -18,7 +18,7 @@
 #include "modules/audio_processing/agc2/gain_applier.h"
 #include "modules/audio_processing/agc2/limiter.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h
index 429816b..b88a86f 100644
--- a/modules/audio_processing/include/audio_processing.h
+++ b/modules/audio_processing/include/audio_processing.h
@@ -32,7 +32,7 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/deprecation.h"
 #include "rtc_base/platform_file.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/system/rtc_export.h"
 
diff --git a/modules/audio_processing/include/config.h b/modules/audio_processing/include/config.h
index e77d3fd..930cf7e 100644
--- a/modules/audio_processing/include/config.h
+++ b/modules/audio_processing/include/config.h
@@ -13,7 +13,7 @@
 
 #include <map>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/level_estimator_impl.h b/modules/audio_processing/level_estimator_impl.h
index 901ae4c..da217bb 100644
--- a/modules/audio_processing/level_estimator_impl.h
+++ b/modules/audio_processing/level_estimator_impl.h
@@ -14,8 +14,8 @@
 #include <memory>
 
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/logging/apm_data_dumper.h b/modules/audio_processing/logging/apm_data_dumper.h
index b541ae8..001fbf79 100644
--- a/modules/audio_processing/logging/apm_data_dumper.h
+++ b/modules/audio_processing/logging/apm_data_dumper.h
@@ -25,7 +25,7 @@
 #include "common_audio/wav_file.h"
 #include "rtc_base/checks.h"
 #endif
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 // Check to verify that the define is properly set.
 #if !defined(WEBRTC_APM_DEBUG_DUMP) || \
diff --git a/modules/audio_processing/low_cut_filter.h b/modules/audio_processing/low_cut_filter.h
index fd4c6f1..86fbddd 100644
--- a/modules/audio_processing/low_cut_filter.h
+++ b/modules/audio_processing/low_cut_filter.h
@@ -14,7 +14,7 @@
 #include <memory>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/noise_suppression_impl.cc b/modules/audio_processing/noise_suppression_impl.cc
index d8d9e32..bfaddd9 100644
--- a/modules/audio_processing/noise_suppression_impl.cc
+++ b/modules/audio_processing/noise_suppression_impl.cc
@@ -12,7 +12,7 @@
 
 #include "modules/audio_processing/audio_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #if defined(WEBRTC_NS_FLOAT)
 #include "modules/audio_processing/ns/noise_suppression.h"
 
diff --git a/modules/audio_processing/noise_suppression_impl.h b/modules/audio_processing/noise_suppression_impl.h
index fba716e..414ca31 100644
--- a/modules/audio_processing/noise_suppression_impl.h
+++ b/modules/audio_processing/noise_suppression_impl.h
@@ -15,8 +15,8 @@
 #include <vector>
 
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/residual_echo_detector.cc b/modules/audio_processing/residual_echo_detector.cc
index 3454214..0b53cc2 100644
--- a/modules/audio_processing/residual_echo_detector.cc
+++ b/modules/audio_processing/residual_echo_detector.cc
@@ -16,7 +16,7 @@
 #include "absl/types/optional.h"
 #include "modules/audio_processing/audio_buffer.h"
 #include "modules/audio_processing/logging/apm_data_dumper.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "system_wrappers/include/metrics.h"
diff --git a/modules/audio_processing/residual_echo_detector_unittest.cc b/modules/audio_processing/residual_echo_detector_unittest.cc
index c6fb8e4..6658999 100644
--- a/modules/audio_processing/residual_echo_detector_unittest.cc
+++ b/modules/audio_processing/residual_echo_detector_unittest.cc
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "modules/audio_processing/residual_echo_detector.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/rms_level_unittest.cc b/modules/audio_processing/rms_level_unittest.cc
index cf7683d..c2d6a50 100644
--- a/modules/audio_processing/rms_level_unittest.cc
+++ b/modules/audio_processing/rms_level_unittest.cc
@@ -14,7 +14,7 @@
 #include "api/array_view.h"
 #include "modules/audio_processing/rms_level.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/numerics/mathutils.h"
+#include "rtc_base/numerics/math_utils.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
 
diff --git a/modules/audio_processing/test/aec_dump_based_simulator.h b/modules/audio_processing/test/aec_dump_based_simulator.h
index 3358fcf..78c1210 100644
--- a/modules/audio_processing/test/aec_dump_based_simulator.h
+++ b/modules/audio_processing/test/aec_dump_based_simulator.h
@@ -13,7 +13,7 @@
 
 #include "modules/audio_processing/test/audio_processing_simulator.h"
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/ignore_wundef.h"
 
 RTC_PUSH_IGNORING_WUNDEF()
diff --git a/modules/audio_processing/test/audio_processing_simulator.h b/modules/audio_processing/test/audio_processing_simulator.h
index 4b67537..0ac25da 100644
--- a/modules/audio_processing/test/audio_processing_simulator.h
+++ b/modules/audio_processing/test/audio_processing_simulator.h
@@ -22,9 +22,9 @@
 #include "modules/audio_processing/include/audio_processing.h"
 #include "modules/audio_processing/test/fake_recording_device.h"
 #include "modules/audio_processing/test/test_utils.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/task_queue.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/test/bitexactness_tools.cc b/modules/audio_processing/test/bitexactness_tools.cc
index 0e9d369..7bf2b01 100644
--- a/modules/audio_processing/test/bitexactness_tools.cc
+++ b/modules/audio_processing/test/bitexactness_tools.cc
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "api/array_view.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/test/conversational_speech/generator.cc b/modules/audio_processing/test/conversational_speech/generator.cc
index fa561cf..04c0678 100644
--- a/modules/audio_processing/test/conversational_speech/generator.cc
+++ b/modules/audio_processing/test/conversational_speech/generator.cc
@@ -17,7 +17,7 @@
 #include "modules/audio_processing/test/conversational_speech/timing.h"
 #include "modules/audio_processing/test/conversational_speech/wavreader_factory.h"
 #include "rtc_base/flags.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/test/conversational_speech/generator_unittest.cc b/modules/audio_processing/test/conversational_speech/generator_unittest.cc
index 5ef11db..aacf2a2 100644
--- a/modules/audio_processing/test/conversational_speech/generator_unittest.cc
+++ b/modules/audio_processing/test/conversational_speech/generator_unittest.cc
@@ -53,7 +53,7 @@
 #include "rtc_base/logging.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/test/conversational_speech/multiend_call.cc b/modules/audio_processing/test/conversational_speech/multiend_call.cc
index 4e2f54d..2ae33d7 100644
--- a/modules/audio_processing/test/conversational_speech/multiend_call.cc
+++ b/modules/audio_processing/test/conversational_speech/multiend_call.cc
@@ -14,7 +14,7 @@
 #include <iterator>
 
 #include "rtc_base/logging.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/test/conversational_speech/multiend_call.h b/modules/audio_processing/test/conversational_speech/multiend_call.h
index a4eff38..09cb00c 100644
--- a/modules/audio_processing/test/conversational_speech/multiend_call.h
+++ b/modules/audio_processing/test/conversational_speech/multiend_call.h
@@ -23,7 +23,7 @@
 #include "modules/audio_processing/test/conversational_speech/timing.h"
 #include "modules/audio_processing/test/conversational_speech/wavreader_abstract_factory.h"
 #include "modules/audio_processing/test/conversational_speech/wavreader_interface.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/test/conversational_speech/simulator.cc b/modules/audio_processing/test/conversational_speech/simulator.cc
index c400499..81b73fb 100644
--- a/modules/audio_processing/test/conversational_speech/simulator.cc
+++ b/modules/audio_processing/test/conversational_speech/simulator.cc
@@ -22,10 +22,10 @@
 #include "common_audio/include/audio_util.h"
 #include "common_audio/wav_file.h"
 #include "modules/audio_processing/test/conversational_speech/wavreader_interface.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/test/conversational_speech/simulator.h b/modules/audio_processing/test/conversational_speech/simulator.h
index 743db42..a9992eb 100644
--- a/modules/audio_processing/test/conversational_speech/simulator.h
+++ b/modules/audio_processing/test/conversational_speech/simulator.h
@@ -17,7 +17,7 @@
 #include <utility>
 
 #include "modules/audio_processing/test/conversational_speech/multiend_call.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/test/conversational_speech/timing.cc b/modules/audio_processing/test/conversational_speech/timing.cc
index 6c19f32..53c8142 100644
--- a/modules/audio_processing/test/conversational_speech/timing.cc
+++ b/modules/audio_processing/test/conversational_speech/timing.cc
@@ -13,7 +13,7 @@
 #include <fstream>
 #include <iostream>
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/test/debug_dump_test.cc b/modules/audio_processing/test/debug_dump_test.cc
index 509a904..7d0a2bd 100644
--- a/modules/audio_processing/test/debug_dump_test.cc
+++ b/modules/audio_processing/test/debug_dump_test.cc
@@ -21,7 +21,7 @@
 #include "modules/audio_processing/test/test_utils.h"
 #include "rtc_base/task_queue.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/test/echo_canceller_test_tools.h b/modules/audio_processing/test/echo_canceller_test_tools.h
index 1cb5b7e..8c9ca01 100644
--- a/modules/audio_processing/test/echo_canceller_test_tools.h
+++ b/modules/audio_processing/test/echo_canceller_test_tools.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "api/array_view.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/random.h"
 
 namespace webrtc {
diff --git a/modules/audio_processing/test/test_utils.h b/modules/audio_processing/test/test_utils.h
index 10877f1..3637431 100644
--- a/modules/audio_processing/test/test_utils.h
+++ b/modules/audio_processing/test/test_utils.h
@@ -23,7 +23,7 @@
 #include "common_audio/channel_buffer.h"
 #include "common_audio/wav_file.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/test/wav_based_simulator.h b/modules/audio_processing/test/wav_based_simulator.h
index 0294e89..3dfd256 100644
--- a/modules/audio_processing/test/wav_based_simulator.h
+++ b/modules/audio_processing/test/wav_based_simulator.h
@@ -15,7 +15,7 @@
 
 #include "modules/audio_processing/test/audio_processing_simulator.h"
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/audio_processing/transient/file_utils_unittest.cc b/modules/audio_processing/transient/file_utils_unittest.cc
index 89902ec..ced06b1 100644
--- a/modules/audio_processing/transient/file_utils_unittest.cc
+++ b/modules/audio_processing/transient/file_utils_unittest.cc
@@ -17,7 +17,7 @@
 
 #include "rtc_base/system/file_wrapper.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/transient/transient_detector_unittest.cc b/modules/audio_processing/transient/transient_detector_unittest.cc
index 091a573..11dd8aa 100644
--- a/modules/audio_processing/transient/transient_detector_unittest.cc
+++ b/modules/audio_processing/transient/transient_detector_unittest.cc
@@ -18,7 +18,7 @@
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/system/file_wrapper.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/transient/transient_suppression_test.cc b/modules/audio_processing/transient/transient_suppression_test.cc
index e15f69c..57bddb6 100644
--- a/modules/audio_processing/transient/transient_suppression_test.cc
+++ b/modules/audio_processing/transient/transient_suppression_test.cc
@@ -21,7 +21,7 @@
 #include "modules/audio_processing/agc/agc.h"
 #include "rtc_base/flags.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 WEBRTC_DEFINE_string(in_file_name, "", "PCM file that contains the signal.");
 WEBRTC_DEFINE_string(detection_file_name,
diff --git a/modules/audio_processing/transient/wpd_tree_unittest.cc b/modules/audio_processing/transient/wpd_tree_unittest.cc
index 830a5df..1d6dbe8 100644
--- a/modules/audio_processing/transient/wpd_tree_unittest.cc
+++ b/modules/audio_processing/transient/wpd_tree_unittest.cc
@@ -18,7 +18,7 @@
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/system/file_wrapper.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/utility/block_mean_calculator.h b/modules/audio_processing/utility/block_mean_calculator.h
index cfa7cfb..5ccdbef 100644
--- a/modules/audio_processing/utility/block_mean_calculator.h
+++ b/modules/audio_processing/utility/block_mean_calculator.h
@@ -13,7 +13,7 @@
 
 #include <stddef.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/vad/pitch_based_vad_unittest.cc b/modules/audio_processing/vad/pitch_based_vad_unittest.cc
index fb6daa5..4a8331a 100644
--- a/modules/audio_processing/vad/pitch_based_vad_unittest.cc
+++ b/modules/audio_processing/vad/pitch_based_vad_unittest.cc
@@ -16,7 +16,7 @@
 #include <string>
 
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/vad/pole_zero_filter_unittest.cc b/modules/audio_processing/vad/pole_zero_filter_unittest.cc
index 38ee10f..8088b40 100644
--- a/modules/audio_processing/vad/pole_zero_filter_unittest.cc
+++ b/modules/audio_processing/vad/pole_zero_filter_unittest.cc
@@ -17,7 +17,7 @@
 
 #include "modules/audio_processing/vad/vad_audio_proc_internal.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/vad/standalone_vad_unittest.cc b/modules/audio_processing/vad/standalone_vad_unittest.cc
index 512276e..22b1f49 100644
--- a/modules/audio_processing/vad/standalone_vad_unittest.cc
+++ b/modules/audio_processing/vad/standalone_vad_unittest.cc
@@ -15,7 +15,7 @@
 #include <memory>
 
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/vad/vad_audio_proc_unittest.cc b/modules/audio_processing/vad/vad_audio_proc_unittest.cc
index 5b96be6..0afed84 100644
--- a/modules/audio_processing/vad/vad_audio_proc_unittest.cc
+++ b/modules/audio_processing/vad/vad_audio_proc_unittest.cc
@@ -21,7 +21,7 @@
 
 #include "modules/audio_processing/vad/common.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/audio_processing/vad/voice_activity_detector_unittest.cc b/modules/audio_processing/vad/voice_activity_detector_unittest.cc
index 62eda2b..3214bd9 100644
--- a/modules/audio_processing/vad/voice_activity_detector_unittest.cc
+++ b/modules/audio_processing/vad/voice_activity_detector_unittest.cc
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace {
diff --git a/modules/audio_processing/voice_detection_impl.cc b/modules/audio_processing/voice_detection_impl.cc
index c55ca4a..7bf6c4a 100644
--- a/modules/audio_processing/voice_detection_impl.cc
+++ b/modules/audio_processing/voice_detection_impl.cc
@@ -14,7 +14,7 @@
 #include "common_audio/vad/include/webrtc_vad.h"
 #include "modules/audio_processing/audio_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 class VoiceDetectionImpl::Vad {
diff --git a/modules/audio_processing/voice_detection_impl.h b/modules/audio_processing/voice_detection_impl.h
index c438473..6800566 100644
--- a/modules/audio_processing/voice_detection_impl.h
+++ b/modules/audio_processing/voice_detection_impl.h
@@ -15,8 +15,8 @@
 #include <memory>
 
 #include "modules/audio_processing/include/audio_processing.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/bitrate_controller/bitrate_controller_impl.h b/modules/bitrate_controller/bitrate_controller_impl.h
index ee220b6..5448c17 100644
--- a/modules/bitrate_controller/bitrate_controller_impl.h
+++ b/modules/bitrate_controller/bitrate_controller_impl.h
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "modules/bitrate_controller/send_side_bandwidth_estimation.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
diff --git a/modules/congestion_controller/bbr/rtt_stats.h b/modules/congestion_controller/bbr/rtt_stats.h
index f1c9f10..e8f0a8b 100644
--- a/modules/congestion_controller/bbr/rtt_stats.h
+++ b/modules/congestion_controller/bbr/rtt_stats.h
@@ -16,7 +16,7 @@
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 
 namespace webrtc {
diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
index 4991ee6..cfb7618 100644
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
@@ -14,7 +14,7 @@
 
 #include "absl/memory/memory.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 
diff --git a/modules/congestion_controller/goog_cc/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc
index db66942..3009de4 100644
--- a/modules/congestion_controller/goog_cc/alr_detector.cc
+++ b/modules/congestion_controller/goog_cc/alr_detector.cc
@@ -20,7 +20,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/experiments/alr_experiment.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 AlrDetector::AlrDetector() : AlrDetector(nullptr) {}
diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe.h b/modules/congestion_controller/goog_cc/delay_based_bwe.h
index f276dfe..ba9289c 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe.h
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe.h
@@ -23,7 +23,7 @@
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "modules/remote_bitrate_estimator/inter_arrival.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"  // For PacketFeedback
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/race_checker.h"
 
 namespace webrtc {
diff --git a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h
index 383f68d..4d8a00c 100644
--- a/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h
+++ b/modules/congestion_controller/goog_cc/delay_based_bwe_unittest_helper.h
@@ -22,7 +22,7 @@
 #include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "system_wrappers/include/clock.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
diff --git a/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h b/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h
index e4f899a..40d945d 100644
--- a/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h
+++ b/modules/congestion_controller/goog_cc/delay_increase_detector_interface.h
@@ -13,7 +13,7 @@
 #include <stdint.h>
 
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control.h b/modules/congestion_controller/goog_cc/goog_cc_network_control.h
index 6ba12ae..c188d11 100644
--- a/modules/congestion_controller/goog_cc/goog_cc_network_control.h
+++ b/modules/congestion_controller/goog_cc/goog_cc_network_control.h
@@ -30,7 +30,7 @@
 #include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
 #include "modules/congestion_controller/goog_cc/delay_based_rate_controller.h"
 #include "modules/congestion_controller/goog_cc/probe_controller.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/experiments/field_trial_parser.h"
 
 namespace webrtc {
diff --git a/modules/congestion_controller/goog_cc/median_slope_estimator.h b/modules/congestion_controller/goog_cc/median_slope_estimator.h
index aeab4ea..3f1e3f5 100644
--- a/modules/congestion_controller/goog_cc/median_slope_estimator.h
+++ b/modules/congestion_controller/goog_cc/median_slope_estimator.h
@@ -16,7 +16,7 @@
 #include <deque>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/numerics/percentile_filter.h"
 
 namespace webrtc {
diff --git a/modules/congestion_controller/goog_cc/probe_controller.h b/modules/congestion_controller/goog_cc/probe_controller.h
index 75f3ee7..98df8c7 100644
--- a/modules/congestion_controller/goog_cc/probe_controller.h
+++ b/modules/congestion_controller/goog_cc/probe_controller.h
@@ -18,7 +18,7 @@
 
 #include "absl/types/optional.h"
 #include "api/transport/network_control.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/system/unused.h"
 
 namespace webrtc {
diff --git a/modules/congestion_controller/goog_cc/trendline_estimator.h b/modules/congestion_controller/goog_cc/trendline_estimator.h
index 1826d81..260cd03 100644
--- a/modules/congestion_controller/goog_cc/trendline_estimator.h
+++ b/modules/congestion_controller/goog_cc/trendline_estimator.h
@@ -17,7 +17,7 @@
 
 #include "modules/congestion_controller/goog_cc/delay_increase_detector_interface.h"
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/congestion_controller/include/receive_side_congestion_controller.h b/modules/congestion_controller/include/receive_side_congestion_controller.h
index 2cb1b52..ad5d077 100644
--- a/modules/congestion_controller/include/receive_side_congestion_controller.h
+++ b/modules/congestion_controller/include/receive_side_congestion_controller.h
@@ -15,8 +15,8 @@
 #include <vector>
 
 #include "modules/remote_bitrate_estimator/remote_estimator_proxy.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 class RemoteBitrateEstimator;
diff --git a/modules/congestion_controller/include/send_side_congestion_controller.h b/modules/congestion_controller/include/send_side_congestion_controller.h
index 7f22ed2..1a601ec 100644
--- a/modules/congestion_controller/include/send_side_congestion_controller.h
+++ b/modules/congestion_controller/include/send_side_congestion_controller.h
@@ -22,10 +22,10 @@
 #include "modules/include/module.h"
 #include "modules/include/module_common_types.h"
 #include "modules/pacing/paced_sender.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/deprecation.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/network_route.h"
 #include "rtc_base/race_checker.h"
 
 namespace rtc {
diff --git a/modules/congestion_controller/include/send_side_congestion_controller_interface.h b/modules/congestion_controller/include/send_side_congestion_controller_interface.h
index 0eeeabc..588c00b 100644
--- a/modules/congestion_controller/include/send_side_congestion_controller_interface.h
+++ b/modules/congestion_controller/include/send_side_congestion_controller_interface.h
@@ -19,9 +19,9 @@
 #include "modules/include/module.h"
 #include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/network/sent_packet.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/network_route.h"
 
 namespace webrtc {
 
diff --git a/modules/congestion_controller/rtp/control_handler.h b/modules/congestion_controller/rtp/control_handler.h
index 0ecc6b1..e9016c7 100644
--- a/modules/congestion_controller/rtp/control_handler.h
+++ b/modules/congestion_controller/rtp/control_handler.h
@@ -18,7 +18,7 @@
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "modules/pacing/paced_sender.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/sequenced_task_checker.h"
 
 namespace webrtc {
diff --git a/modules/congestion_controller/rtp/send_time_history.h b/modules/congestion_controller/rtp/send_time_history.h
index c28ca61..cba89b9 100644
--- a/modules/congestion_controller/rtp/send_time_history.h
+++ b/modules/congestion_controller/rtp/send_time_history.h
@@ -16,7 +16,7 @@
 
 #include "api/units/data_size.h"
 #include "modules/include/module_common_types.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 class Clock;
diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter.h b/modules/congestion_controller/rtp/transport_feedback_adapter.h
index 1741d6d..eb90b5d 100644
--- a/modules/congestion_controller/rtp/transport_feedback_adapter.h
+++ b/modules/congestion_controller/rtp/transport_feedback_adapter.h
@@ -16,7 +16,7 @@
 
 #include "api/transport/network_types.h"
 #include "modules/congestion_controller/rtp/send_time_history.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/network/sent_packet.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
diff --git a/modules/congestion_controller/send_side_congestion_controller.cc b/modules/congestion_controller/send_side_congestion_controller.cc
index 3c8f72f..d49e567 100644
--- a/modules/congestion_controller/send_side_congestion_controller.cc
+++ b/modules/congestion_controller/send_side_congestion_controller.cc
@@ -31,7 +31,7 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/network/sent_packet.h"
 #include "rtc_base/rate_limiter.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
diff --git a/modules/congestion_controller/transport_feedback_adapter.h b/modules/congestion_controller/transport_feedback_adapter.h
index c6ac2ad..a8318f6 100644
--- a/modules/congestion_controller/transport_feedback_adapter.h
+++ b/modules/congestion_controller/transport_feedback_adapter.h
@@ -16,7 +16,7 @@
 
 #include "api/transport/network_types.h"
 #include "modules/congestion_controller/rtp/send_time_history.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
 #include "system_wrappers/include/clock.h"
diff --git a/modules/desktop_capture/cropped_desktop_frame.cc b/modules/desktop_capture/cropped_desktop_frame.cc
index 45f4d8f..311f254 100644
--- a/modules/desktop_capture/cropped_desktop_frame.cc
+++ b/modules/desktop_capture/cropped_desktop_frame.cc
@@ -14,7 +14,7 @@
 #include "modules/desktop_capture/cropped_desktop_frame.h"
 #include "modules/desktop_capture/desktop_region.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/desktop_and_cursor_composer.cc b/modules/desktop_capture/desktop_and_cursor_composer.cc
index fae34b4..649b791 100644
--- a/modules/desktop_capture/desktop_and_cursor_composer.cc
+++ b/modules/desktop_capture/desktop_and_cursor_composer.cc
@@ -20,7 +20,7 @@
 #include "modules/desktop_capture/mouse_cursor.h"
 #include "modules/desktop_capture/mouse_cursor_monitor.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/desktop_and_cursor_composer.h b/modules/desktop_capture/desktop_and_cursor_composer.h
index 4c66113..1381106 100644
--- a/modules/desktop_capture/desktop_and_cursor_composer.h
+++ b/modules/desktop_capture/desktop_and_cursor_composer.h
@@ -21,7 +21,7 @@
 #include "modules/desktop_capture/mouse_cursor.h"
 #include "modules/desktop_capture/mouse_cursor_monitor.h"
 #include "modules/desktop_capture/shared_memory.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/desktop_capturer_differ_wrapper.cc b/modules/desktop_capture/desktop_capturer_differ_wrapper.cc
index 4759f9a..1b90fd5 100644
--- a/modules/desktop_capture/desktop_capturer_differ_wrapper.cc
+++ b/modules/desktop_capture/desktop_capturer_differ_wrapper.cc
@@ -18,7 +18,7 @@
 #include "modules/desktop_capture/desktop_region.h"
 #include "modules/desktop_capture/differ_block.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc b/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc
index eb2b8b2..0ae46f5 100644
--- a/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc
+++ b/modules/desktop_capture/desktop_capturer_differ_wrapper_unittest.cc
@@ -21,7 +21,7 @@
 #include "modules/desktop_capture/fake_desktop_capturer.h"
 #include "modules/desktop_capture/mock_desktop_capturer_callback.h"
 #include "rtc_base/random.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/cpu_features_wrapper.h"
 #include "test/gtest.h"
 
diff --git a/modules/desktop_capture/desktop_frame.h b/modules/desktop_capture/desktop_frame.h
index 69fed35..803a2f4 100644
--- a/modules/desktop_capture/desktop_frame.h
+++ b/modules/desktop_capture/desktop_frame.h
@@ -17,7 +17,7 @@
 #include "modules/desktop_capture/desktop_geometry.h"
 #include "modules/desktop_capture/desktop_region.h"
 #include "modules/desktop_capture/shared_memory.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/desktop_frame_generator.cc b/modules/desktop_capture/desktop_frame_generator.cc
index 8527d4d..947b389 100644
--- a/modules/desktop_capture/desktop_frame_generator.cc
+++ b/modules/desktop_capture/desktop_frame_generator.cc
@@ -17,7 +17,7 @@
 #include "modules/desktop_capture/rgba_color.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/random.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/desktop_frame_win.h b/modules/desktop_capture/desktop_frame_win.h
index cd953f0..e8861d5 100644
--- a/modules/desktop_capture/desktop_frame_win.h
+++ b/modules/desktop_capture/desktop_frame_win.h
@@ -16,7 +16,7 @@
 #include <windows.h>
 
 #include "modules/desktop_capture/desktop_frame.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/linux/base_capturer_pipewire.h b/modules/desktop_capture/linux/base_capturer_pipewire.h
index 56b101a..d7910aa 100644
--- a/modules/desktop_capture/linux/base_capturer_pipewire.h
+++ b/modules/desktop_capture/linux/base_capturer_pipewire.h
@@ -18,7 +18,7 @@
 
 #include "modules/desktop_capture/desktop_capture_options.h"
 #include "modules/desktop_capture/desktop_capturer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/linux/screen_capturer_x11.cc b/modules/desktop_capture/linux/screen_capturer_x11.cc
index 24f70b7..6cd40c1 100644
--- a/modules/desktop_capture/linux/screen_capturer_x11.cc
+++ b/modules/desktop_capture/linux/screen_capturer_x11.cc
@@ -29,7 +29,7 @@
 #include "modules/desktop_capture/shared_desktop_frame.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/linux/screen_capturer_x11.h b/modules/desktop_capture/linux/screen_capturer_x11.h
index e57cb20..6412a76 100644
--- a/modules/desktop_capture/linux/screen_capturer_x11.h
+++ b/modules/desktop_capture/linux/screen_capturer_x11.h
@@ -26,7 +26,7 @@
 #include "modules/desktop_capture/screen_capture_frame_queue.h"
 #include "modules/desktop_capture/screen_capturer_helper.h"
 #include "modules/desktop_capture/shared_desktop_frame.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/linux/shared_x_display.h b/modules/desktop_capture/linux/shared_x_display.h
index a14f41f..0829e09 100644
--- a/modules/desktop_capture/linux/shared_x_display.h
+++ b/modules/desktop_capture/linux/shared_x_display.h
@@ -16,8 +16,8 @@
 
 #include <string>
 
-#include "api/refcountedbase.h"
-#include "rtc_base/constructormagic.h"
+#include "api/ref_counted_base.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 // Including Xlib.h will involve evil defines (Bool, Status, True, False), which
diff --git a/modules/desktop_capture/linux/window_capturer_x11.h b/modules/desktop_capture/linux/window_capturer_x11.h
index a9ad421..0f81950 100644
--- a/modules/desktop_capture/linux/window_capturer_x11.h
+++ b/modules/desktop_capture/linux/window_capturer_x11.h
@@ -23,7 +23,7 @@
 #include "modules/desktop_capture/linux/window_finder_x11.h"
 #include "modules/desktop_capture/linux/x_atom_cache.h"
 #include "modules/desktop_capture/linux/x_server_pixel_buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/linux/window_list_utils.cc b/modules/desktop_capture/linux/window_list_utils.cc
index f130b71..906042a 100644
--- a/modules/desktop_capture/linux/window_list_utils.cc
+++ b/modules/desktop_capture/linux/window_list_utils.cc
@@ -17,7 +17,7 @@
 
 #include "modules/desktop_capture/linux/x_error_trap.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/linux/x_error_trap.h b/modules/desktop_capture/linux/x_error_trap.h
index a9d059a..1fb0fdc 100644
--- a/modules/desktop_capture/linux/x_error_trap.h
+++ b/modules/desktop_capture/linux/x_error_trap.h
@@ -13,7 +13,7 @@
 
 #include <X11/Xlib.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/linux/x_server_pixel_buffer.h b/modules/desktop_capture/linux/x_server_pixel_buffer.h
index a9398da..a11ca20 100644
--- a/modules/desktop_capture/linux/x_server_pixel_buffer.h
+++ b/modules/desktop_capture/linux/x_server_pixel_buffer.h
@@ -17,7 +17,7 @@
 #include <X11/extensions/XShm.h>
 
 #include "modules/desktop_capture/desktop_geometry.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/mac/desktop_configuration_monitor.h b/modules/desktop_capture/mac/desktop_configuration_monitor.h
index cbf580b..1ed4c6b 100644
--- a/modules/desktop_capture/mac/desktop_configuration_monitor.h
+++ b/modules/desktop_capture/mac/desktop_configuration_monitor.h
@@ -16,10 +16,10 @@
 #include <memory>
 #include <set>
 
-#include "api/refcountedbase.h"
+#include "api/ref_counted_base.h"
 #include "modules/desktop_capture/mac/desktop_configuration.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc b/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc
index 1f99de5..3a26c77 100644
--- a/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc
+++ b/modules/desktop_capture/mac/full_screen_chrome_window_detector.cc
@@ -15,8 +15,8 @@
 
 #include "modules/desktop_capture/mac/window_list_utils.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/macutils.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/mac_utils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/mac/full_screen_chrome_window_detector.h b/modules/desktop_capture/mac/full_screen_chrome_window_detector.h
index 4fbe000..2ee99ad 100644
--- a/modules/desktop_capture/mac/full_screen_chrome_window_detector.h
+++ b/modules/desktop_capture/mac/full_screen_chrome_window_detector.h
@@ -13,9 +13,9 @@
 
 #include <ApplicationServices/ApplicationServices.h>
 
-#include "api/refcountedbase.h"
+#include "api/ref_counted_base.h"
 #include "modules/desktop_capture/desktop_capturer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/mac/screen_capturer_mac.mm b/modules/desktop_capture/mac/screen_capturer_mac.mm
index 9f50673..8f9a9d3 100644
--- a/modules/desktop_capture/mac/screen_capturer_mac.mm
+++ b/modules/desktop_capture/mac/screen_capturer_mac.mm
@@ -14,9 +14,9 @@
 
 #include "modules/desktop_capture/mac/desktop_frame_provider.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "sdk/objc/helpers/scoped_cftyperef.h"
 
diff --git a/modules/desktop_capture/mac/window_list_utils.cc b/modules/desktop_capture/mac/window_list_utils.cc
index 7f89cde..6e1fc3f 100644
--- a/modules/desktop_capture/mac/window_list_utils.cc
+++ b/modules/desktop_capture/mac/window_list_utils.cc
@@ -17,7 +17,7 @@
 #include <iterator>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/macutils.h"
+#include "rtc_base/mac_utils.h"
 
 static_assert(static_cast<webrtc::WindowId>(kCGNullWindowID) ==
                   webrtc::kNullWindowId,
diff --git a/modules/desktop_capture/mouse_cursor.h b/modules/desktop_capture/mouse_cursor.h
index d27c439..1d997e2 100644
--- a/modules/desktop_capture/mouse_cursor.h
+++ b/modules/desktop_capture/mouse_cursor.h
@@ -15,7 +15,7 @@
 
 #include "modules/desktop_capture/desktop_frame.h"
 #include "modules/desktop_capture/desktop_geometry.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/mouse_cursor_monitor_mac.mm b/modules/desktop_capture/mouse_cursor_monitor_mac.mm
index 3402a5f..814a45a 100644
--- a/modules/desktop_capture/mouse_cursor_monitor_mac.mm
+++ b/modules/desktop_capture/mouse_cursor_monitor_mac.mm
@@ -26,7 +26,7 @@
 #include "modules/desktop_capture/mac/full_screen_chrome_window_detector.h"
 #include "modules/desktop_capture/mac/window_list_utils.h"
 #include "modules/desktop_capture/mouse_cursor.h"
-#include "rtc_base/macutils.h"
+#include "rtc_base/mac_utils.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/screen_capture_frame_queue.h b/modules/desktop_capture/screen_capture_frame_queue.h
index a5bb595..40dc6da 100644
--- a/modules/desktop_capture/screen_capture_frame_queue.h
+++ b/modules/desktop_capture/screen_capture_frame_queue.h
@@ -13,7 +13,7 @@
 
 #include <memory>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 // TODO(zijiehe): These headers are not used in this file, but to avoid build
 // break in remoting/host. We should add headers in each individual files.
 #include "modules/desktop_capture/desktop_frame.h"         // Remove
diff --git a/modules/desktop_capture/screen_capturer_helper.h b/modules/desktop_capture/screen_capturer_helper.h
index d8fc368..fc4c85b 100644
--- a/modules/desktop_capture/screen_capturer_helper.h
+++ b/modules/desktop_capture/screen_capturer_helper.h
@@ -15,7 +15,7 @@
 
 #include "modules/desktop_capture/desktop_geometry.h"
 #include "modules/desktop_capture/desktop_region.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/synchronization/rw_lock_wrapper.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/screen_capturer_integration_test.cc b/modules/desktop_capture/screen_capturer_integration_test.cc
index 3fe38da..cb0e475 100644
--- a/modules/desktop_capture/screen_capturer_integration_test.cc
+++ b/modules/desktop_capture/screen_capturer_integration_test.cc
@@ -25,7 +25,7 @@
 #include "modules/desktop_capture/rgba_color.h"
 #include "modules/desktop_capture/screen_drawer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/third_party/base64/base64.h"
 #include "test/gmock.h"
diff --git a/modules/desktop_capture/screen_capturer_unittest.cc b/modules/desktop_capture/screen_capturer_unittest.cc
index 90197d6..a0b7cc5 100644
--- a/modules/desktop_capture/screen_capturer_unittest.cc
+++ b/modules/desktop_capture/screen_capturer_unittest.cc
@@ -15,7 +15,7 @@
 #include "modules/desktop_capture/desktop_frame.h"
 #include "modules/desktop_capture/desktop_region.h"
 #include "modules/desktop_capture/mock_desktop_capturer_callback.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/modules/desktop_capture/screen_drawer_unittest.cc b/modules/desktop_capture/screen_drawer_unittest.cc
index d48fa89..2186ada 100644
--- a/modules/desktop_capture/screen_drawer_unittest.cc
+++ b/modules/desktop_capture/screen_drawer_unittest.cc
@@ -19,7 +19,7 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/random.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/gtest.h"
 
diff --git a/modules/desktop_capture/shared_desktop_frame.h b/modules/desktop_capture/shared_desktop_frame.h
index 4854361..12671de 100644
--- a/modules/desktop_capture/shared_desktop_frame.h
+++ b/modules/desktop_capture/shared_desktop_frame.h
@@ -14,8 +14,8 @@
 #include <memory>
 
 #include "modules/desktop_capture/desktop_frame.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/system/rtc_export.h"
 
diff --git a/modules/desktop_capture/shared_memory.h b/modules/desktop_capture/shared_memory.h
index 81d4a30..ba846da 100644
--- a/modules/desktop_capture/shared_memory.h
+++ b/modules/desktop_capture/shared_memory.h
@@ -19,7 +19,7 @@
 
 #include <memory>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/win/desktop.h b/modules/desktop_capture/win/desktop.h
index 94857ec..deb83cf 100644
--- a/modules/desktop_capture/win/desktop.h
+++ b/modules/desktop_capture/win/desktop.h
@@ -14,7 +14,7 @@
 #include <windows.h>
 #include <string>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/win/dxgi_duplicator_controller.cc b/modules/desktop_capture/win/dxgi_duplicator_controller.cc
index 2029811..bdf4958 100644
--- a/modules/desktop_capture/win/dxgi_duplicator_controller.cc
+++ b/modules/desktop_capture/win/dxgi_duplicator_controller.cc
@@ -20,7 +20,7 @@
 #include "modules/desktop_capture/win/screen_capture_utils.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/sleep.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/win/dxgi_duplicator_controller.h b/modules/desktop_capture/win/dxgi_duplicator_controller.h
index ecae481..a4f967d 100644
--- a/modules/desktop_capture/win/dxgi_duplicator_controller.h
+++ b/modules/desktop_capture/win/dxgi_duplicator_controller.h
@@ -24,7 +24,7 @@
 #include "modules/desktop_capture/win/dxgi_adapter_duplicator.h"
 #include "modules/desktop_capture/win/dxgi_context.h"
 #include "modules/desktop_capture/win/dxgi_frame.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/win/dxgi_output_duplicator.cc b/modules/desktop_capture/win/dxgi_output_duplicator.cc
index f1f6f42..a9ea02e 100644
--- a/modules/desktop_capture/win/dxgi_output_duplicator.cc
+++ b/modules/desktop_capture/win/dxgi_output_duplicator.cc
@@ -23,7 +23,7 @@
 #include "modules/desktop_capture/win/dxgi_texture_staging.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 #include "rtc_base/win32.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/win/dxgi_output_duplicator.h b/modules/desktop_capture/win/dxgi_output_duplicator.h
index d2a019d..9c05a70 100644
--- a/modules/desktop_capture/win/dxgi_output_duplicator.h
+++ b/modules/desktop_capture/win/dxgi_output_duplicator.h
@@ -27,7 +27,7 @@
 #include "modules/desktop_capture/win/d3d_device.h"
 #include "modules/desktop_capture/win/dxgi_context.h"
 #include "modules/desktop_capture/win/dxgi_texture.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/win/scoped_gdi_object.h b/modules/desktop_capture/win/scoped_gdi_object.h
index 0de316c..56abe95 100644
--- a/modules/desktop_capture/win/scoped_gdi_object.h
+++ b/modules/desktop_capture/win/scoped_gdi_object.h
@@ -13,7 +13,7 @@
 
 #include <windows.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace win {
diff --git a/modules/desktop_capture/win/scoped_thread_desktop.h b/modules/desktop_capture/win/scoped_thread_desktop.h
index 7ea6d31..83ce454 100644
--- a/modules/desktop_capture/win/scoped_thread_desktop.h
+++ b/modules/desktop_capture/win/scoped_thread_desktop.h
@@ -15,7 +15,7 @@
 
 #include <windows.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/win/screen_capture_utils.cc b/modules/desktop_capture/win/screen_capture_utils.cc
index e294497..6ab9738 100644
--- a/modules/desktop_capture/win/screen_capture_utils.cc
+++ b/modules/desktop_capture/win/screen_capture_utils.cc
@@ -17,7 +17,7 @@
 
 #include "modules/desktop_capture/desktop_capturer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 #include "rtc_base/win32.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/win/screen_capturer_win_directx.cc b/modules/desktop_capture/win/screen_capturer_win_directx.cc
index f038c70..7d4d0aa 100644
--- a/modules/desktop_capture/win/screen_capturer_win_directx.cc
+++ b/modules/desktop_capture/win/screen_capturer_win_directx.cc
@@ -20,7 +20,7 @@
 #include "modules/desktop_capture/win/screen_capture_utils.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/win/screen_capturer_win_gdi.cc b/modules/desktop_capture/win/screen_capturer_win_gdi.cc
index 03f8340..866386c 100644
--- a/modules/desktop_capture/win/screen_capturer_win_gdi.cc
+++ b/modules/desktop_capture/win/screen_capturer_win_gdi.cc
@@ -22,7 +22,7 @@
 #include "modules/desktop_capture/win/screen_capture_utils.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 
 namespace webrtc {
diff --git a/modules/desktop_capture/win/screen_capturer_win_gdi.h b/modules/desktop_capture/win/screen_capturer_win_gdi.h
index be4794e..a9c0fa9 100644
--- a/modules/desktop_capture/win/screen_capturer_win_gdi.h
+++ b/modules/desktop_capture/win/screen_capturer_win_gdi.h
@@ -20,7 +20,7 @@
 #include "modules/desktop_capture/shared_desktop_frame.h"
 #include "modules/desktop_capture/win/display_configuration_monitor.h"
 #include "modules/desktop_capture/win/scoped_thread_desktop.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/win/screen_capturer_win_magnifier.cc b/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
index c7b07d1..891717c 100644
--- a/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
+++ b/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
@@ -22,7 +22,7 @@
 #include "modules/desktop_capture/win/screen_capture_utils.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/win/screen_capturer_win_magnifier.h b/modules/desktop_capture/win/screen_capturer_win_magnifier.h
index 28f29bc..b14beeb 100644
--- a/modules/desktop_capture/win/screen_capturer_win_magnifier.h
+++ b/modules/desktop_capture/win/screen_capturer_win_magnifier.h
@@ -22,7 +22,7 @@
 #include "modules/desktop_capture/screen_capturer_helper.h"
 #include "modules/desktop_capture/shared_desktop_frame.h"
 #include "modules/desktop_capture/win/scoped_thread_desktop.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/win/window_capture_utils.h b/modules/desktop_capture/win/window_capture_utils.h
index 024c7eb..529d1b6 100644
--- a/modules/desktop_capture/win/window_capture_utils.h
+++ b/modules/desktop_capture/win/window_capture_utils.h
@@ -13,7 +13,7 @@
 #include <wrl/client.h>
 
 #include "modules/desktop_capture/desktop_geometry.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/window_capturer_mac.mm b/modules/desktop_capture/window_capturer_mac.mm
index b0647f0..ae763f1 100644
--- a/modules/desktop_capture/window_capturer_mac.mm
+++ b/modules/desktop_capture/window_capturer_mac.mm
@@ -23,9 +23,9 @@
 #include "modules/desktop_capture/mac/full_screen_chrome_window_detector.h"
 #include "modules/desktop_capture/mac/window_list_utils.h"
 #include "modules/desktop_capture/window_finder_mac.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/macutils.h"
+#include "rtc_base/mac_utils.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/trace_event.h"
 
diff --git a/modules/desktop_capture/window_capturer_null.cc b/modules/desktop_capture/window_capturer_null.cc
index b4e8fea..66e76a5 100644
--- a/modules/desktop_capture/window_capturer_null.cc
+++ b/modules/desktop_capture/window_capturer_null.cc
@@ -12,7 +12,7 @@
 
 #include "modules/desktop_capture/desktop_capturer.h"
 #include "modules/desktop_capture/desktop_frame.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/desktop_capture/window_capturer_win.cc b/modules/desktop_capture/window_capturer_win.cc
index f345a5e..6730734 100644
--- a/modules/desktop_capture/window_capturer_win.cc
+++ b/modules/desktop_capture/window_capturer_win.cc
@@ -18,9 +18,9 @@
 #include "modules/desktop_capture/win/window_capture_utils.h"
 #include "modules/desktop_capture/window_finder_win.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 #include "rtc_base/trace_event.h"
 #include "rtc_base/win32.h"
 
diff --git a/modules/pacing/paced_sender.h b/modules/pacing/paced_sender.h
index 8ca32c3..1949dc0 100644
--- a/modules/pacing/paced_sender.h
+++ b/modules/pacing/paced_sender.h
@@ -24,7 +24,7 @@
 #include "modules/pacing/round_robin_packet_queue.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/utility/include/process_thread.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/experiments/field_trial_parser.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/modules/pacing/packet_router.cc b/modules/pacing/packet_router.cc
index 24be7ee..d674e22 100644
--- a/modules/pacing/packet_router.cc
+++ b/modules/pacing/packet_router.cc
@@ -18,9 +18,9 @@
 #include "modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 namespace {
diff --git a/modules/pacing/packet_router.h b/modules/pacing/packet_router.h
index b7cc5ff..3362298 100644
--- a/modules/pacing/packet_router.h
+++ b/modules/pacing/packet_router.h
@@ -20,8 +20,8 @@
 #include "modules/pacing/paced_sender.h"
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/pacing/packet_router_unittest.cc b/modules/pacing/packet_router_unittest.cc
index f4a71c8..b3d91e6 100644
--- a/modules/pacing/packet_router_unittest.cc
+++ b/modules/pacing/packet_router_unittest.cc
@@ -16,7 +16,7 @@
 #include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 
diff --git a/modules/remote_bitrate_estimator/bwe_simulations.cc b/modules/remote_bitrate_estimator/bwe_simulations.cc
index 6579fe7..a1fde94 100644
--- a/modules/remote_bitrate_estimator/bwe_simulations.cc
+++ b/modules/remote_bitrate_estimator/bwe_simulations.cc
@@ -19,11 +19,11 @@
 #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h"
 #include "modules/remote_bitrate_estimator/test/packet_receiver.h"
 #include "modules/remote_bitrate_estimator/test/packet_sender.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/random.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace testing {
diff --git a/modules/remote_bitrate_estimator/inter_arrival.h b/modules/remote_bitrate_estimator/inter_arrival.h
index f2facd4..1d84970 100644
--- a/modules/remote_bitrate_estimator/inter_arrival.h
+++ b/modules/remote_bitrate_estimator/inter_arrival.h
@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/remote_bitrate_estimator/overuse_detector.h b/modules/remote_bitrate_estimator/overuse_detector.h
index 61d1c3f..a72881b 100644
--- a/modules/remote_bitrate_estimator/overuse_detector.h
+++ b/modules/remote_bitrate_estimator/overuse_detector.h
@@ -13,7 +13,7 @@
 #include <stdint.h>
 
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/remote_bitrate_estimator/overuse_estimator.h b/modules/remote_bitrate_estimator/overuse_estimator.h
index 3d7bd16..c06345b 100644
--- a/modules/remote_bitrate_estimator/overuse_estimator.h
+++ b/modules/remote_bitrate_estimator/overuse_estimator.h
@@ -15,7 +15,7 @@
 
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
index 1ad35c7..3f943cc 100644
--- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
+++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
@@ -16,7 +16,7 @@
 
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/metrics.h"
diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
index 5f7f7e9..aee10ca 100644
--- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
+++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h
@@ -25,8 +25,8 @@
 #include "modules/remote_bitrate_estimator/overuse_detector.h"
 #include "modules/remote_bitrate_estimator/overuse_estimator.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/rate_statistics.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc
index 117beba..10dd99c 100644
--- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc
+++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc
@@ -11,7 +11,7 @@
 #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h"
 
 #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
index 638f0d6..ab54218 100644
--- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
+++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h
@@ -19,8 +19,8 @@
 
 #include "modules/remote_bitrate_estimator/aimd_rate_control.h"
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/rate_statistics.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc
index c1116a4..d0a7b22 100644
--- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc
+++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc
@@ -11,7 +11,7 @@
 #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h"
 
 #include "modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
index c3a323b..8485ada 100644
--- a/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
+++ b/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
@@ -18,7 +18,7 @@
 #include <vector>
 
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
 
diff --git a/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc b/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc
index 74feed2..1d03038 100644
--- a/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc
+++ b/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc
@@ -20,12 +20,12 @@
 #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h"
 #include "modules/remote_bitrate_estimator/test/packet_receiver.h"
 #include "modules/remote_bitrate_estimator/test/packet_sender.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/random.h"
 #include "system_wrappers/include/clock.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace testing {
diff --git a/modules/remote_bitrate_estimator/remote_estimator_proxy.h b/modules/remote_bitrate_estimator/remote_estimator_proxy.h
index 63994c4..ed4e29b 100644
--- a/modules/remote_bitrate_estimator/remote_estimator_proxy.h
+++ b/modules/remote_bitrate_estimator/remote_estimator_proxy.h
@@ -16,7 +16,7 @@
 
 #include "modules/include/module_common_types.h"
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
diff --git a/modules/remote_bitrate_estimator/test/bwe.cc b/modules/remote_bitrate_estimator/test/bwe.cc
index 1d9b727..b672ddd 100644
--- a/modules/remote_bitrate_estimator/test/bwe.cc
+++ b/modules/remote_bitrate_estimator/test/bwe.cc
@@ -18,7 +18,7 @@
 #include "modules/remote_bitrate_estimator/test/estimators/remb.h"
 #include "modules/remote_bitrate_estimator/test/estimators/send_side.h"
 #include "modules/remote_bitrate_estimator/test/estimators/tcp.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/system/fallthrough.h"
 
diff --git a/modules/remote_bitrate_estimator/test/bwe.h b/modules/remote_bitrate_estimator/test/bwe.h
index 62f8dc1..cf2517c 100644
--- a/modules/remote_bitrate_estimator/test/bwe.h
+++ b/modules/remote_bitrate_estimator/test/bwe.h
@@ -22,7 +22,7 @@
 #include "modules/include/module.h"
 #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h"
 #include "modules/remote_bitrate_estimator/test/packet.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/gtest_prod_util.h"
 #include "rtc_base/numerics/sequence_number_util.h"
 #include "system_wrappers/include/clock.h"
diff --git a/modules/remote_bitrate_estimator/test/bwe_test.h b/modules/remote_bitrate_estimator/test/bwe_test.h
index 34030e9..275a696 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test.h
+++ b/modules/remote_bitrate_estimator/test/bwe_test.h
@@ -18,7 +18,7 @@
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "modules/remote_bitrate_estimator/test/bwe.h"
 #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc
index 8661540..8e4b7b4 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc
+++ b/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc
@@ -17,8 +17,8 @@
 #include <vector>
 
 #include "modules/remote_bitrate_estimator/test/bwe_test_fileutils.h"
-#include "rtc_base/constructormagic.h"
-#include "test/testsupport/fileutils.h"
+#include "rtc_base/constructor_magic.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace testing {
diff --git a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc
index afea787..a69f672 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc
+++ b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc
@@ -18,7 +18,7 @@
 #include <assert.h>
 
 #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace testing {
diff --git a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h
index fcb1538..c38bc10 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h
+++ b/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace testing {
diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
index 1fd7832..81d77e1 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
+++ b/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
@@ -18,7 +18,7 @@
 
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/system/unused.h"
 
diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/modules/remote_bitrate_estimator/test/bwe_test_framework.h
index c84a901..cd1af97 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test_framework.h
+++ b/modules/remote_bitrate_estimator/test/bwe_test_framework.h
@@ -30,7 +30,7 @@
 #include "modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 #include "modules/remote_bitrate_estimator/test/packet.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/random.h"
 #include "rtc_base/strings/string_builder.h"
 #include "system_wrappers/include/clock.h"
diff --git a/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
index 6daac19..f9da01e 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
+++ b/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
@@ -15,9 +15,9 @@
 #include "modules/remote_bitrate_estimator/test/packet.h"
 #include "modules/remote_bitrate_estimator/test/packet_sender.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace testing {
diff --git a/modules/remote_bitrate_estimator/test/bwe_test_logging.h b/modules/remote_bitrate_estimator/test/bwe_test_logging.h
index 6e0f66a..5ad58df 100644
--- a/modules/remote_bitrate_estimator/test/bwe_test_logging.h
+++ b/modules/remote_bitrate_estimator/test/bwe_test_logging.h
@@ -129,8 +129,8 @@
 #include <string>
 
 #include "common_types.h"  // NOLINT(build/include)
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 
 #define BWE_TEST_LOGGING_GLOBAL_CONTEXT(name)                             \
   do {                                                                    \
diff --git a/modules/remote_bitrate_estimator/test/estimators/nada.h b/modules/remote_bitrate_estimator/test/estimators/nada.h
index 7faedc6..3ba923f5 100644
--- a/modules/remote_bitrate_estimator/test/estimators/nada.h
+++ b/modules/remote_bitrate_estimator/test/estimators/nada.h
@@ -23,7 +23,7 @@
 
 #include "modules/include/module_common_types.h"
 #include "modules/remote_bitrate_estimator/test/bwe.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/remote_bitrate_estimator/test/estimators/remb.h b/modules/remote_bitrate_estimator/test/estimators/remb.h
index 34c57b8..df16fec 100644
--- a/modules/remote_bitrate_estimator/test/estimators/remb.h
+++ b/modules/remote_bitrate_estimator/test/estimators/remb.h
@@ -17,7 +17,7 @@
 
 #include "logging/rtc_event_log/mock/mock_rtc_event_log.h"
 #include "modules/remote_bitrate_estimator/test/bwe.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/remote_bitrate_estimator/test/estimators/send_side.h b/modules/remote_bitrate_estimator/test/estimators/send_side.h
index f545b96..2313b7b 100644
--- a/modules/remote_bitrate_estimator/test/estimators/send_side.h
+++ b/modules/remote_bitrate_estimator/test/estimators/send_side.h
@@ -25,7 +25,7 @@
 #include "modules/remote_bitrate_estimator/test/bwe.h"
 #include "modules/remote_bitrate_estimator/test/packet.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gmock.h"
 
diff --git a/modules/remote_bitrate_estimator/test/packet_receiver.h b/modules/remote_bitrate_estimator/test/packet_receiver.h
index 940d4b0..848119e 100644
--- a/modules/remote_bitrate_estimator/test/packet_receiver.h
+++ b/modules/remote_bitrate_estimator/test/packet_receiver.h
@@ -20,7 +20,7 @@
 #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h"
 #include "modules/remote_bitrate_estimator/test/metric_recorder.h"
 #include "modules/remote_bitrate_estimator/test/packet.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace testing {
diff --git a/modules/remote_bitrate_estimator/test/packet_sender.h b/modules/remote_bitrate_estimator/test/packet_sender.h
index 42e98b6..1d3b355 100644
--- a/modules/remote_bitrate_estimator/test/packet_sender.h
+++ b/modules/remote_bitrate_estimator/test/packet_sender.h
@@ -20,7 +20,7 @@
 #include "modules/include/module.h"
 #include "modules/remote_bitrate_estimator/test/bwe.h"
 #include "modules/remote_bitrate_estimator/test/bwe_test_framework.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace testing {
diff --git a/modules/rtp_rtcp/include/flexfec_sender.h b/modules/rtp_rtcp/include/flexfec_sender.h
index acee117..aa0e8e0 100644
--- a/modules/rtp_rtcp/include/flexfec_sender.h
+++ b/modules/rtp_rtcp/include/flexfec_sender.h
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "api/array_view.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
diff --git a/modules/rtp_rtcp/include/remote_ntp_time_estimator.h b/modules/rtp_rtcp/include/remote_ntp_time_estimator.h
index e6d269c..dd0e0de 100644
--- a/modules/rtp_rtcp/include/remote_ntp_time_estimator.h
+++ b/modules/rtp_rtcp/include/remote_ntp_time_estimator.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/numerics/moving_median_filter.h"
 #include "system_wrappers/include/rtp_to_ntp_estimator.h"
 
diff --git a/modules/rtp_rtcp/include/rtp_header_extension_map.h b/modules/rtp_rtcp/include/rtp_header_extension_map.h
index 391c5be..07b31a3 100644
--- a/modules/rtp_rtcp/include/rtp_header_extension_map.h
+++ b/modules/rtp_rtcp/include/rtp_header_extension_map.h
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "api/array_view.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "rtc_base/checks.h"
 
diff --git a/modules/rtp_rtcp/include/rtp_header_parser.h b/modules/rtp_rtcp/include/rtp_header_parser.h
index 85eab90..1b0156b 100644
--- a/modules/rtp_rtcp/include/rtp_header_parser.h
+++ b/modules/rtp_rtcp/include/rtp_header_parser.h
@@ -10,7 +10,7 @@
 #ifndef MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_PARSER_H_
 #define MODULES_RTP_RTCP_INCLUDE_RTP_HEADER_PARSER_H_
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 
 namespace webrtc {
diff --git a/modules/rtp_rtcp/include/rtp_rtcp.h b/modules/rtp_rtcp/include/rtp_rtcp.h
index f6b0c0f..29aa2f0 100644
--- a/modules/rtp_rtcp/include/rtp_rtcp.h
+++ b/modules/rtp_rtcp/include/rtp_rtcp.h
@@ -23,7 +23,7 @@
 #include "modules/rtp_rtcp/include/flexfec_sender.h"
 #include "modules/rtp_rtcp/include/receive_statistics.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/deprecation.h"
 
 namespace webrtc {
diff --git a/modules/rtp_rtcp/source/contributing_sources.h b/modules/rtp_rtcp/source/contributing_sources.h
index 5e34539..81bf725 100644
--- a/modules/rtp_rtcp/source/contributing_sources.h
+++ b/modules/rtp_rtcp/source/contributing_sources.h
@@ -18,8 +18,8 @@
 
 #include "absl/types/optional.h"
 #include "api/array_view.h"
-#include "api/rtpreceiverinterface.h"  // For RtpSource
-#include "rtc_base/timeutils.h"        // For kNumMillisecsPerSec
+#include "api/rtp_receiver_interface.h"  // For RtpSource
+#include "rtc_base/time_utils.h"         // For kNumMillisecsPerSec
 
 namespace webrtc {
 
diff --git a/modules/rtp_rtcp/source/contributing_sources_unittest.cc b/modules/rtp_rtcp/source/contributing_sources_unittest.cc
index 5f1d8d3..38d25ce 100644
--- a/modules/rtp_rtcp/source/contributing_sources_unittest.cc
+++ b/modules/rtp_rtcp/source/contributing_sources_unittest.cc
@@ -10,7 +10,7 @@
 
 #include "modules/rtp_rtcp/source/contributing_sources.h"
 
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/modules/rtp_rtcp/source/dtmf_queue.h b/modules/rtp_rtcp/source/dtmf_queue.h
index e5955a1..28116bc 100644
--- a/modules/rtp_rtcp/source/dtmf_queue.h
+++ b/modules/rtp_rtcp/source/dtmf_queue.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <list>
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 class DtmfQueue {
diff --git a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc
index ddc2805..c561dbb 100644
--- a/modules/rtp_rtcp/source/flexfec_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/flexfec_sender_unittest.cc
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "modules/rtp_rtcp/include/flexfec_sender.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/fec_test_helper.h"
diff --git a/modules/rtp_rtcp/source/playout_delay_oracle.h b/modules/rtp_rtcp/source/playout_delay_oracle.h
index 0e3bd39..32f7d40 100644
--- a/modules/rtp_rtcp/source/playout_delay_oracle.h
+++ b/modules/rtp_rtcp/source/playout_delay_oracle.h
@@ -16,8 +16,8 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module_common_types_public.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/rtp_rtcp/source/receive_statistics_impl.h b/modules/rtp_rtcp/source/receive_statistics_impl.h
index 0221d85..c153281 100644
--- a/modules/rtp_rtcp/source/receive_statistics_impl.h
+++ b/modules/rtp_rtcp/source/receive_statistics_impl.h
@@ -19,7 +19,7 @@
 
 #include "absl/types/optional.h"
 #include "modules/include/module_common_types_public.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/rate_statistics.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h
index 89b7814..f521c7f 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "modules/rtp_rtcp/source/rtcp_packet.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace rtcp {
diff --git a/modules/rtp_rtcp/source/rtcp_receiver.h b/modules/rtp_rtcp/source/rtcp_receiver.h
index be4c70e..fe6ec4c 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver.h
+++ b/modules/rtp_rtcp/source/rtcp_receiver.h
@@ -21,7 +21,7 @@
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/rtcp_nack_stats.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/ntp_time.h"
 
diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc
index 2581487..3aedeec 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -37,7 +37,7 @@
 #include "modules/rtp_rtcp/source/time_util.h"
 #include "modules/rtp_rtcp/source/tmmbr_help.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/trace_event.h"
diff --git a/modules/rtp_rtcp/source/rtcp_sender.h b/modules/rtp_rtcp/source/rtcp_sender.h
index 0845397..94c365b 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.h
+++ b/modules/rtp_rtcp/source/rtcp_sender.h
@@ -29,8 +29,8 @@
 #include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/report_block.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/random.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.cc b/modules/rtp_rtcp/source/rtcp_transceiver.cc
index 57d2142..6c0e0b7 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver.cc
@@ -16,7 +16,7 @@
 #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/event.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 namespace {
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.h b/modules/rtp_rtcp/source/rtcp_transceiver.h
index 9c96751..16fd5a7 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver.h
+++ b/modules/rtp_rtcp/source/rtcp_transceiver.h
@@ -18,7 +18,7 @@
 
 #include "modules/rtp_rtcp/source/rtcp_transceiver_config.h"
 #include "modules/rtp_rtcp/source/rtcp_transceiver_impl.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/task_queue.h"
 
 namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
index 97c2ac0..5acad08 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
@@ -33,7 +33,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/task_queue.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 namespace {
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc b/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc
index e86d67f..50ca111 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc
@@ -21,7 +21,7 @@
 #include "modules/rtp_rtcp/source/rtcp_packet/compound_packet.h"
 #include "modules/rtp_rtcp/source/time_util.h"
 #include "rtc_base/event.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/task_queue.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/modules/rtp_rtcp/source/rtp_format_h264.h b/modules/rtp_rtcp/source/rtp_format_h264.h
index fbd4fd9..108156f 100644
--- a/modules/rtp_rtcp/source/rtp_format_h264.h
+++ b/modules/rtp_rtcp/source/rtp_format_h264.h
@@ -23,7 +23,7 @@
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "modules/video_coding/codecs/h264/include/h264_globals.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.h b/modules/rtp_rtcp/source/rtp_format_video_generic.h
index 3458d49..982e35a 100644
--- a/modules/rtp_rtcp/source/rtp_format_video_generic.h
+++ b/modules/rtp_rtcp/source/rtp_format_video_generic.h
@@ -16,7 +16,7 @@
 #include "api/array_view.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/source/rtp_format.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.h b/modules/rtp_rtcp/source/rtp_format_vp8.h
index 444298f..0e0fa52 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8.h
+++ b/modules/rtp_rtcp/source/rtp_format_vp8.h
@@ -34,7 +34,7 @@
 #include "modules/rtp_rtcp/source/rtp_format.h"
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "modules/video_coding/codecs/vp8/include/vp8_globals.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h
index 07f5f64..03d4e58 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h
+++ b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h
@@ -22,7 +22,7 @@
 #include "modules/rtp_rtcp/source/rtp_format_vp8.h"
 #include "modules/video_coding/codecs/vp8/include/vp8_globals.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.cc b/modules/rtp_rtcp/source/rtp_format_vp9.cc
index 9cd7514..bbb8e29 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp9.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp9.cc
@@ -15,7 +15,7 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "modules/video_coding/codecs/interface/common_constants.h"
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 
diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.h b/modules/rtp_rtcp/source/rtp_format_vp9.h
index c3b8f17..2918b06 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp9.h
+++ b/modules/rtp_rtcp/source/rtp_format_vp9.h
@@ -29,7 +29,7 @@
 #include "modules/rtp_rtcp/source/rtp_format.h"
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/rtp_rtcp/source/rtp_header_extension_size.cc b/modules/rtp_rtcp/source/rtp_header_extension_size.cc
index f20ca00..7719922 100644
--- a/modules/rtp_rtcp/source/rtp_header_extension_size.cc
+++ b/modules/rtp_rtcp/source/rtp_header_extension_size.cc
@@ -10,7 +10,7 @@
 
 #include "modules/rtp_rtcp/source/rtp_header_extension_size.h"
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 
 namespace webrtc {
 
diff --git a/modules/rtp_rtcp/source/rtp_header_parser.cc b/modules/rtp_rtcp/source/rtp_header_parser.cc
index 6481a40..4e4c723 100644
--- a/modules/rtp_rtcp/source/rtp_header_parser.cc
+++ b/modules/rtp_rtcp/source/rtp_header_parser.cc
@@ -13,7 +13,7 @@
 
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/source/rtp_utility.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtp_packet.cc b/modules/rtp_rtcp/source/rtp_packet.cc
index 3fb80e4..6f22735 100644
--- a/modules/rtp_rtcp/source/rtp_packet.cc
+++ b/modules/rtp_rtcp/source/rtp_packet.cc
@@ -14,7 +14,7 @@
 #include <cstring>
 #include <utility>
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
diff --git a/modules/rtp_rtcp/source/rtp_packet.h b/modules/rtp_rtcp/source/rtp_packet.h
index ddf261a..c067580 100644
--- a/modules/rtp_rtcp/source/rtp_packet.h
+++ b/modules/rtp_rtcp/source/rtp_packet.h
@@ -16,7 +16,7 @@
 #include "api/array_view.h"
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/deprecation.h"
 
 namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtp_packet_history.h b/modules/rtp_rtcp/source/rtp_packet_history.h
index 095424e..c5b6e4d 100644
--- a/modules/rtp_rtcp/source/rtp_packet_history.h
+++ b/modules/rtp_rtcp/source/rtp_packet_history.h
@@ -16,8 +16,8 @@
 #include <vector>
 
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h
index 78fa70a..7d5466a 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h
@@ -32,7 +32,7 @@
 #include "modules/rtp_rtcp/source/rtcp_receiver.h"
 #include "modules/rtp_rtcp/source/rtcp_sender.h"
 #include "modules/rtp_rtcp/source/rtp_sender.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/gtest_prod_util.h"
 
 namespace webrtc {
diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc
index 87f1c00..edd2edb 100644
--- a/modules/rtp_rtcp/source/rtp_sender.cc
+++ b/modules/rtp_rtcp/source/rtp_sender.cc
@@ -35,7 +35,7 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/rate_limiter.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h
index d3c6599..e5ddfcc 100644
--- a/modules/rtp_rtcp/source/rtp_sender.h
+++ b/modules/rtp_rtcp/source/rtp_sender.h
@@ -29,8 +29,8 @@
 #include "modules/rtp_rtcp/source/rtp_packet_history.h"
 #include "modules/rtp_rtcp/source/rtp_rtcp_config.h"
 #include "modules/rtp_rtcp/source/rtp_utility.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/deprecation.h"
 #include "rtc_base/random.h"
 #include "rtc_base/rate_statistics.h"
diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.h b/modules/rtp_rtcp/source/rtp_sender_audio.h
index 1dbe5b5..6580f7a 100644
--- a/modules/rtp_rtcp/source/rtp_sender_audio.h
+++ b/modules/rtp_rtcp/source/rtp_sender_audio.h
@@ -19,9 +19,9 @@
 #include "modules/rtp_rtcp/source/dtmf_queue.h"
 #include "modules/rtp_rtcp/source/rtp_sender.h"
 #include "modules/rtp_rtcp/source/rtp_utility.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/onetimeevent.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/one_time_event.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
 
diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc
index 2f592b3..8f276c4 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video.cc
@@ -20,7 +20,7 @@
 
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
-#include "api/crypto/frameencryptorinterface.h"
+#include "api/crypto/frame_encryptor_interface.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "modules/rtp_rtcp/source/rtp_format_video_generic.h"
diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h
index 5821b12..91dc662 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video.h
+++ b/modules/rtp_rtcp/source/rtp_sender_video.h
@@ -23,8 +23,8 @@
 #include "modules/rtp_rtcp/source/rtp_sender.h"
 #include "modules/rtp_rtcp/source/rtp_utility.h"
 #include "modules/rtp_rtcp/source/ulpfec_generator.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/onetimeevent.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/one_time_event.h"
 #include "rtc_base/rate_statistics.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/modules/rtp_rtcp/source/time_util.cc b/modules/rtp_rtcp/source/time_util.cc
index e65329d..806f9a9 100644
--- a/modules/rtp_rtcp/source/time_util.cc
+++ b/modules/rtp_rtcp/source/time_util.cc
@@ -13,7 +13,7 @@
 #include <algorithm>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 namespace {
diff --git a/modules/rtp_rtcp/source/time_util_unittest.cc b/modules/rtp_rtcp/source/time_util_unittest.cc
index 0ff4f7b..f4315e5 100644
--- a/modules/rtp_rtcp/source/time_util_unittest.cc
+++ b/modules/rtp_rtcp/source/time_util_unittest.cc
@@ -9,8 +9,8 @@
  */
 #include "modules/rtp_rtcp/source/time_util.h"
 
-#include "rtc_base/fakeclock.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/fake_clock.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
 
diff --git a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h
index 0943266..2821513 100644
--- a/modules/rtp_rtcp/source/ulpfec_receiver_impl.h
+++ b/modules/rtp_rtcp/source/ulpfec_receiver_impl.h
@@ -20,7 +20,7 @@
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/include/ulpfec_receiver.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
diff --git a/modules/rtp_rtcp/test/testFec/test_fec.cc b/modules/rtp_rtcp/test/testFec/test_fec.cc
index 7c65d3d..3a893b3 100644
--- a/modules/rtp_rtcp/test/testFec/test_fec.cc
+++ b/modules/rtp_rtcp/test/testFec/test_fec.cc
@@ -23,7 +23,7 @@
 #include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
 #include "rtc_base/random.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 // #define VERBOSE_OUTPUT
 
diff --git a/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
index f6d2dea..8d77a27 100644
--- a/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
+++ b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
@@ -50,7 +50,7 @@
 #include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
 #include "modules/rtp_rtcp/test/testFec/average_residual_loss_xor_codes.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/utility/source/process_thread_impl.cc b/modules/utility/source/process_thread_impl.cc
index 20f26d9..fbe60bb 100644
--- a/modules/utility/source/process_thread_impl.cc
+++ b/modules/utility/source/process_thread_impl.cc
@@ -15,7 +15,7 @@
 #include "modules/include/module.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/task_queue.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 
 namespace webrtc {
diff --git a/modules/utility/source/process_thread_impl.h b/modules/utility/source/process_thread_impl.h
index fff21d0..e927c1d 100644
--- a/modules/utility/source/process_thread_impl.h
+++ b/modules/utility/source/process_thread_impl.h
@@ -18,7 +18,7 @@
 
 #include "modules/include/module.h"
 #include "modules/utility/include/process_thread.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/location.h"
 #include "rtc_base/platform_thread.h"
diff --git a/modules/utility/source/process_thread_impl_unittest.cc b/modules/utility/source/process_thread_impl_unittest.cc
index 1915796..013ef52 100644
--- a/modules/utility/source/process_thread_impl_unittest.cc
+++ b/modules/utility/source/process_thread_impl_unittest.cc
@@ -15,7 +15,7 @@
 #include "modules/utility/source/process_thread_impl.h"
 #include "rtc_base/location.h"
 #include "rtc_base/task_queue.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 
diff --git a/modules/video_capture/external/video_capture_external.cc b/modules/video_capture/external/video_capture_external.cc
index 776444c..1c5a90a 100644
--- a/modules/video_capture/external/video_capture_external.cc
+++ b/modules/video_capture/external/video_capture_external.cc
@@ -10,7 +10,7 @@
 
 #include "modules/video_capture/video_capture.h"
 #include "modules/video_capture/video_capture_impl.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/video_capture/linux/video_capture_linux.cc b/modules/video_capture/linux/video_capture_linux.cc
index f35f42c..714a0f9 100644
--- a/modules/video_capture/linux/video_capture_linux.cc
+++ b/modules/video_capture/linux/video_capture_linux.cc
@@ -23,10 +23,10 @@
 #include <new>
 #include <string>
 
-#include "media/base/videocommon.h"
+#include "media/base/video_common.h"
 #include "modules/video_capture/video_capture.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/video_capture/linux/video_capture_linux.h b/modules/video_capture/linux/video_capture_linux.h
index 8004823..c162e03 100644
--- a/modules/video_capture/linux/video_capture_linux.h
+++ b/modules/video_capture/linux/video_capture_linux.h
@@ -18,7 +18,7 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_capture/video_capture_defines.h"
 #include "modules/video_capture/video_capture_impl.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/platform_thread.h"
 
 namespace webrtc {
diff --git a/modules/video_capture/objc/video_capture.mm b/modules/video_capture/objc/video_capture.mm
index 6dd2fd6..1b173f9 100644
--- a/modules/video_capture/objc/video_capture.mm
+++ b/modules/video_capture/objc/video_capture.mm
@@ -14,8 +14,8 @@
 
 #include "modules/video_capture/objc/device_info_objc.h"
 #include "modules/video_capture/objc/rtc_video_capture_objc.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 using namespace webrtc;
diff --git a/modules/video_capture/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc
index 8238c20..63d5018 100644
--- a/modules/video_capture/test/video_capture_unittest.cc
+++ b/modules/video_capture/test/video_capture_unittest.cc
@@ -21,9 +21,9 @@
 #include "modules/utility/include/process_thread.h"
 #include "modules/video_capture/video_capture.h"
 #include "modules/video_capture/video_capture_factory.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/frame_utils.h"
 #include "test/gtest.h"
diff --git a/modules/video_capture/video_capture_impl.cc b/modules/video_capture/video_capture_impl.cc
index bd2ecf4..7977a24 100644
--- a/modules/video_capture/video_capture_impl.cc
+++ b/modules/video_capture/video_capture_impl.cc
@@ -18,8 +18,8 @@
 #include "modules/video_capture/video_capture_config.h"
 #include "modules/video_capture/video_capture_impl.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "third_party/libyuv/include/libyuv.h"
 
diff --git a/modules/video_capture/video_capture_impl.h b/modules/video_capture/video_capture_impl.h
index 358f002..2ec3547 100644
--- a/modules/video_capture/video_capture_impl.h
+++ b/modules/video_capture/video_capture_impl.h
@@ -24,7 +24,7 @@
 #include "modules/video_capture/video_capture.h"
 #include "modules/video_capture/video_capture_config.h"
 #include "modules/video_capture/video_capture_defines.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/video_capture/windows/device_info_ds.cc b/modules/video_capture/windows/device_info_ds.cc
index 7cba0d4..935d125 100644
--- a/modules/video_capture/windows/device_info_ds.cc
+++ b/modules/video_capture/windows/device_info_ds.cc
@@ -13,7 +13,7 @@
 #include "modules/video_capture/video_capture_config.h"
 #include "modules/video_capture/windows/help_functions_ds.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 
 #include <dvdmedia.h>
 #include <streams.h>
diff --git a/modules/video_capture/windows/sink_filter_ds.cc b/modules/video_capture/windows/sink_filter_ds.cc
index c2db44b..2e005ef 100644
--- a/modules/video_capture/windows/sink_filter_ds.cc
+++ b/modules/video_capture/windows/sink_filter_ds.cc
@@ -14,7 +14,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 
 #include <dvdmedia.h>  // VIDEOINFOHEADER2
 #include <initguid.h>
diff --git a/modules/video_capture/windows/video_capture_factory_windows.cc b/modules/video_capture/windows/video_capture_factory_windows.cc
index 52a3cb51..9f76902 100644
--- a/modules/video_capture/windows/video_capture_factory_windows.cc
+++ b/modules/video_capture/windows/video_capture_factory_windows.cc
@@ -10,8 +10,8 @@
 
 #include "modules/video_capture/windows/video_capture_ds.h"
 #include "modules/video_capture/windows/video_capture_mf.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/codecs/h264/h264.cc b/modules/video_coding/codecs/h264/h264.cc
index 4ab7ab5..6a692fb 100644
--- a/modules/video_coding/codecs/h264/h264.cc
+++ b/modules/video_coding/codecs/h264/h264.cc
@@ -18,7 +18,7 @@
 #include "api/video_codecs/sdp_video_format.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "media/base/h264_profile_level_id.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 
 #if defined(WEBRTC_USE_H264)
 #include "modules/video_coding/codecs/h264/h264_decoder_impl.h"
diff --git a/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/modules/video_coding/codecs/h264/h264_decoder_impl.cc
index 0853d8f..89155f2 100644
--- a/modules/video_coding/codecs/h264/h264_decoder_impl.cc
+++ b/modules/video_coding/codecs/h264/h264_decoder_impl.cc
@@ -26,7 +26,7 @@
 #include "common_video/include/video_frame_buffer.h"
 #include "modules/video_coding/codecs/h264/h264_color_space.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/keep_ref_until_done.h"
 #include "rtc_base/logging.h"
 #include "system_wrappers/include/metrics.h"
diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc
index 3a49ac0..05b26fe 100644
--- a/modules/video_coding/codecs/h264/h264_encoder_impl.cc
+++ b/modules/video_coding/codecs/h264/h264_encoder_impl.cc
@@ -25,7 +25,7 @@
 #include "modules/video_coding/utility/simulcast_utility.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/metrics.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/scale.h"
diff --git a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
index 384ea70..8fa2d49 100644
--- a/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
+++ b/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
@@ -22,7 +22,7 @@
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "common_video/test/utilities.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
 #include "modules/video_coding/codecs/test/video_codec_unittest.h"
 #include "modules/video_coding/include/video_codec_interface.h"
diff --git a/modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h b/modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h
index 235a360..0543edd 100644
--- a/modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h
+++ b/modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h
@@ -20,7 +20,7 @@
 #include "api/video_codecs/video_encoder_factory.h"
 #include "modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h"
 #include "modules/video_coding/include/video_codec_interface.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
diff --git a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
index 4c904c1..63bed8b 100644
--- a/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
+++ b/modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
@@ -29,7 +29,7 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "common_video/include/video_frame_buffer.h"
 #include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/multiplex/include/augmented_video_frame_buffer.h"
 #include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h"
 #include "modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h"
@@ -39,7 +39,7 @@
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/keep_ref_until_done.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/modules/video_coding/codecs/test/video_codec_unittest.h b/modules/video_coding/codecs/test/video_codec_unittest.h
index 9a4d60c..1b6a1f9 100644
--- a/modules/video_coding/codecs/test/video_codec_unittest.h
+++ b/modules/video_coding/codecs/test/video_codec_unittest.h
@@ -19,7 +19,7 @@
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/utility/vp8_header_parser.h"
 #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/thread_annotations.h"
 #include "test/frame_generator.h"
diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
index c9c84ed..de3dad3 100644
--- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
@@ -29,9 +29,9 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "common_video/h264/h264_common.h"
 #include "media/base/h264_profile_level_id.h"
-#include "media/base/mediaconstants.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/base/media_constants.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
 #include "media/engine/simulcast.h"
 #include "modules/video_coding/codecs/h264/include/h264_globals.h"
 #include "modules/video_coding/codecs/vp9/svc_config.h"
@@ -41,11 +41,11 @@
 #include "rtc_base/event.h"
 #include "rtc_base/file.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/cpu_info.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "test/testsupport/frame_writer.h"
 #include "test/video_codec_settings.h"
 
diff --git a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
index 9665d1c..4f63aa9 100644
--- a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc
@@ -14,14 +14,14 @@
 #include "api/test/create_videocodec_test_fixture.h"
 #include "api/test/video/function_video_encoder_factory.h"
 #include "api/video_codecs/sdp_video_format.h"
-#include "media/base/mediaconstants.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/base/media_constants.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
 #include "media/engine/simulcast_encoder_adapter.h"
 #include "modules/video_coding/utility/vp8_header_parser.h"
 #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc b/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc
index 916f033..f817f8c 100644
--- a/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc
@@ -15,11 +15,11 @@
 #include "absl/memory/memory.h"
 #include "api/test/create_videocodec_test_fixture.h"
 #include "common_types.h"  // NOLINT(build/include)
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/test/android_codec_factory_helper.h"
 #include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/video_coding/codecs/test/videocodec_test_openh264.cc b/modules/video_coding/codecs/test/videocodec_test_openh264.cc
index b386178..59d214c 100644
--- a/modules/video_coding/codecs/test/videocodec_test_openh264.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_openh264.cc
@@ -12,10 +12,10 @@
 
 #include "absl/memory/memory.h"
 #include "api/test/create_videocodec_test_fixture.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/video_coding/codecs/test/videocodec_test_parameterized.cc b/modules/video_coding/codecs/test/videocodec_test_parameterized.cc
index d0ee265..099d06c 100644
--- a/modules/video_coding/codecs/test/videocodec_test_parameterized.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_parameterized.cc
@@ -10,7 +10,7 @@
 
 #include "api/test/create_videocodec_test_fixture.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc b/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc
index f1e565c..10bcf65 100644
--- a/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc
+++ b/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc
@@ -12,11 +12,11 @@
 
 #include "absl/memory/memory.h"
 #include "api/test/create_videocodec_test_fixture.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/test/objc_codec_factory_helper.h"
 #include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/video_coding/codecs/test/videoprocessor.cc b/modules/video_coding/codecs/test/videoprocessor.cc
index 83181a0..85e7173 100644
--- a/modules/video_coding/codecs/test/videoprocessor.cc
+++ b/modules/video_coding/codecs/test/videoprocessor.cc
@@ -31,7 +31,7 @@
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 #include "third_party/libyuv/include/libyuv/compare.h"
 #include "third_party/libyuv/include/libyuv/scale.h"
diff --git a/modules/video_coding/codecs/test/videoprocessor.h b/modules/video_coding/codecs/test/videoprocessor.h
index 1a1bdb3..aaf9ccf 100644
--- a/modules/video_coding/codecs/test/videoprocessor.h
+++ b/modules/video_coding/codecs/test/videoprocessor.h
@@ -32,7 +32,7 @@
 #include "modules/video_coding/utility/ivf_file_writer.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
index f83240f..541fc45 100644
--- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc
+++ b/modules/video_coding/codecs/test/videoprocessor_unittest.cc
@@ -15,7 +15,7 @@
 #include "api/test/mock_video_encoder.h"
 #include "api/test/videocodec_test_fixture.h"
 #include "api/video/i420_buffer.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/test/videocodec_test_stats_impl.h"
 #include "modules/video_coding/codecs/test/videoprocessor.h"
 #include "rtc_base/scoped_ref_ptr.h"
diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
index b0d5e1d..7b95d2b 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc
@@ -26,7 +26,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/numerics/exp_filter.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/field_trial.h"
 #include "system_wrappers/include/metrics.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers.h b/modules/video_coding/codecs/vp8/screenshare_layers.h
index 0359b2c..acaa6d8 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers.h
+++ b/modules/video_coding/codecs/vp8/screenshare_layers.h
@@ -17,7 +17,7 @@
 #include "modules/video_coding/codecs/vp8/include/temporal_layers_checker.h"
 #include "modules/video_coding/utility/frame_dropper.h"
 #include "rtc_base/rate_statistics.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
index 40e01bd..ccc294c 100644
--- a/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
+++ b/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
@@ -22,7 +22,7 @@
 #include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h"
 #include "modules/video_coding/codecs/vp8/test/mock_libvpx_interface.h"
 #include "modules/video_coding/utility/vp8_header_parser.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/video_codec_settings.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc
index ecbda4c..4ed25ab 100644
--- a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc
+++ b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.cc
@@ -19,7 +19,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 
 namespace webrtc {
 
diff --git a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h
index 02ede24..fd84b66 100644
--- a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h
+++ b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h
@@ -17,8 +17,8 @@
 #include <vector>
 
 #include "rtc_base/buffer.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 struct vpx_codec_ctx;
diff --git a/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc
index c87c9bb..6f3e979 100644
--- a/modules/video_coding/codecs/vp9/vp9_impl.cc
+++ b/modules/video_coding/codecs/vp9/vp9_impl.cc
@@ -32,7 +32,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/keep_ref_until_done.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/modules/video_coding/fec_controller_default.h b/modules/video_coding/fec_controller_default.h
index 9943777..1db39a4 100644
--- a/modules/video_coding/fec_controller_default.h
+++ b/modules/video_coding/fec_controller_default.h
@@ -19,8 +19,8 @@
 #include "api/fec_controller.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/media_opt_util.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
 
diff --git a/modules/video_coding/frame_buffer2.h b/modules/video_coding/frame_buffer2.h
index d132bec..64249a5 100644
--- a/modules/video_coding/frame_buffer2.h
+++ b/modules/video_coding/frame_buffer2.h
@@ -22,8 +22,8 @@
 #include "api/video/encoded_frame.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/inter_frame_delay.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/experiments/rtt_mult_experiment.h"
 #include "rtc_base/numerics/sequence_number_util.h"
diff --git a/modules/video_coding/frame_object.cc b/modules/video_coding/frame_object.cc
index 750c977..8fd8983 100644
--- a/modules/video_coding/frame_object.cc
+++ b/modules/video_coding/frame_object.cc
@@ -17,7 +17,7 @@
 #include "modules/video_coding/packet.h"
 #include "modules/video_coding/packet_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 namespace video_coding {
diff --git a/modules/video_coding/generic_decoder.cc b/modules/video_coding/generic_decoder.cc
index dee28ae..6ef4c36 100644
--- a/modules/video_coding/generic_decoder.cc
+++ b/modules/video_coding/generic_decoder.cc
@@ -17,7 +17,7 @@
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/clock.h"
 
diff --git a/modules/video_coding/generic_decoder.h b/modules/video_coding/generic_decoder.h
index b0dccc4..d4a15d9 100644
--- a/modules/video_coding/generic_decoder.h
+++ b/modules/video_coding/generic_decoder.h
@@ -18,7 +18,7 @@
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/timestamp_map.h"
 #include "modules/video_coding/timing.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_checker.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/generic_encoder.cc b/modules/video_coding/generic_encoder.cc
index 2d992ef..221a8b2 100644
--- a/modules/video_coding/generic_encoder.cc
+++ b/modules/video_coding/generic_encoder.cc
@@ -25,7 +25,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/experiments/alr_experiment.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/generic_encoder.h b/modules/video_coding/generic_encoder.h
index 463f98a..760831c 100644
--- a/modules/video_coding/generic_encoder.h
+++ b/modules/video_coding/generic_encoder.h
@@ -18,7 +18,7 @@
 #include "api/units/data_rate.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_coding_defines.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/race_checker.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/generic_encoder_unittest.cc b/modules/video_coding/generic_encoder_unittest.cc
index 9491b5a..66d7873 100644
--- a/modules/video_coding/generic_encoder_unittest.cc
+++ b/modules/video_coding/generic_encoder_unittest.cc
@@ -14,8 +14,8 @@
 #include "api/video/video_timing.h"
 #include "modules/video_coding/generic_encoder.h"
 #include "modules/video_coding/include/video_coding_defines.h"
-#include "rtc_base/fakeclock.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/fake_clock.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/h264_sprop_parameter_sets.h b/modules/video_coding/h264_sprop_parameter_sets.h
index 28172d4..dbf27ef 100644
--- a/modules/video_coding/h264_sprop_parameter_sets.h
+++ b/modules/video_coding/h264_sprop_parameter_sets.h
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/video_coding/jitter_buffer.h b/modules/video_coding/jitter_buffer.h
index c8d7781..4a0d740 100644
--- a/modules/video_coding/jitter_buffer.h
+++ b/modules/video_coding/jitter_buffer.h
@@ -25,8 +25,8 @@
 #include "modules/video_coding/inter_frame_delay.h"
 #include "modules/video_coding/jitter_buffer_common.h"
 #include "modules/video_coding/jitter_estimator.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/event_wrapper.h"
 
diff --git a/modules/video_coding/jitter_estimator.h b/modules/video_coding/jitter_estimator.h
index 56b5328..f163f4c 100644
--- a/modules/video_coding/jitter_estimator.h
+++ b/modules/video_coding/jitter_estimator.h
@@ -12,7 +12,7 @@
 #define MODULES_VIDEO_CODING_JITTER_ESTIMATOR_H_
 
 #include "modules/video_coding/rtt_filter.h"
-#include "rtc_base/rollingaccumulator.h"
+#include "rtc_base/rolling_accumulator.h"
 
 namespace webrtc {
 
diff --git a/modules/video_coding/jitter_estimator_tests.cc b/modules/video_coding/jitter_estimator_tests.cc
index 730f0ac..e696f0e 100644
--- a/modules/video_coding/jitter_estimator_tests.cc
+++ b/modules/video_coding/jitter_estimator_tests.cc
@@ -18,7 +18,7 @@
 #include "rtc_base/experiments/jitter_upper_bound_experiment.h"
 #include "rtc_base/numerics/histogram_percentile_counter.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/clock.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
diff --git a/modules/video_coding/nack_module.h b/modules/video_coding/nack_module.h
index ace5648..16891d7 100644
--- a/modules/video_coding/nack_module.h
+++ b/modules/video_coding/nack_module.h
@@ -19,7 +19,7 @@
 #include "modules/include/module.h"
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/histogram.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/numerics/sequence_number_util.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
diff --git a/modules/video_coding/packet_buffer.cc b/modules/video_coding/packet_buffer.cc
index 4ef0b00..7fd3fc7 100644
--- a/modules/video_coding/packet_buffer.cc
+++ b/modules/video_coding/packet_buffer.cc
@@ -22,7 +22,7 @@
 #include "modules/rtp_rtcp/source/rtp_video_header.h"
 #include "modules/video_coding/codecs/h264/include/h264_globals.h"
 #include "modules/video_coding/frame_object.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/mod_ops.h"
diff --git a/modules/video_coding/packet_buffer.h b/modules/video_coding/packet_buffer.h
index 51d2782..73ffb05 100644
--- a/modules/video_coding/packet_buffer.h
+++ b/modules/video_coding/packet_buffer.h
@@ -19,7 +19,7 @@
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/packet.h"
 #include "modules/video_coding/rtp_frame_reference_finder.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/numerics/sequence_number_util.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/modules/video_coding/receiver.h b/modules/video_coding/receiver.h
index 97692e0..e69aeea 100644
--- a/modules/video_coding/receiver.h
+++ b/modules/video_coding/receiver.h
@@ -19,7 +19,7 @@
 #include "modules/video_coding/jitter_buffer.h"
 #include "modules/video_coding/packet.h"
 #include "modules/video_coding/timing.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "system_wrappers/include/event_wrapper.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/rtp_frame_reference_finder.h b/modules/video_coding/rtp_frame_reference_finder.h
index 01819ea..e39d991 100644
--- a/modules/video_coding/rtp_frame_reference_finder.h
+++ b/modules/video_coding/rtp_frame_reference_finder.h
@@ -20,7 +20,7 @@
 
 #include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/numerics/sequence_number_util.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/modules/video_coding/rtp_frame_reference_finder_unittest.cc b/modules/video_coding/rtp_frame_reference_finder_unittest.cc
index 1e8a9c5..e5694f9 100644
--- a/modules/video_coding/rtp_frame_reference_finder_unittest.cc
+++ b/modules/video_coding/rtp_frame_reference_finder_unittest.cc
@@ -17,7 +17,7 @@
 #include "modules/video_coding/frame_object.h"
 #include "modules/video_coding/packet_buffer.h"
 #include "rtc_base/random.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
 
diff --git a/modules/video_coding/test/stream_generator.h b/modules/video_coding/test/stream_generator.h
index 22c9f11..150fa79 100644
--- a/modules/video_coding/test/stream_generator.h
+++ b/modules/video_coding/test/stream_generator.h
@@ -15,7 +15,7 @@
 
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/packet.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/video_coding/timing.h b/modules/video_coding/timing.h
index 2b5e21d..c70410e 100644
--- a/modules/video_coding/timing.h
+++ b/modules/video_coding/timing.h
@@ -14,7 +14,7 @@
 #include <memory>
 
 #include "modules/video_coding/codec_timer.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/utility/ivf_file_writer.h b/modules/video_coding/utility/ivf_file_writer.h
index 21ebd97..600ab8d 100644
--- a/modules/video_coding/utility/ivf_file_writer.h
+++ b/modules/video_coding/utility/ivf_file_writer.h
@@ -17,9 +17,9 @@
 
 #include "api/video/encoded_image.h"
 #include "common_types.h"  // NOLINT(build/include)
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/file.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/video_coding/utility/ivf_file_writer_unittest.cc b/modules/video_coding/utility/ivf_file_writer_unittest.cc
index 720402f..6f71496 100644
--- a/modules/video_coding/utility/ivf_file_writer_unittest.cc
+++ b/modules/video_coding/utility/ivf_file_writer_unittest.cc
@@ -17,7 +17,7 @@
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "rtc_base/platform_file.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/modules/video_coding/utility/quality_scaler.cc b/modules/video_coding/utility/quality_scaler.cc
index 4a517dc..e41a010 100644
--- a/modules/video_coding/utility/quality_scaler.cc
+++ b/modules/video_coding/utility/quality_scaler.cc
@@ -17,7 +17,7 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/exp_filter.h"
 #include "rtc_base/task_queue.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 // TODO(kthelgason): Some versions of Android have issues with log2.
 // See https://code.google.com/p/android/issues/detail?id=212634 for details
diff --git a/modules/video_coding/utility/simulcast_rate_allocator.h b/modules/video_coding/utility/simulcast_rate_allocator.h
index c1e8967..c5242a5 100644
--- a/modules/video_coding/utility/simulcast_rate_allocator.h
+++ b/modules/video_coding/utility/simulcast_rate_allocator.h
@@ -18,7 +18,7 @@
 #include "api/video/video_bitrate_allocation.h"
 #include "api/video/video_bitrate_allocator.h"
 #include "api/video_codecs/video_codec.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/modules/video_coding/utility/vp9_uncompressed_header_parser.cc b/modules/video_coding/utility/vp9_uncompressed_header_parser.cc
index 808fdd3..9c89235 100644
--- a/modules/video_coding/utility/vp9_uncompressed_header_parser.cc
+++ b/modules/video_coding/utility/vp9_uncompressed_header_parser.cc
@@ -9,7 +9,7 @@
  */
 #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
 
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 #include "rtc_base/logging.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/video_codec_initializer_unittest.cc b/modules/video_coding/video_codec_initializer_unittest.cc
index 75be427..a90b7b7 100644
--- a/modules/video_coding/video_codec_initializer_unittest.cc
+++ b/modules/video_coding/video_codec_initializer_unittest.cc
@@ -25,7 +25,7 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/gtest.h"
 
diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc
index 7600915..70b816d 100644
--- a/modules/video_coding/video_coding_impl.cc
+++ b/modules/video_coding/video_coding_impl.cc
@@ -17,7 +17,7 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/timing.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_checker.h"
 #include "system_wrappers/include/clock.h"
 
diff --git a/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h
index 08b0753..e6b1215 100644
--- a/modules/video_coding/video_coding_impl.h
+++ b/modules/video_coding/video_coding_impl.h
@@ -26,7 +26,7 @@
 #include "modules/video_coding/jitter_buffer.h"
 #include "modules/video_coding/receiver.h"
 #include "modules/video_coding/timing.h"
-#include "rtc_base/onetimeevent.h"
+#include "rtc_base/one_time_event.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc
index f9b3547..414c07a 100644
--- a/modules/video_coding/video_receiver.cc
+++ b/modules/video_coding/video_receiver.cc
@@ -31,10 +31,10 @@
 #include "modules/video_coding/timing.h"
 #include "modules/video_coding/video_coding_impl.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/onetimeevent.h"
+#include "rtc_base/one_time_event.h"
 #include "rtc_base/thread_checker.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/clock.h"
diff --git a/modules/video_coding/video_sender.cc b/modules/video_coding/video_sender.cc
index fe959b8..78196ab 100644
--- a/modules/video_coding/video_sender.cc
+++ b/modules/video_coding/video_sender.cc
@@ -28,7 +28,7 @@
 #include "modules/video_coding/utility/default_video_bitrate_allocator.h"
 #include "modules/video_coding/video_coding_impl.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/sequenced_task_checker.h"
diff --git a/modules/video_coding/video_sender_unittest.cc b/modules/video_coding/video_sender_unittest.cc
index a9c9e45..44e9c34 100644
--- a/modules/video_coding/video_sender_unittest.cc
+++ b/modules/video_coding/video_sender_unittest.cc
@@ -24,7 +24,7 @@
 #include "system_wrappers/include/clock.h"
 #include "test/frame_generator.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "test/video_codec_settings.h"
 
 using ::testing::_;
diff --git a/modules/video_processing/test/denoiser_test.cc b/modules/video_processing/test/denoiser_test.cc
index 0143345..223e3ae 100644
--- a/modules/video_processing/test/denoiser_test.cc
+++ b/modules/video_processing/test/denoiser_test.cc
@@ -22,7 +22,7 @@
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/frame_utils.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 6695458..acbb8fc 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -18,69 +18,69 @@
 rtc_static_library("rtc_p2p") {
   visibility = [ "*" ]
   sources = [
-    "base/asyncstuntcpsocket.cc",
-    "base/asyncstuntcpsocket.h",
-    "base/basicasyncresolverfactory.cc",
-    "base/basicasyncresolverfactory.h",
-    "base/basicpacketsocketfactory.cc",
-    "base/basicpacketsocketfactory.h",
-    "base/candidatepairinterface.h",
-    "base/dtlstransport.cc",
-    "base/dtlstransport.h",
-    "base/dtlstransportinternal.cc",
-    "base/dtlstransportinternal.h",
-    "base/icecredentialsiterator.cc",
-    "base/icecredentialsiterator.h",
-    "base/icetransportinternal.cc",
-    "base/icetransportinternal.h",
+    "base/async_stun_tcp_socket.cc",
+    "base/async_stun_tcp_socket.h",
+    "base/basic_async_resolver_factory.cc",
+    "base/basic_async_resolver_factory.h",
+    "base/basic_packet_socket_factory.cc",
+    "base/basic_packet_socket_factory.h",
+    "base/candidate_pair_interface.h",
+    "base/dtls_transport.cc",
+    "base/dtls_transport.h",
+    "base/dtls_transport_internal.cc",
+    "base/dtls_transport_internal.h",
+    "base/ice_credentials_iterator.cc",
+    "base/ice_credentials_iterator.h",
+    "base/ice_transport_internal.cc",
+    "base/ice_transport_internal.h",
     "base/mdns_message.cc",
     "base/mdns_message.h",
-    "base/p2pconstants.cc",
-    "base/p2pconstants.h",
-    "base/p2ptransportchannel.cc",
-    "base/p2ptransportchannel.h",
-    "base/packetlossestimator.cc",
-    "base/packetlossestimator.h",
-    "base/packetsocketfactory.cc",
-    "base/packetsocketfactory.h",
-    "base/packettransportinterface.h",
-    "base/packettransportinternal.cc",
-    "base/packettransportinternal.h",
+    "base/p2p_constants.cc",
+    "base/p2p_constants.h",
+    "base/p2p_transport_channel.cc",
+    "base/p2p_transport_channel.h",
+    "base/packet_loss_estimator.cc",
+    "base/packet_loss_estimator.h",
+    "base/packet_socket_factory.cc",
+    "base/packet_socket_factory.h",
+    "base/packet_transport_interface.h",
+    "base/packet_transport_internal.cc",
+    "base/packet_transport_internal.h",
     "base/port.cc",
     "base/port.h",
-    "base/portallocator.cc",
-    "base/portallocator.h",
-    "base/portinterface.cc",
-    "base/portinterface.h",
-    "base/pseudotcp.cc",
-    "base/pseudotcp.h",
-    "base/regatheringcontroller.cc",
-    "base/regatheringcontroller.h",
-    "base/relayport.cc",
-    "base/relayport.h",
+    "base/port_allocator.cc",
+    "base/port_allocator.h",
+    "base/port_interface.cc",
+    "base/port_interface.h",
+    "base/pseudo_tcp.cc",
+    "base/pseudo_tcp.h",
+    "base/regathering_controller.cc",
+    "base/regathering_controller.h",
+    "base/relay_port.cc",
+    "base/relay_port.h",
     "base/stun.cc",
     "base/stun.h",
-    "base/stunport.cc",
-    "base/stunport.h",
-    "base/stunrequest.cc",
-    "base/stunrequest.h",
-    "base/tcpport.cc",
-    "base/tcpport.h",
+    "base/stun_port.cc",
+    "base/stun_port.h",
+    "base/stun_request.cc",
+    "base/stun_request.h",
+    "base/tcp_port.cc",
+    "base/tcp_port.h",
     "base/transport.h",
-    "base/transportdescription.cc",
-    "base/transportdescription.h",
-    "base/transportdescriptionfactory.cc",
-    "base/transportdescriptionfactory.h",
-    "base/transportfactoryinterface.h",
-    "base/transportinfo.h",
-    "base/turnport.cc",
-    "base/turnport.h",
-    "base/udpport.h",
-    "client/basicportallocator.cc",
-    "client/basicportallocator.h",
-    "client/relayportfactoryinterface.h",
-    "client/turnportfactory.cc",
-    "client/turnportfactory.h",
+    "base/transport_description.cc",
+    "base/transport_description.h",
+    "base/transport_description_factory.cc",
+    "base/transport_description_factory.h",
+    "base/transport_factory_interface.h",
+    "base/transport_info.h",
+    "base/turn_port.cc",
+    "base/turn_port.h",
+    "base/udp_port.h",
+    "client/basic_port_allocator.cc",
+    "client/basic_port_allocator.h",
+    "client/relay_port_factory_interface.h",
+    "client/turn_port_factory.cc",
+    "client/turn_port_factory.h",
   ]
 
   deps = [
@@ -115,18 +115,18 @@
   rtc_source_set("p2p_test_utils") {
     testonly = true
     sources = [
-      "base/fakecandidatepair.h",
-      "base/fakedtlstransport.h",
-      "base/fakeicetransport.h",
-      "base/fakepackettransport.h",
-      "base/fakeportallocator.h",
-      "base/mockasyncresolver.h",
-      "base/mockicetransport.h",
-      "base/testrelayserver.h",
-      "base/teststunserver.cc",
-      "base/teststunserver.h",
-      "base/testturncustomizer.h",
-      "base/testturnserver.h",
+      "base/fake_candidate_pair.h",
+      "base/fake_dtls_transport.h",
+      "base/fake_ice_transport.h",
+      "base/fake_packet_transport.h",
+      "base/fake_port_allocator.h",
+      "base/mock_async_resolver.h",
+      "base/mock_ice_transport.h",
+      "base/test_relay_server.h",
+      "base/test_stun_server.cc",
+      "base/test_stun_server.h",
+      "base/test_turn_customizer.h",
+      "base/test_turn_server.h",
     ]
     deps = [
       ":p2p_server_utils",
@@ -148,28 +148,28 @@
     testonly = true
 
     sources = [
-      "base/asyncstuntcpsocket_unittest.cc",
-      "base/basicasyncresolverfactory_unittest.cc",
-      "base/dtlstransport_unittest.cc",
-      "base/icecredentialsiterator_unittest.cc",
+      "base/async_stun_tcp_socket_unittest.cc",
+      "base/basic_async_resolver_factory_unittest.cc",
+      "base/dtls_transport_unittest.cc",
+      "base/ice_credentials_iterator_unittest.cc",
       "base/mdns_message_unittest.cc",
-      "base/p2ptransportchannel_unittest.cc",
-      "base/packetlossestimator_unittest.cc",
+      "base/p2p_transport_channel_unittest.cc",
+      "base/packet_loss_estimator_unittest.cc",
+      "base/port_allocator_unittest.cc",
       "base/port_unittest.cc",
-      "base/portallocator_unittest.cc",
-      "base/pseudotcp_unittest.cc",
-      "base/regatheringcontroller_unittest.cc",
-      "base/relayport_unittest.cc",
-      "base/relayserver_unittest.cc",
+      "base/pseudo_tcp_unittest.cc",
+      "base/regathering_controller_unittest.cc",
+      "base/relay_port_unittest.cc",
+      "base/relay_server_unittest.cc",
+      "base/stun_port_unittest.cc",
+      "base/stun_request_unittest.cc",
+      "base/stun_server_unittest.cc",
       "base/stun_unittest.cc",
-      "base/stunport_unittest.cc",
-      "base/stunrequest_unittest.cc",
-      "base/stunserver_unittest.cc",
-      "base/tcpport_unittest.cc",
-      "base/transportdescriptionfactory_unittest.cc",
-      "base/turnport_unittest.cc",
-      "base/turnserver_unittest.cc",
-      "client/basicportallocator_unittest.cc",
+      "base/tcp_port_unittest.cc",
+      "base/transport_description_factory_unittest.cc",
+      "base/turn_port_unittest.cc",
+      "base/turn_server_unittest.cc",
+      "client/basic_port_allocator_unittest.cc",
     ]
     deps = [
       ":p2p_server_utils",
@@ -201,12 +201,12 @@
 rtc_source_set("p2p_server_utils") {
   testonly = true
   sources = [
-    "base/relayserver.cc",
-    "base/relayserver.h",
-    "base/stunserver.cc",
-    "base/stunserver.h",
-    "base/turnserver.cc",
-    "base/turnserver.h",
+    "base/relay_server.cc",
+    "base/relay_server.h",
+    "base/stun_server.cc",
+    "base/stun_server.h",
+    "base/turn_server.cc",
+    "base/turn_server.h",
   ]
   deps = [
     ":rtc_p2p",
@@ -221,8 +221,8 @@
 rtc_static_library("libstunprober") {
   visibility = [ "*" ]
   sources = [
-    "stunprober/stunprober.cc",
-    "stunprober/stunprober.h",
+    "stunprober/stun_prober.cc",
+    "stunprober/stun_prober.h",
   ]
 
   deps = [
@@ -239,7 +239,7 @@
     testonly = true
 
     sources = [
-      "stunprober/stunprober_unittest.cc",
+      "stunprober/stun_prober_unittest.cc",
     ]
     deps = [
       ":libstunprober",
diff --git a/p2p/base/async_stun_tcp_socket.cc b/p2p/base/async_stun_tcp_socket.cc
index e6f64ca..5ded8ae 100644
--- a/p2p/base/async_stun_tcp_socket.cc
+++ b/p2p/base/async_stun_tcp_socket.cc
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/asyncstuntcpsocket.h"
+#include "p2p/base/async_stun_tcp_socket.h"
 
 #include <errno.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "p2p/base/stun.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/network/sent_packet.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace cricket {
 
diff --git a/p2p/base/async_stun_tcp_socket.h b/p2p/base/async_stun_tcp_socket.h
index 5540b93..0f190be 100644
--- a/p2p/base/async_stun_tcp_socket.h
+++ b/p2p/base/async_stun_tcp_socket.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_ASYNCSTUNTCPSOCKET_H_
-#define P2P_BASE_ASYNCSTUNTCPSOCKET_H_
+#ifndef P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_
+#define P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_
 
 #include <stddef.h>
 
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/asynctcpsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/async_tcp_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/socket_address.h"
 
 namespace cricket {
 
@@ -49,4 +49,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_ASYNCSTUNTCPSOCKET_H_
+#endif  // P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_
diff --git a/p2p/base/async_stun_tcp_socket_unittest.cc b/p2p/base/async_stun_tcp_socket_unittest.cc
index 0203e48..70fddda 100644
--- a/p2p/base/async_stun_tcp_socket_unittest.cc
+++ b/p2p/base/async_stun_tcp_socket_unittest.cc
@@ -14,12 +14,12 @@
 #include <memory>
 #include <string>
 
-#include "p2p/base/asyncstuntcpsocket.h"
-#include "rtc_base/asyncsocket.h"
+#include "p2p/base/async_stun_tcp_socket.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/network/sent_packet.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 namespace cricket {
diff --git a/p2p/base/basic_async_resolver_factory.cc b/p2p/base/basic_async_resolver_factory.cc
index 22dac68..9d8266e 100644
--- a/p2p/base/basic_async_resolver_factory.cc
+++ b/p2p/base/basic_async_resolver_factory.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/basicasyncresolverfactory.h"
+#include "p2p/base/basic_async_resolver_factory.h"
 
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
 
 namespace webrtc {
 
diff --git a/p2p/base/basic_async_resolver_factory.h b/p2p/base/basic_async_resolver_factory.h
index 5bb8f55..c4661b4 100644
--- a/p2p/base/basic_async_resolver_factory.h
+++ b/p2p/base/basic_async_resolver_factory.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_BASICASYNCRESOLVERFACTORY_H_
-#define P2P_BASE_BASICASYNCRESOLVERFACTORY_H_
+#ifndef P2P_BASE_BASIC_ASYNC_RESOLVER_FACTORY_H_
+#define P2P_BASE_BASIC_ASYNC_RESOLVER_FACTORY_H_
 
-#include "api/asyncresolverfactory.h"
-#include "rtc_base/asyncresolverinterface.h"
+#include "api/async_resolver_factory.h"
+#include "rtc_base/async_resolver_interface.h"
 
 namespace webrtc {
 
@@ -23,4 +23,4 @@
 
 }  // namespace webrtc
 
-#endif  // P2P_BASE_BASICASYNCRESOLVERFACTORY_H_
+#endif  // P2P_BASE_BASIC_ASYNC_RESOLVER_FACTORY_H_
diff --git a/p2p/base/basic_async_resolver_factory_unittest.cc b/p2p/base/basic_async_resolver_factory_unittest.cc
index cee37b5..020226f 100644
--- a/p2p/base/basic_async_resolver_factory_unittest.cc
+++ b/p2p/base/basic_async_resolver_factory_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/basicasyncresolverfactory.h"
+#include "p2p/base/basic_async_resolver_factory.h"
 
 #include "rtc_base/gunit.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "test/gtest.h"
 
diff --git a/p2p/base/basic_packet_socket_factory.cc b/p2p/base/basic_packet_socket_factory.cc
index 8205442..2390e8a 100644
--- a/p2p/base/basic_packet_socket_factory.cc
+++ b/p2p/base/basic_packet_socket_factory.cc
@@ -8,21 +8,21 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/basicpacketsocketfactory.h"
+#include "p2p/base/basic_packet_socket_factory.h"
 
 #include <stddef.h>
 #include <string>
 
-#include "p2p/base/asyncstuntcpsocket.h"
-#include "rtc_base/asynctcpsocket.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "p2p/base/async_stun_tcp_socket.h"
+#include "rtc_base/async_tcp_socket.h"
+#include "rtc_base/async_udp_socket.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socketadapters.h"
-#include "rtc_base/socketserver.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/socket_adapters.h"
+#include "rtc_base/socket_server.h"
+#include "rtc_base/ssl_adapter.h"
 #include "rtc_base/thread.h"
 
 namespace rtc {
diff --git a/p2p/base/basic_packet_socket_factory.h b/p2p/base/basic_packet_socket_factory.h
index 29f82db..266c638 100644
--- a/p2p/base/basic_packet_socket_factory.h
+++ b/p2p/base/basic_packet_socket_factory.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_BASICPACKETSOCKETFACTORY_H_
-#define P2P_BASE_BASICPACKETSOCKETFACTORY_H_
+#ifndef P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
+#define P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
 
 #include <string>
 
-#include "p2p/base/packetsocketfactory.h"
+#include "p2p/base/packet_socket_factory.h"
 
 namespace rtc {
 
@@ -63,4 +63,4 @@
 
 }  // namespace rtc
 
-#endif  // P2P_BASE_BASICPACKETSOCKETFACTORY_H_
+#endif  // P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
diff --git a/p2p/base/candidate_pair_interface.h b/p2p/base/candidate_pair_interface.h
index ff0bfcb..2b68fd7 100644
--- a/p2p/base/candidate_pair_interface.h
+++ b/p2p/base/candidate_pair_interface.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_CANDIDATEPAIRINTERFACE_H_
-#define P2P_BASE_CANDIDATEPAIRINTERFACE_H_
+#ifndef P2P_BASE_CANDIDATE_PAIR_INTERFACE_H_
+#define P2P_BASE_CANDIDATE_PAIR_INTERFACE_H_
 
 namespace cricket {
 
@@ -25,4 +25,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_CANDIDATEPAIRINTERFACE_H_
+#endif  // P2P_BASE_CANDIDATE_PAIR_INTERFACE_H_
diff --git a/p2p/base/dtls_transport.cc b/p2p/base/dtls_transport.cc
index 75e0c1b..ba565ca 100644
--- a/p2p/base/dtls_transport.cc
+++ b/p2p/base/dtls_transport.cc
@@ -12,20 +12,20 @@
 #include <memory>
 #include <utility>
 
-#include "p2p/base/dtlstransport.h"
+#include "p2p/base/dtls_transport.h"
 
 #include "absl/memory/memory.h"
 #include "logging/rtc_event_log/events/rtc_event_dtls_transport_state.h"
 #include "logging/rtc_event_log/events/rtc_event_dtls_writable_state.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
-#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/packet_transport_internal.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/dscp.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/stream.h"
 #include "rtc_base/thread.h"
 
diff --git a/p2p/base/dtls_transport.h b/p2p/base/dtls_transport.h
index 6fb5d6c..ceef1dc 100644
--- a/p2p/base/dtls_transport.h
+++ b/p2p/base/dtls_transport.h
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_DTLSTRANSPORT_H_
-#define P2P_BASE_DTLSTRANSPORT_H_
+#ifndef P2P_BASE_DTLS_TRANSPORT_H_
+#define P2P_BASE_DTLS_TRANSPORT_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "api/crypto/cryptooptions.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/icetransportinternal.h"
+#include "api/crypto/crypto_options.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/ice_transport_internal.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/bufferqueue.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/buffer_queue.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/stream.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/thread_checker.h"
@@ -251,4 +251,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_DTLSTRANSPORT_H_
+#endif  // P2P_BASE_DTLS_TRANSPORT_H_
diff --git a/p2p/base/dtls_transport_internal.cc b/p2p/base/dtls_transport_internal.cc
index a294ccb..6997dbc 100644
--- a/p2p/base/dtls_transport_internal.cc
+++ b/p2p/base/dtls_transport_internal.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/dtlstransportinternal.h"
+#include "p2p/base/dtls_transport_internal.h"
 
 namespace cricket {
 
diff --git a/p2p/base/dtls_transport_internal.h b/p2p/base/dtls_transport_internal.h
index 6aa4b38..3054169 100644
--- a/p2p/base/dtls_transport_internal.h
+++ b/p2p/base/dtls_transport_internal.h
@@ -8,22 +8,22 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_DTLSTRANSPORTINTERNAL_H_
-#define P2P_BASE_DTLSTRANSPORTINTERNAL_H_
+#ifndef P2P_BASE_DTLS_TRANSPORT_INTERNAL_H_
+#define P2P_BASE_DTLS_TRANSPORT_INTERNAL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <memory>
 #include <string>
 
-#include "api/crypto/cryptooptions.h"
-#include "p2p/base/icetransportinternal.h"
-#include "p2p/base/packettransportinternal.h"
-#include "rtc_base/constructormagic.h"
+#include "api/crypto/crypto_options.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslfingerprint.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_fingerprint.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace cricket {
@@ -119,4 +119,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_DTLSTRANSPORTINTERNAL_H_
+#endif  // P2P_BASE_DTLS_TRANSPORT_INTERNAL_H_
diff --git a/p2p/base/dtls_transport_unittest.cc b/p2p/base/dtls_transport_unittest.cc
index dad4ddd..f1ee1e0 100644
--- a/p2p/base/dtls_transport_unittest.cc
+++ b/p2p/base/dtls_transport_unittest.cc
@@ -14,17 +14,17 @@
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "p2p/base/dtlstransport.h"
-#include "p2p/base/fakeicetransport.h"
-#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/dtls_transport.h"
+#include "p2p/base/fake_ice_transport.h"
+#include "p2p/base/packet_transport_internal.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/dscp.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
 
 #define MAYBE_SKIP_TEST(feature)                                  \
   if (!(rtc::SSLStreamAdapter::feature())) {                      \
diff --git a/p2p/base/fake_candidate_pair.h b/p2p/base/fake_candidate_pair.h
index c49ac47..c31b69f 100644
--- a/p2p/base/fake_candidate_pair.h
+++ b/p2p/base/fake_candidate_pair.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_FAKECANDIDATEPAIR_H_
-#define P2P_BASE_FAKECANDIDATEPAIR_H_
+#ifndef P2P_BASE_FAKE_CANDIDATE_PAIR_H_
+#define P2P_BASE_FAKE_CANDIDATE_PAIR_H_
 
 #include <memory>
 
 #include "api/candidate.h"
-#include "p2p/base/candidatepairinterface.h"
+#include "p2p/base/candidate_pair_interface.h"
 
 namespace cricket {
 
@@ -51,4 +51,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_FAKECANDIDATEPAIR_H_
+#endif  // P2P_BASE_FAKE_CANDIDATE_PAIR_H_
diff --git a/p2p/base/fake_dtls_transport.h b/p2p/base/fake_dtls_transport.h
index daef5c7..c362618 100644
--- a/p2p/base/fake_dtls_transport.h
+++ b/p2p/base/fake_dtls_transport.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_FAKEDTLSTRANSPORT_H_
-#define P2P_BASE_FAKEDTLSTRANSPORT_H_
+#ifndef P2P_BASE_FAKE_DTLS_TRANSPORT_H_
+#define P2P_BASE_FAKE_DTLS_TRANSPORT_H_
 
 #include <memory>
 #include <string>
@@ -17,11 +17,11 @@
 #include <vector>
 
 #include "absl/memory/memory.h"
-#include "api/crypto/cryptooptions.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/fakeicetransport.h"
-#include "rtc_base/fakesslidentity.h"
-#include "rtc_base/rtccertificate.h"
+#include "api/crypto/crypto_options.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/fake_ice_transport.h"
+#include "rtc_base/fake_ssl_identity.h"
+#include "rtc_base/rtc_certificate.h"
 
 namespace cricket {
 
@@ -288,4 +288,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_FAKEDTLSTRANSPORT_H_
+#endif  // P2P_BASE_FAKE_DTLS_TRANSPORT_H_
diff --git a/p2p/base/fake_ice_transport.h b/p2p/base/fake_ice_transport.h
index c36dd7f..8bcd723 100644
--- a/p2p/base/fake_ice_transport.h
+++ b/p2p/base/fake_ice_transport.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_FAKEICETRANSPORT_H_
-#define P2P_BASE_FAKEICETRANSPORT_H_
+#ifndef P2P_BASE_FAKE_ICE_TRANSPORT_H_
+#define P2P_BASE_FAKE_ICE_TRANSPORT_H_
 
 #include <map>
 #include <string>
 #include <utility>
 
 #include "absl/types/optional.h"
-#include "p2p/base/icetransportinternal.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/copy_on_write_buffer.h"
 
 namespace cricket {
 
@@ -325,4 +325,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_FAKEICETRANSPORT_H_
+#endif  // P2P_BASE_FAKE_ICE_TRANSPORT_H_
diff --git a/p2p/base/fake_packet_transport.h b/p2p/base/fake_packet_transport.h
index 52b3921..6f79aad 100644
--- a/p2p/base/fake_packet_transport.h
+++ b/p2p/base/fake_packet_transport.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_FAKEPACKETTRANSPORT_H_
-#define P2P_BASE_FAKEPACKETTRANSPORT_H_
+#ifndef P2P_BASE_FAKE_PACKET_TRANSPORT_H_
+#define P2P_BASE_FAKE_PACKET_TRANSPORT_H_
 
 #include <string>
 
-#include "api/ortc/packettransportinterface.h"
-#include "p2p/base/packettransportinternal.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "api/ortc/packet_transport_interface.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/copy_on_write_buffer.h"
 
 namespace rtc {
 
@@ -137,4 +137,4 @@
 
 }  // namespace rtc
 
-#endif  // P2P_BASE_FAKEPACKETTRANSPORT_H_
+#endif  // P2P_BASE_FAKE_PACKET_TRANSPORT_H_
diff --git a/p2p/base/fake_port_allocator.h b/p2p/base/fake_port_allocator.h
index fc5f237..ab61c80 100644
--- a/p2p/base/fake_port_allocator.h
+++ b/p2p/base/fake_port_allocator.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_FAKEPORTALLOCATOR_H_
-#define P2P_BASE_FAKEPORTALLOCATOR_H_
+#ifndef P2P_BASE_FAKE_PORT_ALLOCATOR_H_
+#define P2P_BASE_FAKE_PORT_ALLOCATOR_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/udpport.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/udp_port.h"
 #include "rtc_base/bind.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
 #include "rtc_base/thread.h"
 
 namespace rtc {
@@ -264,4 +264,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_FAKEPORTALLOCATOR_H_
+#endif  // P2P_BASE_FAKE_PORT_ALLOCATOR_H_
diff --git a/p2p/base/ice_credentials_iterator.cc b/p2p/base/ice_credentials_iterator.cc
index e51111f..373c851 100644
--- a/p2p/base/ice_credentials_iterator.cc
+++ b/p2p/base/ice_credentials_iterator.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/icecredentialsiterator.h"
+#include "p2p/base/ice_credentials_iterator.h"
 
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
 #include "rtc_base/helpers.h"
 
 namespace cricket {
diff --git a/p2p/base/ice_credentials_iterator.h b/p2p/base/ice_credentials_iterator.h
index 33e1d64..fa331cc 100644
--- a/p2p/base/ice_credentials_iterator.h
+++ b/p2p/base/ice_credentials_iterator.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_ICECREDENTIALSITERATOR_H_
-#define P2P_BASE_ICECREDENTIALSITERATOR_H_
+#ifndef P2P_BASE_ICE_CREDENTIALS_ITERATOR_H_
+#define P2P_BASE_ICE_CREDENTIALS_ITERATOR_H_
 
 #include <vector>
 
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/transport_description.h"
 
 namespace cricket {
 
@@ -34,4 +34,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_ICECREDENTIALSITERATOR_H_
+#endif  // P2P_BASE_ICE_CREDENTIALS_ITERATOR_H_
diff --git a/p2p/base/ice_credentials_iterator_unittest.cc b/p2p/base/ice_credentials_iterator_unittest.cc
index b84925e..92b65f3 100644
--- a/p2p/base/ice_credentials_iterator_unittest.cc
+++ b/p2p/base/ice_credentials_iterator_unittest.cc
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include "p2p/base/icecredentialsiterator.h"
+#include "p2p/base/ice_credentials_iterator.h"
 #include "test/gtest.h"
 
 using cricket::IceParameters;
diff --git a/p2p/base/ice_transport_internal.cc b/p2p/base/ice_transport_internal.cc
index 62bfb56..1d5b6e7 100644
--- a/p2p/base/ice_transport_internal.cc
+++ b/p2p/base/ice_transport_internal.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/icetransportinternal.h"
+#include "p2p/base/ice_transport_internal.h"
 
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
 
 namespace cricket {
 
diff --git a/p2p/base/ice_transport_internal.h b/p2p/base/ice_transport_internal.h
index acc7169..f3da45a 100644
--- a/p2p/base/ice_transport_internal.h
+++ b/p2p/base/ice_transport_internal.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_ICETRANSPORTINTERNAL_H_
-#define P2P_BASE_ICETRANSPORTINTERNAL_H_
+#ifndef P2P_BASE_ICE_TRANSPORT_INTERNAL_H_
+#define P2P_BASE_ICE_TRANSPORT_INTERNAL_H_
 
 #include <stdint.h>
 #include <string>
@@ -18,13 +18,13 @@
 #include "absl/types/optional.h"
 #include "api/candidate.h"
 #include "api/transport/enums.h"
-#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/packet_transport_internal.h"
 #include "p2p/base/port.h"
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/transport_description.h"
 #include "rtc_base/network_constants.h"
 #include "rtc_base/system/rtc_export.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace cricket {
 
@@ -287,4 +287,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_ICETRANSPORTINTERNAL_H_
+#endif  // P2P_BASE_ICE_TRANSPORT_INTERNAL_H_
diff --git a/p2p/base/mdns_message.cc b/p2p/base/mdns_message.cc
index f14a0d1..52ba70c 100644
--- a/p2p/base/mdns_message.cc
+++ b/p2p/base/mdns_message.cc
@@ -10,8 +10,8 @@
 
 #include "p2p/base/mdns_message.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/string_encode.h"
 
 namespace webrtc {
 
diff --git a/p2p/base/mdns_message.h b/p2p/base/mdns_message.h
index a172444..303c6bb 100644
--- a/p2p/base/mdns_message.h
+++ b/p2p/base/mdns_message.h
@@ -25,8 +25,8 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/message_buffer_reader.h"
 
 namespace webrtc {
diff --git a/p2p/base/mdns_message_unittest.cc b/p2p/base/mdns_message_unittest.cc
index 7f816f7..a742ccb 100644
--- a/p2p/base/mdns_message_unittest.cc
+++ b/p2p/base/mdns_message_unittest.cc
@@ -13,10 +13,10 @@
 #include <string>
 
 #include "p2p/base/mdns_message.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/socket_address.h"
 #include "test/gmock.h"
 
 #define ReadMdnsMessage(X, Y) ReadMdnsMessageTestCase(X, Y, sizeof(Y))
diff --git a/p2p/base/mock_async_resolver.h b/p2p/base/mock_async_resolver.h
index 0ca6e8b..7d3be5b 100644
--- a/p2p/base/mock_async_resolver.h
+++ b/p2p/base/mock_async_resolver.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_MOCKASYNCRESOLVER_H_
-#define P2P_BASE_MOCKASYNCRESOLVER_H_
+#ifndef P2P_BASE_MOCK_ASYNC_RESOLVER_H_
+#define P2P_BASE_MOCK_ASYNC_RESOLVER_H_
 
-#include "api/asyncresolverfactory.h"
-#include "rtc_base/asyncresolverinterface.h"
+#include "api/async_resolver_factory.h"
+#include "rtc_base/async_resolver_interface.h"
 #include "test/gmock.h"
 
 namespace rtc {
@@ -50,4 +50,4 @@
 
 }  // namespace webrtc
 
-#endif  // P2P_BASE_MOCKASYNCRESOLVER_H_
+#endif  // P2P_BASE_MOCK_ASYNC_RESOLVER_H_
diff --git a/p2p/base/mock_ice_transport.h b/p2p/base/mock_ice_transport.h
index b18ce3d..e0ad1e2 100644
--- a/p2p/base/mock_ice_transport.h
+++ b/p2p/base/mock_ice_transport.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_MOCKICETRANSPORT_H_
-#define P2P_BASE_MOCKICETRANSPORT_H_
+#ifndef P2P_BASE_MOCK_ICE_TRANSPORT_H_
+#define P2P_BASE_MOCK_ICE_TRANSPORT_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "p2p/base/icetransportinternal.h"
+#include "p2p/base/ice_transport_internal.h"
 #include "rtc_base/gunit.h"
 #include "test/gmock.h"
 
@@ -78,4 +78,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_MOCKICETRANSPORT_H_
+#endif  // P2P_BASE_MOCK_ICE_TRANSPORT_H_
diff --git a/p2p/base/p2p_constants.cc b/p2p/base/p2p_constants.cc
index 41d02dd..619b739 100644
--- a/p2p/base/p2p_constants.cc
+++ b/p2p/base/p2p_constants.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
 
 namespace cricket {
 
diff --git a/p2p/base/p2p_constants.h b/p2p/base/p2p_constants.h
index a27e90b..bdd1ebe 100644
--- a/p2p/base/p2p_constants.h
+++ b/p2p/base/p2p_constants.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_P2PCONSTANTS_H_
-#define P2P_BASE_P2PCONSTANTS_H_
+#ifndef P2P_BASE_P2P_CONSTANTS_H_
+#define P2P_BASE_P2P_CONSTANTS_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -108,4 +108,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_P2PCONSTANTS_H_
+#endif  // P2P_BASE_P2P_CONSTANTS_H_
diff --git a/p2p/base/p2p_transport_channel.cc b/p2p/base/p2p_transport_channel.cc
index 6506b53..f1c8d1a 100644
--- a/p2p/base/p2p_transport_channel.cc
+++ b/p2p/base/p2p_transport_channel.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/p2ptransportchannel.h"
+#include "p2p/base/p2p_transport_channel.h"
 
 #include <algorithm>
 #include <iterator>
@@ -16,16 +16,16 @@
 #include <utility>
 
 #include "api/candidate.h"
-#include "logging/rtc_event_log/icelogger.h"
-#include "p2p/base/candidatepairinterface.h"
+#include "logging/rtc_event_log/ice_logger.h"
+#include "p2p/base/candidate_pair_interface.h"
 #include "p2p/base/port.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/crc32.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/stringencode.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/field_trial.h"
 #include "system_wrappers/include/metrics.h"
 
diff --git a/p2p/base/p2p_transport_channel.h b/p2p/base/p2p_transport_channel.h
index abedd0b..5e15f76 100644
--- a/p2p/base/p2p_transport_channel.h
+++ b/p2p/base/p2p_transport_channel.h
@@ -17,8 +17,8 @@
 // When all of the available connections become invalid (non-writable), we
 // kick off a process of determining more candidates and more connections.
 //
-#ifndef P2P_BASE_P2PTRANSPORTCHANNEL_H_
-#define P2P_BASE_P2PTRANSPORTCHANNEL_H_
+#ifndef P2P_BASE_P2P_TRANSPORT_CHANNEL_H_
+#define P2P_BASE_P2P_TRANSPORT_CHANNEL_H_
 
 #include <algorithm>
 #include <map>
@@ -27,20 +27,20 @@
 #include <string>
 #include <vector>
 
-#include "api/asyncresolverfactory.h"
+#include "api/async_resolver_factory.h"
 #include "api/candidate.h"
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
 #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h"
-#include "logging/rtc_event_log/icelogger.h"
-#include "p2p/base/candidatepairinterface.h"
-#include "p2p/base/icetransportinternal.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/portinterface.h"
-#include "p2p/base/regatheringcontroller.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/constructormagic.h"
+#include "logging/rtc_event_log/ice_logger.h"
+#include "p2p/base/candidate_pair_interface.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/regathering_controller.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/system/rtc_export.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
@@ -452,4 +452,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_P2PTRANSPORTCHANNEL_H_
+#endif  // P2P_BASE_P2P_TRANSPORT_CHANNEL_H_
diff --git a/p2p/base/p2p_transport_channel_unittest.cc b/p2p/base/p2p_transport_channel_unittest.cc
index bd767cd..9beb075 100644
--- a/p2p/base/p2p_transport_channel_unittest.cc
+++ b/p2p/base/p2p_transport_channel_unittest.cc
@@ -13,30 +13,30 @@
 #include <memory>
 
 #include "absl/memory/memory.h"
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/icetransportinternal.h"
-#include "p2p/base/mockasyncresolver.h"
-#include "p2p/base/p2ptransportchannel.h"
-#include "p2p/base/packettransportinternal.h"
-#include "p2p/base/testrelayserver.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/client/basicportallocator.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "p2p/base/mock_async_resolver.h"
+#include "p2p/base/p2p_transport_channel.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "p2p/base/test_relay_server.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/client/basic_port_allocator.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/dscp.h"
-#include "rtc_base/fakeclock.h"
-#include "rtc_base/fakenetwork.h"
-#include "rtc_base/firewallsocketserver.h"
+#include "rtc_base/fake_clock.h"
+#include "rtc_base/fake_network.h"
+#include "rtc_base/firewall_socket_server.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/natsocketfactory.h"
-#include "rtc_base/proxyserver.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/nat_socket_factory.h"
+#include "rtc_base/proxy_server.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_adapter.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace {
diff --git a/p2p/base/packet_loss_estimator.cc b/p2p/base/packet_loss_estimator.cc
index be326f4..435fbb0 100644
--- a/p2p/base/packet_loss_estimator.cc
+++ b/p2p/base/packet_loss_estimator.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/packetlossestimator.h"
+#include "p2p/base/packet_loss_estimator.h"
 
 #include "rtc_base/checks.h"
 
diff --git a/p2p/base/packet_loss_estimator.h b/p2p/base/packet_loss_estimator.h
index a97c8b2..09a46fd 100644
--- a/p2p/base/packet_loss_estimator.h
+++ b/p2p/base/packet_loss_estimator.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_PACKETLOSSESTIMATOR_H_
-#define P2P_BASE_PACKETLOSSESTIMATOR_H_
+#ifndef P2P_BASE_PACKET_LOSS_ESTIMATOR_H_
+#define P2P_BASE_PACKET_LOSS_ESTIMATOR_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -82,4 +82,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_PACKETLOSSESTIMATOR_H_
+#endif  // P2P_BASE_PACKET_LOSS_ESTIMATOR_H_
diff --git a/p2p/base/packet_loss_estimator_unittest.cc b/p2p/base/packet_loss_estimator_unittest.cc
index ac17fc5..f45d52e 100644
--- a/p2p/base/packet_loss_estimator_unittest.cc
+++ b/p2p/base/packet_loss_estimator_unittest.cc
@@ -11,7 +11,7 @@
 #include <cstdint>
 #include <utility>
 
-#include "p2p/base/packetlossestimator.h"
+#include "p2p/base/packet_loss_estimator.h"
 #include "test/gtest.h"
 
 using cricket::PacketLossEstimator;
diff --git a/p2p/base/packet_socket_factory.cc b/p2p/base/packet_socket_factory.cc
index d2f4c96..2739dbc 100644
--- a/p2p/base/packet_socket_factory.cc
+++ b/p2p/base/packet_socket_factory.cc
@@ -10,7 +10,7 @@
 
 #include <string>
 
-#include "p2p/base/packetsocketfactory.h"
+#include "p2p/base/packet_socket_factory.h"
 
 namespace rtc {
 
diff --git a/p2p/base/packet_socket_factory.h b/p2p/base/packet_socket_factory.h
index c903df0..a430d2e 100644
--- a/p2p/base/packet_socket_factory.h
+++ b/p2p/base/packet_socket_factory.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_PACKETSOCKETFACTORY_H_
-#define P2P_BASE_PACKETSOCKETFACTORY_H_
+#ifndef P2P_BASE_PACKET_SOCKET_FACTORY_H_
+#define P2P_BASE_PACKET_SOCKET_FACTORY_H_
 
 #include <string>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/proxyinfo.h"
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/proxy_info.h"
+#include "rtc_base/ssl_certificate.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace rtc {
@@ -91,4 +91,4 @@
 
 }  // namespace rtc
 
-#endif  // P2P_BASE_PACKETSOCKETFACTORY_H_
+#endif  // P2P_BASE_PACKET_SOCKET_FACTORY_H_
diff --git a/p2p/base/packet_transport_interface.h b/p2p/base/packet_transport_interface.h
index aa65ee0..7076c30 100644
--- a/p2p/base/packet_transport_interface.h
+++ b/p2p/base/packet_transport_interface.h
@@ -12,13 +12,13 @@
 // uses it.
 // TODO(deadbeef): Update chromium and remove this file.
 
-#ifndef P2P_BASE_PACKETTRANSPORTINTERFACE_H_
-#define P2P_BASE_PACKETTRANSPORTINTERFACE_H_
+#ifndef P2P_BASE_PACKET_TRANSPORT_INTERFACE_H_
+#define P2P_BASE_PACKET_TRANSPORT_INTERFACE_H_
 
-#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/packet_transport_internal.h"
 
 namespace rtc {
 typedef PacketTransportInternal PacketTransportInterface;
 }
 
-#endif  // P2P_BASE_PACKETTRANSPORTINTERFACE_H_
+#endif  // P2P_BASE_PACKET_TRANSPORT_INTERFACE_H_
diff --git a/p2p/base/packet_transport_internal.cc b/p2p/base/packet_transport_internal.cc
index ba5f1e9..8fda899 100644
--- a/p2p/base/packet_transport_internal.cc
+++ b/p2p/base/packet_transport_internal.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/packettransportinternal.h"
+#include "p2p/base/packet_transport_internal.h"
 
 namespace rtc {
 
diff --git a/p2p/base/packet_transport_internal.h b/p2p/base/packet_transport_internal.h
index 7d50f9c..24723e9 100644
--- a/p2p/base/packet_transport_internal.h
+++ b/p2p/base/packet_transport_internal.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_PACKETTRANSPORTINTERNAL_H_
-#define P2P_BASE_PACKETTRANSPORTINTERNAL_H_
+#ifndef P2P_BASE_PACKET_TRANSPORT_INTERNAL_H_
+#define P2P_BASE_PACKET_TRANSPORT_INTERNAL_H_
 
 #include <string>
 #include <vector>
 
 #include "absl/types/optional.h"
 // This is included for PacketOptions.
-#include "api/ortc/packettransportinterface.h"
+#include "api/ortc/packet_transport_interface.h"
 #include "p2p/base/port.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/networkroute.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/network_route.h"
 #include "rtc_base/socket.h"
 #include "rtc_base/system/rtc_export.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
@@ -108,4 +108,4 @@
 
 }  // namespace rtc
 
-#endif  // P2P_BASE_PACKETTRANSPORTINTERNAL_H_
+#endif  // P2P_BASE_PACKET_TRANSPORT_INTERNAL_H_
diff --git a/p2p/base/port.cc b/p2p/base/port.cc
index 24aed8e..dd8c0ec 100644
--- a/p2p/base/port.cc
+++ b/p2p/base/port.cc
@@ -18,16 +18,16 @@
 
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
-#include "p2p/base/portallocator.h"
+#include "p2p/base/port_allocator.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/crc32.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/mdns_responder_interface.h"
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
 #include "rtc_base/network.h"
 #include "rtc_base/numerics/safe_minmax.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/third_party/base64/base64.h"
 
 namespace {
diff --git a/p2p/base/port.h b/p2p/base/port.h
index 5037377..cd8b737 100644
--- a/p2p/base/port.h
+++ b/p2p/base/port.h
@@ -19,24 +19,24 @@
 
 #include "absl/types/optional.h"
 #include "api/candidate.h"
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
 #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h"
 #include "logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h"
-#include "logging/rtc_event_log/icelogger.h"
-#include "p2p/base/candidatepairinterface.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/packetlossestimator.h"
-#include "p2p/base/packetsocketfactory.h"
-#include "p2p/base/portinterface.h"
+#include "logging/rtc_event_log/ice_logger.h"
+#include "p2p/base/candidate_pair_interface.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/packet_loss_estimator.h"
+#include "p2p/base/packet_socket_factory.h"
+#include "p2p/base/port_interface.h"
 #include "p2p/base/stun.h"
-#include "p2p/base/stunrequest.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "p2p/base/stun_request.h"
+#include "rtc_base/async_packet_socket.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/nethelper.h"
+#include "rtc_base/net_helper.h"
 #include "rtc_base/network.h"
-#include "rtc_base/proxyinfo.h"
-#include "rtc_base/ratetracker.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/proxy_info.h"
+#include "rtc_base/rate_tracker.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/system/rtc_export.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
diff --git a/p2p/base/port_allocator.cc b/p2p/base/port_allocator.cc
index 3861946..c6ea6fd 100644
--- a/p2p/base/port_allocator.cc
+++ b/p2p/base/port_allocator.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/portallocator.h"
+#include "p2p/base/port_allocator.h"
 
 #include <iterator>
 #include <set>
 #include <utility>
 
-#include "p2p/base/icecredentialsiterator.h"
+#include "p2p/base/ice_credentials_iterator.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 
diff --git a/p2p/base/port_allocator.h b/p2p/base/port_allocator.h
index 7026f2b..33745ea 100644
--- a/p2p/base/port_allocator.h
+++ b/p2p/base/port_allocator.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_PORTALLOCATOR_H_
-#define P2P_BASE_PORTALLOCATOR_H_
+#ifndef P2P_BASE_PORT_ALLOCATOR_H_
+#define P2P_BASE_PORT_ALLOCATOR_H_
 
 #include <deque>
 #include <memory>
@@ -17,10 +17,10 @@
 #include <vector>
 
 #include "p2p/base/port.h"
-#include "p2p/base/portinterface.h"
+#include "p2p/base/port_interface.h"
 #include "rtc_base/helpers.h"
-#include "rtc_base/proxyinfo.h"
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/proxy_info.h"
+#include "rtc_base/ssl_certificate.h"
 #include "rtc_base/system/rtc_export.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
@@ -626,4 +626,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_PORTALLOCATOR_H_
+#endif  // P2P_BASE_PORT_ALLOCATOR_H_
diff --git a/p2p/base/port_allocator_unittest.cc b/p2p/base/port_allocator_unittest.cc
index 9c1d307..c828102 100644
--- a/p2p/base/port_allocator_unittest.cc
+++ b/p2p/base/port_allocator_unittest.cc
@@ -10,10 +10,10 @@
 
 #include <memory>
 
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/portallocator.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/port_allocator.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 static const char kContentName[] = "test content";
diff --git a/p2p/base/port_interface.cc b/p2p/base/port_interface.cc
index 73fe296..9175ca5 100644
--- a/p2p/base/port_interface.cc
+++ b/p2p/base/port_interface.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/portinterface.h"
+#include "p2p/base/port_interface.h"
 
 namespace cricket {
 
diff --git a/p2p/base/port_interface.h b/p2p/base/port_interface.h
index 60fa444..24f2e2a 100644
--- a/p2p/base/port_interface.h
+++ b/p2p/base/port_interface.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_PORTINTERFACE_H_
-#define P2P_BASE_PORTINTERFACE_H_
+#ifndef P2P_BASE_PORT_INTERFACE_H_
+#define P2P_BASE_PORT_INTERFACE_H_
 
 #include <string>
 #include <vector>
 
 #include "absl/types/optional.h"
 #include "api/candidate.h"
-#include "p2p/base/transportdescription.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/socketaddress.h"
+#include "p2p/base/transport_description.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/socket_address.h"
 
 namespace rtc {
 class Network;
@@ -142,4 +142,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_PORTINTERFACE_H_
+#endif  // P2P_BASE_PORT_INTERFACE_H_
diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc
index ba7de19..8857a97 100644
--- a/p2p/base/port_unittest.cc
+++ b/p2p/base/port_unittest.cc
@@ -20,50 +20,50 @@
 #include "absl/types/optional.h"
 #include "api/candidate.h"
 #include "api/units/time_delta.h"
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/packetsocketfactory.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/packet_socket_factory.h"
 #include "p2p/base/port.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/portinterface.h"
-#include "p2p/base/relayport.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/relay_port.h"
 #include "p2p/base/stun.h"
-#include "p2p/base/stunport.h"
-#include "p2p/base/stunserver.h"
-#include "p2p/base/tcpport.h"
-#include "p2p/base/testrelayserver.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/turnport.h"
-#include "p2p/base/turnserver.h"
-#include "p2p/client/relayportfactoryinterface.h"
+#include "p2p/base/stun_port.h"
+#include "p2p/base/stun_server.h"
+#include "p2p/base/tcp_port.h"
+#include "p2p/base/test_relay_server.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/turn_port.h"
+#include "p2p/base/turn_server.h"
+#include "p2p/client/relay_port_factory_interface.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/dscp.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/natsocketfactory.h"
-#include "rtc_base/nattypes.h"
-#include "rtc_base/nethelper.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/nat_socket_factory.h"
+#include "rtc_base/nat_types.h"
+#include "rtc_base/net_helper.h"
 #include "rtc_base/network.h"
 #include "rtc_base/network/sent_packet.h"
 #include "rtc_base/network_constants.h"
-#include "rtc_base/proxyinfo.h"
+#include "rtc_base/proxy_info.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socketadapters.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_adapters.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 using rtc::AsyncPacketSocket;
diff --git a/p2p/base/pseudo_tcp.cc b/p2p/base/pseudo_tcp.cc
index cac0a92..44c59c5 100644
--- a/p2p/base/pseudo_tcp.cc
+++ b/p2p/base/pseudo_tcp.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/pseudotcp.h"
+#include "p2p/base/pseudo_tcp.h"
 
 #include <errno.h>
 #include <stdio.h>
@@ -17,13 +17,13 @@
 #include <memory>
 #include <set>
 
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 // The following logging is for detailed (packet-level) analysis only.
 #define _DBG_NONE 0
diff --git a/p2p/base/pseudo_tcp.h b/p2p/base/pseudo_tcp.h
index 2522bdc..4849c2a 100644
--- a/p2p/base/pseudo_tcp.h
+++ b/p2p/base/pseudo_tcp.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_PSEUDOTCP_H_
-#define P2P_BASE_PSEUDOTCP_H_
+#ifndef P2P_BASE_PSEUDO_TCP_H_
+#define P2P_BASE_PSEUDO_TCP_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -246,4 +246,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_PSEUDOTCP_H_
+#endif  // P2P_BASE_PSEUDO_TCP_H_
diff --git a/p2p/base/pseudo_tcp_unittest.cc b/p2p/base/pseudo_tcp_unittest.cc
index 104d31c..b542911 100644
--- a/p2p/base/pseudo_tcp_unittest.cc
+++ b/p2p/base/pseudo_tcp_unittest.cc
@@ -14,16 +14,16 @@
 #include <string>
 #include <vector>
 
-#include "p2p/base/pseudotcp.h"
+#include "p2p/base/pseudo_tcp.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/memory_stream.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"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 using cricket::PseudoTcp;
diff --git a/p2p/base/regathering_controller.cc b/p2p/base/regathering_controller.cc
index 6d4c4fd..a4d21eb 100644
--- a/p2p/base/regathering_controller.cc
+++ b/p2p/base/regathering_controller.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/regatheringcontroller.h"
+#include "p2p/base/regathering_controller.h"
 
 namespace webrtc {
 
diff --git a/p2p/base/regathering_controller.h b/p2p/base/regathering_controller.h
index 891ec85..234aea3 100644
--- a/p2p/base/regathering_controller.h
+++ b/p2p/base/regathering_controller.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_REGATHERINGCONTROLLER_H_
-#define P2P_BASE_REGATHERINGCONTROLLER_H_
+#ifndef P2P_BASE_REGATHERING_CONTROLLER_H_
+#define P2P_BASE_REGATHERING_CONTROLLER_H_
 
-#include "p2p/base/icetransportinternal.h"
-#include "p2p/base/portallocator.h"
-#include "rtc_base/asyncinvoker.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "p2p/base/port_allocator.h"
+#include "rtc_base/async_invoker.h"
 #include "rtc_base/random.h"
 #include "rtc_base/thread.h"
 
@@ -121,4 +121,4 @@
 
 }  // namespace webrtc
 
-#endif  // P2P_BASE_REGATHERINGCONTROLLER_H_
+#endif  // P2P_BASE_REGATHERING_CONTROLLER_H_
diff --git a/p2p/base/regathering_controller_unittest.cc b/p2p/base/regathering_controller_unittest.cc
index 6ae64e8..c90beb6 100644
--- a/p2p/base/regathering_controller_unittest.cc
+++ b/p2p/base/regathering_controller_unittest.cc
@@ -13,18 +13,18 @@
 #include <string>
 #include <vector>
 
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/mockicetransport.h"
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/mock_ice_transport.h"
+#include "p2p/base/p2p_constants.h"
 #include "p2p/base/port.h"
-#include "p2p/base/regatheringcontroller.h"
-#include "p2p/base/stunserver.h"
+#include "p2p/base/regathering_controller.h"
+#include "p2p/base/stun_server.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 
 namespace {
 
diff --git a/p2p/base/relay_port.cc b/p2p/base/relay_port.cc
index 211484e..ebaefa7 100644
--- a/p2p/base/relay_port.cc
+++ b/p2p/base/relay_port.cc
@@ -11,20 +11,20 @@
 #include <string.h>
 #include <algorithm>
 
-#include "p2p/base/relayport.h"
+#include "p2p/base/relay_port.h"
 #include "p2p/base/stun.h"
-#include "p2p/base/stunrequest.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/bytebuffer.h"
+#include "p2p/base/stun_request.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/dscp.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/proxyinfo.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/proxy_info.h"
+#include "rtc_base/time_utils.h"
 
 namespace cricket {
 
diff --git a/p2p/base/relay_port.h b/p2p/base/relay_port.h
index 5989f76..f9121ad 100644
--- a/p2p/base/relay_port.h
+++ b/p2p/base/relay_port.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_RELAYPORT_H_
-#define P2P_BASE_RELAYPORT_H_
+#ifndef P2P_BASE_RELAY_PORT_H_
+#define P2P_BASE_RELAY_PORT_H_
 
 #include <deque>
 #include <memory>
@@ -19,7 +19,7 @@
 
 #include "absl/memory/memory.h"
 #include "p2p/base/port.h"
-#include "p2p/base/stunrequest.h"
+#include "p2p/base/stun_request.h"
 
 namespace cricket {
 
@@ -115,4 +115,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_RELAYPORT_H_
+#endif  // P2P_BASE_RELAY_PORT_H_
diff --git a/p2p/base/relay_port_unittest.cc b/p2p/base/relay_port_unittest.cc
index 1ca69f4..5f410e6 100644
--- a/p2p/base/relay_port_unittest.cc
+++ b/p2p/base/relay_port_unittest.cc
@@ -11,17 +11,17 @@
 #include <map>
 #include <memory>
 
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/relayport.h"
-#include "p2p/base/relayserver.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/relay_port.h"
+#include "p2p/base/relay_server.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/socketadapters.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/socket_adapters.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_adapter.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 
 using rtc::SocketAddress;
 
diff --git a/p2p/base/relay_server.cc b/p2p/base/relay_server.cc
index 0f712a9..80b51b2 100644
--- a/p2p/base/relay_server.cc
+++ b/p2p/base/relay_server.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/relayserver.h"
+#include "p2p/base/relay_server.h"
 
 #ifdef WEBRTC_POSIX
 #include <errno.h>
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <utility>
 
-#include "rtc_base/asynctcpsocket.h"
+#include "rtc_base/async_tcp_socket.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
diff --git a/p2p/base/relay_server.h b/p2p/base/relay_server.h
index 5ba5e06..3b9e9be 100644
--- a/p2p/base/relay_server.h
+++ b/p2p/base/relay_server.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_RELAYSERVER_H_
-#define P2P_BASE_RELAYSERVER_H_
+#ifndef P2P_BASE_RELAY_SERVER_H_
+#define P2P_BASE_RELAY_SERVER_H_
 
 #include <map>
 #include <string>
@@ -17,11 +17,11 @@
 
 #include "p2p/base/port.h"
 #include "p2p/base/stun.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_udp_socket.h"
 #include "rtc_base/random.h"
-#include "rtc_base/socketaddresspair.h"
+#include "rtc_base/socket_address_pair.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace cricket {
 
@@ -232,4 +232,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_RELAYSERVER_H_
+#endif  // P2P_BASE_RELAY_SERVER_H_
diff --git a/p2p/base/relay_server_unittest.cc b/p2p/base/relay_server_unittest.cc
index 5399cf1..a64cf4f 100644
--- a/p2p/base/relay_server_unittest.cc
+++ b/p2p/base/relay_server_unittest.cc
@@ -14,14 +14,14 @@
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "p2p/base/relayserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/bytebuffer.h"
+#include "p2p/base/relay_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/helpers.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/testclient.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/test_client.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 using rtc::SocketAddress;
diff --git a/p2p/base/stun.cc b/p2p/base/stun.cc
index dd0fa62..66b5312 100644
--- a/p2p/base/stun.cc
+++ b/p2p/base/stun.cc
@@ -17,11 +17,11 @@
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/crc32.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
 
 using rtc::ByteBufferReader;
 using rtc::ByteBufferWriter;
diff --git a/p2p/base/stun.h b/p2p/base/stun.h
index ca664b0..e61b345 100644
--- a/p2p/base/stun.h
+++ b/p2p/base/stun.h
@@ -20,9 +20,9 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/socket_address.h"
 
 namespace cricket {
 
diff --git a/p2p/base/stun_port.cc b/p2p/base/stun_port.cc
index 7273123..f94ea65 100644
--- a/p2p/base/stun_port.cc
+++ b/p2p/base/stun_port.cc
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/stunport.h"
+#include "p2p/base/stun_port.h"
 
 #include <utility>
 #include <vector>
 
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/portallocator.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/port_allocator.h"
 #include "p2p/base/stun.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/helpers.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
 #include "rtc_base/strings/string_builder.h"
 
 namespace cricket {
diff --git a/p2p/base/stun_port.h b/p2p/base/stun_port.h
index d7c9cb8..1ee0727 100644
--- a/p2p/base/stun_port.h
+++ b/p2p/base/stun_port.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_STUNPORT_H_
-#define P2P_BASE_STUNPORT_H_
+#ifndef P2P_BASE_STUN_PORT_H_
+#define P2P_BASE_STUN_PORT_H_
 
 #include <map>
 #include <memory>
@@ -17,8 +17,8 @@
 
 #include "absl/memory/memory.h"
 #include "p2p/base/port.h"
-#include "p2p/base/stunrequest.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "p2p/base/stun_request.h"
+#include "rtc_base/async_packet_socket.h"
 
 // TODO(mallinath) - Rename stunport.cc|h to udpport.cc|h.
 
@@ -294,4 +294,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_STUNPORT_H_
+#endif  // P2P_BASE_STUN_PORT_H_
diff --git a/p2p/base/stun_port_unittest.cc b/p2p/base/stun_port_unittest.cc
index 01518a9..7e7e2de 100644
--- a/p2p/base/stun_port_unittest.cc
+++ b/p2p/base/stun_port_unittest.cc
@@ -10,14 +10,14 @@
 
 #include <memory>
 
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/stunport.h"
-#include "p2p/base/teststunserver.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/stun_port.h"
+#include "p2p/base/test_stun_server.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gmock.h"
 
 using cricket::ServerAddresses;
diff --git a/p2p/base/stun_request.cc b/p2p/base/stun_request.cc
index edba4d6..f97ca86 100644
--- a/p2p/base/stun_request.cc
+++ b/p2p/base/stun_request.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/stunrequest.h"
+#include "p2p/base/stun_request.h"
 
 #include <algorithm>
 #include <memory>
@@ -18,7 +18,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"  // For TimeMillis
+#include "rtc_base/time_utils.h"  // For TimeMillis
 
 namespace cricket {
 
diff --git a/p2p/base/stun_request.h b/p2p/base/stun_request.h
index 4a9a9b4..7994fb6 100644
--- a/p2p/base/stun_request.h
+++ b/p2p/base/stun_request.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_STUNREQUEST_H_
-#define P2P_BASE_STUNREQUEST_H_
+#ifndef P2P_BASE_STUN_REQUEST_H_
+#define P2P_BASE_STUN_REQUEST_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -17,8 +17,8 @@
 #include <string>
 
 #include "p2p/base/stun.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/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
 
@@ -154,4 +154,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_STUNREQUEST_H_
+#endif  // P2P_BASE_STUN_REQUEST_H_
diff --git a/p2p/base/stun_request_unittest.cc b/p2p/base/stun_request_unittest.cc
index 94ea1cd..e2ac57f 100644
--- a/p2p/base/stun_request_unittest.cc
+++ b/p2p/base/stun_request_unittest.cc
@@ -10,11 +10,11 @@
 
 #include <vector>
 
-#include "p2p/base/stunrequest.h"
-#include "rtc_base/fakeclock.h"
+#include "p2p/base/stun_request.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 namespace cricket {
diff --git a/p2p/base/stun_server.cc b/p2p/base/stun_server.cc
index 95f0ceb..38ccc3f 100644
--- a/p2p/base/stun_server.cc
+++ b/p2p/base/stun_server.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/stunserver.h"
+#include "p2p/base/stun_server.h"
 
 #include <utility>
 
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/logging.h"
 
 namespace cricket {
diff --git a/p2p/base/stun_server.h b/p2p/base/stun_server.h
index b379513..7ddc5c1 100644
--- a/p2p/base/stun_server.h
+++ b/p2p/base/stun_server.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_STUNSERVER_H_
-#define P2P_BASE_STUNSERVER_H_
+#ifndef P2P_BASE_STUN_SERVER_H_
+#define P2P_BASE_STUN_SERVER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <memory>
 
 #include "p2p/base/stun.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace cricket {
@@ -67,4 +67,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_STUNSERVER_H_
+#endif  // P2P_BASE_STUN_SERVER_H_
diff --git a/p2p/base/stun_server_unittest.cc b/p2p/base/stun_server_unittest.cc
index 154d5b8..b5cc1df 100644
--- a/p2p/base/stun_server_unittest.cc
+++ b/p2p/base/stun_server_unittest.cc
@@ -13,13 +13,13 @@
 #include <string>
 
 #include "absl/memory/memory.h"
-#include "p2p/base/stunserver.h"
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/ipaddress.h"
+#include "p2p/base/stun_server.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/testclient.h"
+#include "rtc_base/test_client.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 namespace cricket {
diff --git a/p2p/base/stun_unittest.cc b/p2p/base/stun_unittest.cc
index 4c57b2a..60a0f7e 100644
--- a/p2p/base/stun_unittest.cc
+++ b/p2p/base/stun_unittest.cc
@@ -15,9 +15,9 @@
 #include "absl/memory/memory.h"
 #include "p2p/base/stun.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/byteorder.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/socket_address.h"
 #include "test/gtest.h"
 
 namespace cricket {
diff --git a/p2p/base/tcp_port.cc b/p2p/base/tcp_port.cc
index 490db1a..af49389 100644
--- a/p2p/base/tcp_port.cc
+++ b/p2p/base/tcp_port.cc
@@ -64,19 +64,19 @@
  *
  */
 
-#include "p2p/base/tcpport.h"
+#include "p2p/base/tcp_port.h"
 
 #include <errno.h>
 #include <algorithm>
 #include <vector>
 
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/ratetracker.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/rate_tracker.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace cricket {
diff --git a/p2p/base/tcp_port.h b/p2p/base/tcp_port.h
index 4d06a65..67716f7 100644
--- a/p2p/base/tcp_port.h
+++ b/p2p/base/tcp_port.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_TCPPORT_H_
-#define P2P_BASE_TCPPORT_H_
+#ifndef P2P_BASE_TCP_PORT_H_
+#define P2P_BASE_TCP_PORT_H_
 
 #include <list>
 #include <memory>
@@ -17,7 +17,7 @@
 
 #include "absl/memory/memory.h"
 #include "p2p/base/port.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "rtc_base/async_packet_socket.h"
 
 namespace cricket {
 
@@ -188,4 +188,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_TCPPORT_H_
+#endif  // P2P_BASE_TCP_PORT_H_
diff --git a/p2p/base/tcp_port_unittest.cc b/p2p/base/tcp_port_unittest.cc
index 7899591..b5b1f64 100644
--- a/p2p/base/tcp_port_unittest.cc
+++ b/p2p/base/tcp_port_unittest.cc
@@ -12,17 +12,17 @@
 #include <memory>
 #include <vector>
 
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/tcpport.h"
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/tcp_port.h"
+#include "p2p/base/transport_description.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 using rtc::SocketAddress;
diff --git a/p2p/base/test_relay_server.h b/p2p/base/test_relay_server.h
index 9aca2f6..be58251 100644
--- a/p2p/base/test_relay_server.h
+++ b/p2p/base/test_relay_server.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_TESTRELAYSERVER_H_
-#define P2P_BASE_TESTRELAYSERVER_H_
+#ifndef P2P_BASE_TEST_RELAY_SERVER_H_
+#define P2P_BASE_TEST_RELAY_SERVER_H_
 
 #include <memory>
 
-#include "p2p/base/relayserver.h"
-#include "rtc_base/asynctcpsocket.h"
+#include "p2p/base/relay_server.h"
+#include "rtc_base/async_tcp_socket.h"
 #include "rtc_base/server_socket_adapters.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
@@ -98,4 +98,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_TESTRELAYSERVER_H_
+#endif  // P2P_BASE_TEST_RELAY_SERVER_H_
diff --git a/p2p/base/test_stun_server.cc b/p2p/base/test_stun_server.cc
index e299224..3c98cd8 100644
--- a/p2p/base/test_stun_server.cc
+++ b/p2p/base/test_stun_server.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/teststunserver.h"
+#include "p2p/base/test_stun_server.h"
 
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/socket_server.h"
 
 namespace cricket {
 
diff --git a/p2p/base/test_stun_server.h b/p2p/base/test_stun_server.h
index e0d94b7..44e3927 100644
--- a/p2p/base/test_stun_server.h
+++ b/p2p/base/test_stun_server.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_TESTSTUNSERVER_H_
-#define P2P_BASE_TESTSTUNSERVER_H_
+#ifndef P2P_BASE_TEST_STUN_SERVER_H_
+#define P2P_BASE_TEST_STUN_SERVER_H_
 
 #include "p2p/base/stun.h"
-#include "p2p/base/stunserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/socketaddress.h"
+#include "p2p/base/stun_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/thread.h"
 
 namespace cricket {
@@ -42,4 +42,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_TESTSTUNSERVER_H_
+#endif  // P2P_BASE_TEST_STUN_SERVER_H_
diff --git a/p2p/base/test_turn_customizer.h b/p2p/base/test_turn_customizer.h
index 7ca4579..ae8864a 100644
--- a/p2p/base/test_turn_customizer.h
+++ b/p2p/base/test_turn_customizer.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_TESTTURNCUSTOMIZER_H_
-#define P2P_BASE_TESTTURNCUSTOMIZER_H_
+#ifndef P2P_BASE_TEST_TURN_CUSTOMIZER_H_
+#define P2P_BASE_TEST_TURN_CUSTOMIZER_H_
 
 #include "absl/memory/memory.h"
-#include "api/turncustomizer.h"
+#include "api/turn_customizer.h"
 #include "rtc_base/gunit.h"
 
 namespace cricket {
@@ -55,4 +55,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_TESTTURNCUSTOMIZER_H_
+#endif  // P2P_BASE_TEST_TURN_CUSTOMIZER_H_
diff --git a/p2p/base/test_turn_server.h b/p2p/base/test_turn_server.h
index 734ca4d..2bbe573 100644
--- a/p2p/base/test_turn_server.h
+++ b/p2p/base/test_turn_server.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_TESTTURNSERVER_H_
-#define P2P_BASE_TESTTURNSERVER_H_
+#ifndef P2P_BASE_TEST_TURN_SERVER_H_
+#define P2P_BASE_TEST_TURN_SERVER_H_
 
 #include <string>
 #include <vector>
 
-#include "p2p/base/basicpacketsocketfactory.h"
+#include "p2p/base/basic_packet_socket_factory.h"
 #include "p2p/base/stun.h"
-#include "p2p/base/turnserver.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslidentity.h"
+#include "p2p/base/turn_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_identity.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_checker.h"
 
@@ -152,4 +152,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_TESTTURNSERVER_H_
+#endif  // P2P_BASE_TEST_TURN_SERVER_H_
diff --git a/p2p/base/transport_description.cc b/p2p/base/transport_description.cc
index 95d7e2f..1847eec 100644
--- a/p2p/base/transport_description.cc
+++ b/p2p/base/transport_description.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/transport_description.h"
 
 #include "absl/strings/match.h"
 #include "rtc_base/arraysize.h"
diff --git a/p2p/base/transport_description.h b/p2p/base/transport_description.h
index 2ab9732..c3c14a6 100644
--- a/p2p/base/transport_description.h
+++ b/p2p/base/transport_description.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_TRANSPORTDESCRIPTION_H_
-#define P2P_BASE_TRANSPORTDESCRIPTION_H_
+#ifndef P2P_BASE_TRANSPORT_DESCRIPTION_H_
+#define P2P_BASE_TRANSPORT_DESCRIPTION_H_
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "p2p/base/p2pconstants.h"
-#include "rtc_base/sslfingerprint.h"
+#include "p2p/base/p2p_constants.h"
+#include "rtc_base/ssl_fingerprint.h"
 
 namespace cricket {
 
@@ -138,4 +138,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_TRANSPORTDESCRIPTION_H_
+#endif  // P2P_BASE_TRANSPORT_DESCRIPTION_H_
diff --git a/p2p/base/transport_description_factory.cc b/p2p/base/transport_description_factory.cc
index 4e4f724..d95328b 100644
--- a/p2p/base/transport_description_factory.cc
+++ b/p2p/base/transport_description_factory.cc
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/transportdescriptionfactory.h"
+#include "p2p/base/transport_description_factory.h"
 
 #include <stddef.h>
 #include <memory>
 #include <string>
 
 #include "absl/memory/memory.h"
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/transport_description.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/sslfingerprint.h"
+#include "rtc_base/ssl_fingerprint.h"
 
 namespace cricket {
 
diff --git a/p2p/base/transport_description_factory.h b/p2p/base/transport_description_factory.h
index 55e5b9a..c1656a0 100644
--- a/p2p/base/transport_description_factory.h
+++ b/p2p/base/transport_description_factory.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
-#define P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
+#ifndef P2P_BASE_TRANSPORT_DESCRIPTION_FACTORY_H_
+#define P2P_BASE_TRANSPORT_DESCRIPTION_FACTORY_H_
 
 #include <memory>
 
-#include "p2p/base/icecredentialsiterator.h"
-#include "p2p/base/transportdescription.h"
-#include "rtc_base/rtccertificate.h"
+#include "p2p/base/ice_credentials_iterator.h"
+#include "p2p/base/transport_description.h"
+#include "rtc_base/rtc_certificate.h"
 
 namespace rtc {
 class SSLIdentity;
@@ -83,4 +83,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
+#endif  // P2P_BASE_TRANSPORT_DESCRIPTION_FACTORY_H_
diff --git a/p2p/base/transport_description_factory_unittest.cc b/p2p/base/transport_description_factory_unittest.cc
index e8f623a..af91a21 100644
--- a/p2p/base/transport_description_factory_unittest.cc
+++ b/p2p/base/transport_description_factory_unittest.cc
@@ -14,14 +14,14 @@
 #include <string>
 #include <vector>
 
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportdescriptionfactory.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/fakesslidentity.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslfingerprint.h"
-#include "rtc_base/sslidentity.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_description_factory.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/fake_ssl_identity.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_fingerprint.h"
+#include "rtc_base/ssl_identity.h"
 #include "test/gtest.h"
 
 using cricket::TransportDescriptionFactory;
diff --git a/p2p/base/transport_factory_interface.h b/p2p/base/transport_factory_interface.h
index 9805db0..6da5534 100644
--- a/p2p/base/transport_factory_interface.h
+++ b/p2p/base/transport_factory_interface.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_TRANSPORTFACTORYINTERFACE_H_
-#define P2P_BASE_TRANSPORTFACTORYINTERFACE_H_
+#ifndef P2P_BASE_TRANSPORT_FACTORY_INTERFACE_H_
+#define P2P_BASE_TRANSPORT_FACTORY_INTERFACE_H_
 
 #include <memory>
 #include <string>
 
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/icetransportinternal.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/ice_transport_internal.h"
 
 namespace cricket {
 
@@ -39,4 +39,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_TRANSPORTFACTORYINTERFACE_H_
+#endif  // P2P_BASE_TRANSPORT_FACTORY_INTERFACE_H_
diff --git a/p2p/base/transport_info.h b/p2p/base/transport_info.h
index 627c0f7..1f60b64 100644
--- a/p2p/base/transport_info.h
+++ b/p2p/base/transport_info.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_TRANSPORTINFO_H_
-#define P2P_BASE_TRANSPORTINFO_H_
+#ifndef P2P_BASE_TRANSPORT_INFO_H_
+#define P2P_BASE_TRANSPORT_INFO_H_
 
 #include <string>
 #include <vector>
 
 #include "api/candidate.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/transportdescription.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/transport_description.h"
 #include "rtc_base/helpers.h"
 
 namespace cricket {
@@ -39,4 +39,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_TRANSPORTINFO_H_
+#endif  // P2P_BASE_TRANSPORT_INFO_H_
diff --git a/p2p/base/turn_port.cc b/p2p/base/turn_port.cc
index eb0adfa..bfaf45b 100644
--- a/p2p/base/turn_port.cc
+++ b/p2p/base/turn_port.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/turnport.h"
+#include "p2p/base/turn_port.h"
 
 #include <algorithm>
 #include <functional>
@@ -18,12 +18,12 @@
 #include "absl/memory/memory.h"
 #include "absl/types/optional.h"
 #include "p2p/base/stun.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/strings/string_builder.h"
 
 namespace cricket {
diff --git a/p2p/base/turn_port.h b/p2p/base/turn_port.h
index e152e0a..3f2e95c 100644
--- a/p2p/base/turn_port.h
+++ b/p2p/base/turn_port.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_TURNPORT_H_
-#define P2P_BASE_TURNPORT_H_
+#ifndef P2P_BASE_TURN_PORT_H_
+#define P2P_BASE_TURN_PORT_H_
 
 #include <stdio.h>
 #include <list>
@@ -21,10 +21,10 @@
 
 #include "absl/memory/memory.h"
 #include "p2p/base/port.h"
-#include "p2p/client/basicportallocator.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/sslcertificate.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/ssl_certificate.h"
 
 namespace webrtc {
 class TurnCustomizer;
@@ -396,4 +396,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_TURNPORT_H_
+#endif  // P2P_BASE_TURN_PORT_H_
diff --git a/p2p/base/turn_port_unittest.cc b/p2p/base/turn_port_unittest.cc
index cee1a2d..931f908 100644
--- a/p2p/base/turn_port_unittest.cc
+++ b/p2p/base/turn_port_unittest.cc
@@ -18,28 +18,28 @@
 
 #include "absl/types/optional.h"
 #include "api/units/time_delta.h"
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/stunport.h"
-#include "p2p/base/testturncustomizer.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/turnport.h"
-#include "p2p/base/turnserver.h"
-#include "rtc_base/asyncsocket.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/stun_port.h"
+#include "p2p/base/test_turn_customizer.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/turn_port.h"
+#include "p2p/base/turn_server.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/location.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 using rtc::SocketAddress;
diff --git a/p2p/base/turn_server.cc b/p2p/base/turn_server.cc
index a8bb41c..62ef5d9 100644
--- a/p2p/base/turn_server.cc
+++ b/p2p/base/turn_server.cc
@@ -8,22 +8,22 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/turnserver.h"
+#include "p2p/base/turn_server.h"
 
 #include <tuple>  // for std::tie
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "p2p/base/asyncstuntcpsocket.h"
-#include "p2p/base/packetsocketfactory.h"
+#include "p2p/base/async_stun_tcp_socket.h"
+#include "p2p/base/packet_socket_factory.h"
 #include "p2p/base/stun.h"
 #include "rtc_base/bind.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/socketadapters.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/socket_adapters.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/thread.h"
 
diff --git a/p2p/base/turn_server.h b/p2p/base/turn_server.h
index af51251..690d6a9 100644
--- a/p2p/base/turn_server.h
+++ b/p2p/base/turn_server.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_TURNSERVER_H_
-#define P2P_BASE_TURNSERVER_H_
+#ifndef P2P_BASE_TURN_SERVER_H_
+#define P2P_BASE_TURN_SERVER_H_
 
 #include <list>
 #include <map>
@@ -19,11 +19,11 @@
 #include <utility>
 #include <vector>
 
-#include "p2p/base/portinterface.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/socketaddress.h"
+#include "p2p/base/port_interface.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread_checker.h"
 
@@ -348,4 +348,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_BASE_TURNSERVER_H_
+#endif  // P2P_BASE_TURN_SERVER_H_
diff --git a/p2p/base/turn_server_unittest.cc b/p2p/base/turn_server_unittest.cc
index 279506a..4080cec 100644
--- a/p2p/base/turn_server_unittest.cc
+++ b/p2p/base/turn_server_unittest.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/turnserver.h"
+#include "p2p/base/turn_server.h"
 
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 // NOTE: This is a work in progress. Currently this file only has tests for
diff --git a/p2p/base/udp_port.h b/p2p/base/udp_port.h
index ce55101..2fd6868 100644
--- a/p2p/base/udp_port.h
+++ b/p2p/base/udp_port.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_BASE_UDPPORT_H_
-#define P2P_BASE_UDPPORT_H_
+#ifndef P2P_BASE_UDP_PORT_H_
+#define P2P_BASE_UDP_PORT_H_
 
 // StunPort will be handling UDPPort functionality.
-#include "p2p/base/stunport.h"
+#include "p2p/base/stun_port.h"
 
-#endif  // P2P_BASE_UDPPORT_H_
+#endif  // P2P_BASE_UDP_PORT_H_
diff --git a/p2p/client/basic_port_allocator.cc b/p2p/client/basic_port_allocator.cc
index 5c3f63a..6dc5dfc 100644
--- a/p2p/client/basic_port_allocator.cc
+++ b/p2p/client/basic_port_allocator.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/client/basicportallocator.h"
+#include "p2p/client/basic_port_allocator.h"
 
 #include <algorithm>
 #include <functional>
@@ -16,13 +16,13 @@
 #include <string>
 #include <vector>
 
-#include "p2p/base/basicpacketsocketfactory.h"
+#include "p2p/base/basic_packet_socket_factory.h"
 #include "p2p/base/port.h"
-#include "p2p/base/relayport.h"
-#include "p2p/base/stunport.h"
-#include "p2p/base/tcpport.h"
-#include "p2p/base/turnport.h"
-#include "p2p/base/udpport.h"
+#include "p2p/base/relay_port.h"
+#include "p2p/base/stun_port.h"
+#include "p2p/base/tcp_port.h"
+#include "p2p/base/turn_port.h"
+#include "p2p/base/udp_port.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
diff --git a/p2p/client/basic_port_allocator.h b/p2p/client/basic_port_allocator.h
index 672f3dd..edc6b87 100644
--- a/p2p/client/basic_port_allocator.h
+++ b/p2p/client/basic_port_allocator.h
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_CLIENT_BASICPORTALLOCATOR_H_
-#define P2P_CLIENT_BASICPORTALLOCATOR_H_
+#ifndef P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_
+#define P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "api/turncustomizer.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/client/relayportfactoryinterface.h"
-#include "p2p/client/turnportfactory.h"
+#include "api/turn_customizer.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/client/relay_port_factory_interface.h"
+#include "p2p/client/turn_port_factory.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_queue.h"
 #include "rtc_base/network.h"
 #include "rtc_base/system/rtc_export.h"
 #include "rtc_base/thread.h"
@@ -410,4 +410,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_CLIENT_BASICPORTALLOCATOR_H_
+#endif  // P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_
diff --git a/p2p/client/basic_port_allocator_unittest.cc b/p2p/client/basic_port_allocator_unittest.cc
index 2b205e6..936ca2f 100644
--- a/p2p/client/basic_port_allocator_unittest.cc
+++ b/p2p/client/basic_port_allocator_unittest.cc
@@ -12,34 +12,34 @@
 #include <memory>
 #include <ostream>  // no-presubmit-check TODO(webrtc:8982)
 
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/stunport.h"
-#include "p2p/base/stunrequest.h"
-#include "p2p/base/stunserver.h"
-#include "p2p/base/testrelayserver.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/client/basicportallocator.h"
-#include "rtc_base/fakeclock.h"
-#include "rtc_base/fakenetwork.h"
-#include "rtc_base/firewallsocketserver.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/stun_port.h"
+#include "p2p/base/stun_request.h"
+#include "p2p/base/stun_server.h"
+#include "p2p/base/test_relay_server.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "rtc_base/fake_clock.h"
+#include "rtc_base/fake_network.h"
+#include "rtc_base/firewall_socket_server.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/natsocketfactory.h"
-#include "rtc_base/nattypes.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/nat_socket_factory.h"
+#include "rtc_base/nat_types.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/net_helpers.h"
 #include "rtc_base/network.h"
 #include "rtc_base/network_constants.h"
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/network_monitor.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketaddresspair.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_address_pair.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "system_wrappers/include/metrics.h"
 #include "test/gtest.h"
 
diff --git a/p2p/client/relay_port_factory_interface.h b/p2p/client/relay_port_factory_interface.h
index 2afe651..c1cf51e 100644
--- a/p2p/client/relay_port_factory_interface.h
+++ b/p2p/client/relay_port_factory_interface.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_
-#define P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_
+#ifndef P2P_CLIENT_RELAY_PORT_FACTORY_INTERFACE_H_
+#define P2P_CLIENT_RELAY_PORT_FACTORY_INTERFACE_H_
 
 #include <memory>
 #include <string>
 
-#include "p2p/base/portinterface.h"
-#include "rtc_base/refcount.h"
+#include "p2p/base/port_interface.h"
+#include "rtc_base/ref_count.h"
 
 namespace rtc {
 class AsyncPacketSocket;
@@ -67,4 +67,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_CLIENT_RELAYPORTFACTORYINTERFACE_H_
+#endif  // P2P_CLIENT_RELAY_PORT_FACTORY_INTERFACE_H_
diff --git a/p2p/client/turn_port_factory.cc b/p2p/client/turn_port_factory.cc
index 5465c36..934c019 100644
--- a/p2p/client/turn_port_factory.cc
+++ b/p2p/client/turn_port_factory.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/client/turnportfactory.h"
+#include "p2p/client/turn_port_factory.h"
 
 #include <memory>
 #include <utility>
 
-#include "p2p/base/portallocator.h"
-#include "p2p/base/turnport.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/turn_port.h"
 
 namespace cricket {
 
diff --git a/p2p/client/turn_port_factory.h b/p2p/client/turn_port_factory.h
index ea199f4..abb1f67 100644
--- a/p2p/client/turn_port_factory.h
+++ b/p2p/client/turn_port_factory.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_CLIENT_TURNPORTFACTORY_H_
-#define P2P_CLIENT_TURNPORTFACTORY_H_
+#ifndef P2P_CLIENT_TURN_PORT_FACTORY_H_
+#define P2P_CLIENT_TURN_PORT_FACTORY_H_
 
 #include <memory>
 
 #include "p2p/base/port.h"
-#include "p2p/client/relayportfactoryinterface.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "p2p/client/relay_port_factory_interface.h"
+#include "rtc_base/async_packet_socket.h"
 
 namespace cricket {
 
@@ -34,4 +34,4 @@
 
 }  // namespace cricket
 
-#endif  // P2P_CLIENT_TURNPORTFACTORY_H_
+#endif  // P2P_CLIENT_TURN_PORT_FACTORY_H_
diff --git a/p2p/stunprober/stun_prober.cc b/p2p/stunprober/stun_prober.cc
index 9778416..4fe572f 100644
--- a/p2p/stunprober/stun_prober.cc
+++ b/p2p/stunprober/stun_prober.cc
@@ -14,18 +14,18 @@
 #include <string>
 #include <utility>
 
-#include "p2p/base/packetsocketfactory.h"
+#include "p2p/base/packet_socket_factory.h"
 #include "p2p/base/stun.h"
-#include "p2p/stunprober/stunprober.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncresolverinterface.h"
+#include "p2p/stunprober/stun_prober.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_resolver_interface.h"
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace stunprober {
 
diff --git a/p2p/stunprober/stun_prober.h b/p2p/stunprober/stun_prober.h
index a4feecd..bdfb758 100644
--- a/p2p/stunprober/stun_prober.h
+++ b/p2p/stunprober/stun_prober.h
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef P2P_STUNPROBER_STUNPROBER_H_
-#define P2P_STUNPROBER_STUNPROBER_H_
+#ifndef P2P_STUNPROBER_STUN_PROBER_H_
+#define P2P_STUNPROBER_STUN_PROBER_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/callback.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/network.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/system/rtc_export.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_checker.h"
@@ -248,4 +248,4 @@
 
 }  // namespace stunprober
 
-#endif  // P2P_STUNPROBER_STUNPROBER_H_
+#endif  // P2P_STUNPROBER_STUN_PROBER_H_
diff --git a/p2p/stunprober/stun_prober_unittest.cc b/p2p/stunprober/stun_prober_unittest.cc
index b800939..c54f453 100644
--- a/p2p/stunprober/stun_prober_unittest.cc
+++ b/p2p/stunprober/stun_prober_unittest.cc
@@ -11,13 +11,13 @@
 #include <stdint.h>
 #include <memory>
 
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/stunprober/stunprober.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/stunprober/stun_prober.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 using stunprober::StunProber;
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 7736b2f..9b634fb 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -31,41 +31,41 @@
   sources = [
     "channel.cc",
     "channel.h",
-    "channelinterface.h",
-    "channelmanager.cc",
-    "channelmanager.h",
-    "dtlssrtptransport.cc",
-    "dtlssrtptransport.h",
-    "dtlstransport.cc",
-    "dtlstransport.h",
-    "externalhmac.cc",
-    "externalhmac.h",
-    "jseptransport.cc",
-    "jseptransport.h",
-    "jseptransportcontroller.cc",
-    "jseptransportcontroller.h",
-    "mediasession.cc",
-    "mediasession.h",
-    "rtcpmuxfilter.cc",
-    "rtcpmuxfilter.h",
-    "rtpmediautils.cc",
-    "rtpmediautils.h",
-    "rtptransport.cc",
-    "rtptransport.h",
-    "rtptransportinternal.h",
-    "rtptransportinternaladapter.h",
-    "sessiondescription.cc",
-    "sessiondescription.h",
-    "simulcastdescription.cc",
-    "simulcastdescription.h",
-    "srtpfilter.cc",
-    "srtpfilter.h",
-    "srtpsession.cc",
-    "srtpsession.h",
-    "srtptransport.cc",
-    "srtptransport.h",
-    "transportstats.cc",
-    "transportstats.h",
+    "channel_interface.h",
+    "channel_manager.cc",
+    "channel_manager.h",
+    "dtls_srtp_transport.cc",
+    "dtls_srtp_transport.h",
+    "dtls_transport.cc",
+    "dtls_transport.h",
+    "external_hmac.cc",
+    "external_hmac.h",
+    "jsep_transport.cc",
+    "jsep_transport.h",
+    "jsep_transport_controller.cc",
+    "jsep_transport_controller.h",
+    "media_session.cc",
+    "media_session.h",
+    "rtcp_mux_filter.cc",
+    "rtcp_mux_filter.h",
+    "rtp_media_utils.cc",
+    "rtp_media_utils.h",
+    "rtp_transport.cc",
+    "rtp_transport.h",
+    "rtp_transport_internal.h",
+    "rtp_transport_internal_adapter.h",
+    "session_description.cc",
+    "session_description.h",
+    "simulcast_description.cc",
+    "simulcast_description.h",
+    "srtp_filter.cc",
+    "srtp_filter.h",
+    "srtp_session.cc",
+    "srtp_session.h",
+    "srtp_transport.cc",
+    "srtp_transport.h",
+    "transport_stats.cc",
+    "transport_stats.h",
     "unique_id_generator.cc",
     "unique_id_generator.h",
   ]
@@ -129,63 +129,63 @@
   visibility = [ "*" ]
   cflags = []
   sources = [
-    "audiotrack.cc",
-    "audiotrack.h",
-    "datachannel.cc",
-    "datachannel.h",
-    "dtmfsender.cc",
-    "dtmfsender.h",
-    "iceserverparsing.cc",
-    "iceserverparsing.h",
-    "jsepicecandidate.cc",
-    "jsepsessiondescription.cc",
-    "localaudiosource.cc",
-    "localaudiosource.h",
-    "mediastream.cc",
-    "mediastream.h",
-    "mediastreamobserver.cc",
-    "mediastreamobserver.h",
-    "mediastreamtrack.h",
-    "peerconnection.cc",
-    "peerconnection.h",
-    "peerconnectionfactory.cc",
-    "peerconnectionfactory.h",
-    "peerconnectioninternal.h",
-    "remoteaudiosource.cc",
-    "remoteaudiosource.h",
-    "rtcstatscollector.cc",
-    "rtcstatscollector.h",
-    "rtcstatstraversal.cc",
-    "rtcstatstraversal.h",
-    "rtpparametersconversion.cc",
-    "rtpparametersconversion.h",
-    "rtpreceiver.cc",
-    "rtpreceiver.h",
-    "rtpsender.cc",
-    "rtpsender.h",
-    "rtptransceiver.cc",
-    "rtptransceiver.h",
-    "sctputils.cc",
-    "sctputils.h",
-    "sdpserializer.cc",
-    "sdpserializer.h",
-    "sdputils.cc",
-    "sdputils.h",
-    "statscollector.cc",
-    "statscollector.h",
-    "streamcollection.h",
-    "trackmediainfomap.cc",
-    "trackmediainfomap.h",
-    "videocapturertracksource.cc",
-    "videocapturertracksource.h",
-    "videotrack.cc",
-    "videotrack.h",
-    "videotracksource.cc",
-    "videotracksource.h",
-    "webrtcsdp.cc",
-    "webrtcsdp.h",
-    "webrtcsessiondescriptionfactory.cc",
-    "webrtcsessiondescriptionfactory.h",
+    "audio_track.cc",
+    "audio_track.h",
+    "data_channel.cc",
+    "data_channel.h",
+    "dtmf_sender.cc",
+    "dtmf_sender.h",
+    "ice_server_parsing.cc",
+    "ice_server_parsing.h",
+    "jsep_ice_candidate.cc",
+    "jsep_session_description.cc",
+    "local_audio_source.cc",
+    "local_audio_source.h",
+    "media_stream.cc",
+    "media_stream.h",
+    "media_stream_observer.cc",
+    "media_stream_observer.h",
+    "media_stream_track.h",
+    "peer_connection.cc",
+    "peer_connection.h",
+    "peer_connection_factory.cc",
+    "peer_connection_factory.h",
+    "peer_connection_internal.h",
+    "remote_audio_source.cc",
+    "remote_audio_source.h",
+    "rtc_stats_collector.cc",
+    "rtc_stats_collector.h",
+    "rtc_stats_traversal.cc",
+    "rtc_stats_traversal.h",
+    "rtp_parameters_conversion.cc",
+    "rtp_parameters_conversion.h",
+    "rtp_receiver.cc",
+    "rtp_receiver.h",
+    "rtp_sender.cc",
+    "rtp_sender.h",
+    "rtp_transceiver.cc",
+    "rtp_transceiver.h",
+    "sctp_utils.cc",
+    "sctp_utils.h",
+    "sdp_serializer.cc",
+    "sdp_serializer.h",
+    "sdp_utils.cc",
+    "sdp_utils.h",
+    "stats_collector.cc",
+    "stats_collector.h",
+    "stream_collection.h",
+    "track_media_info_map.cc",
+    "track_media_info_map.h",
+    "video_capturer_track_source.cc",
+    "video_capturer_track_source.h",
+    "video_track.cc",
+    "video_track.h",
+    "video_track_source.cc",
+    "video_track_source.h",
+    "webrtc_sdp.cc",
+    "webrtc_sdp.h",
+    "webrtc_session_description_factory.cc",
+    "webrtc_session_description_factory.h",
   ]
 
   if (!build_with_chromium && is_clang) {
@@ -246,21 +246,21 @@
     testonly = true
 
     sources = [
+      "channel_manager_unittest.cc",
       "channel_unittest.cc",
-      "channelmanager_unittest.cc",
-      "dtlssrtptransport_unittest.cc",
+      "dtls_srtp_transport_unittest.cc",
       "dtlstransport_unittest.cc",
-      "jseptransport_unittest.cc",
-      "jseptransportcontroller_unittest.cc",
-      "mediasession_unittest.cc",
-      "rtcpmuxfilter_unittest.cc",
-      "rtptransport_unittest.cc",
-      "rtptransporttestutil.h",
-      "sessiondescription_unittest.cc",
-      "srtpfilter_unittest.cc",
-      "srtpsession_unittest.cc",
-      "srtptestutil.h",
-      "srtptransport_unittest.cc",
+      "jsep_transport_controller_unittest.cc",
+      "jsep_transport_unittest.cc",
+      "media_session_unittest.cc",
+      "rtcp_mux_filter_unittest.cc",
+      "rtp_transport_unittest.cc",
+      "session_description_unittest.cc",
+      "srtp_filter_unittest.cc",
+      "srtp_session_unittest.cc",
+      "srtp_transport_unittest.cc",
+      "test/rtp_transport_test_util.h",
+      "test/srtp_test_util.h",
       "unique_id_generator_unittest.cc",
     ]
 
@@ -316,7 +316,7 @@
   rtc_source_set("peerconnection_perf_tests") {
     testonly = true
     sources = [
-      "peerconnection_rampup_tests.cc",
+      "peer_connection_rampup_tests.cc",
     ]
     deps = [
       ":pc_test_utils",
@@ -357,8 +357,8 @@
   rtc_source_set("peerconnection_wrapper") {
     testonly = true
     sources = [
-      "peerconnectionwrapper.cc",
-      "peerconnectionwrapper.h",
+      "peer_connection_wrapper.cc",
+      "peer_connection_wrapper.h",
     ]
     deps = [
       ":pc_test_utils",
@@ -379,27 +379,27 @@
   rtc_source_set("pc_test_utils") {
     testonly = true
     sources = [
-      "test/fakeaudiocapturemodule.cc",
-      "test/fakeaudiocapturemodule.h",
-      "test/fakedatachannelprovider.h",
-      "test/fakepeerconnectionbase.h",
-      "test/fakepeerconnectionforstats.h",
-      "test/fakeperiodicvideosource.h",
-      "test/fakeperiodicvideotracksource.h",
-      "test/fakertccertificategenerator.h",
-      "test/fakesctptransport.h",
-      "test/fakevideotrackrenderer.h",
-      "test/fakevideotracksource.h",
-      "test/framegeneratorcapturervideotracksource.h",
-      "test/mock_channelinterface.h",
-      "test/mock_datachannel.h",
-      "test/mock_rtpreceiverinternal.h",
-      "test/mock_rtpsenderinternal.h",
-      "test/mockpeerconnectionobservers.h",
-      "test/peerconnectiontestwrapper.cc",
-      "test/peerconnectiontestwrapper.h",
-      "test/rtcstatsobtainer.h",
-      "test/testsdpstrings.h",
+      "test/fake_audio_capture_module.cc",
+      "test/fake_audio_capture_module.h",
+      "test/fake_data_channel_provider.h",
+      "test/fake_peer_connection_base.h",
+      "test/fake_peer_connection_for_stats.h",
+      "test/fake_periodic_video_source.h",
+      "test/fake_periodic_video_track_source.h",
+      "test/fake_rtc_certificate_generator.h",
+      "test/fake_sctp_transport.h",
+      "test/fake_video_track_renderer.h",
+      "test/fake_video_track_source.h",
+      "test/frame_generator_capturer_video_track_source.h",
+      "test/mock_channel_interface.h",
+      "test/mock_data_channel.h",
+      "test/mock_peer_connection_observers.h",
+      "test/mock_rtp_receiver_internal.h",
+      "test/mock_rtp_sender_internal.h",
+      "test/peer_connection_test_wrapper.cc",
+      "test/peer_connection_test_wrapper.h",
+      "test/rtc_stats_obtainer.h",
+      "test/test_sdp_strings.h",
     ]
 
     deps = [
@@ -450,45 +450,45 @@
   rtc_test("peerconnection_unittests") {
     testonly = true
     sources = [
-      "datachannel_unittest.cc",
-      "dtmfsender_unittest.cc",
-      "iceserverparsing_unittest.cc",
-      "jsepsessiondescription_unittest.cc",
-      "localaudiosource_unittest.cc",
-      "mediaconstraintsinterface_unittest.cc",
-      "mediastream_unittest.cc",
-      "peerconnection_bundle_unittest.cc",
-      "peerconnection_crypto_unittest.cc",
-      "peerconnection_datachannel_unittest.cc",
-      "peerconnection_histogram_unittest.cc",
-      "peerconnection_ice_unittest.cc",
-      "peerconnection_integrationtest.cc",
-      "peerconnection_jsep_unittest.cc",
-      "peerconnection_media_unittest.cc",
-      "peerconnection_rtp_unittest.cc",
-      "peerconnection_signaling_unittest.cc",
-      "peerconnectionendtoend_unittest.cc",
-      "peerconnectionfactory_unittest.cc",
-      "peerconnectioninterface_unittest.cc",
-      "peerconnectionwrapper.cc",
-      "peerconnectionwrapper.h",
+      "data_channel_unittest.cc",
+      "dtmf_sender_unittest.cc",
+      "ice_server_parsing_unittest.cc",
+      "jsep_session_description_unittest.cc",
+      "local_audio_source_unittest.cc",
+      "media_constraints_interface_unittest.cc",
+      "media_stream_unittest.cc",
+      "peer_connection_bundle_unittest.cc",
+      "peer_connection_crypto_unittest.cc",
+      "peer_connection_data_channel_unittest.cc",
+      "peer_connection_end_to_end_unittest.cc",
+      "peer_connection_factory_unittest.cc",
+      "peer_connection_histogram_unittest.cc",
+      "peer_connection_ice_unittest.cc",
+      "peer_connection_integrationtest.cc",
+      "peer_connection_interface_unittest.cc",
+      "peer_connection_jsep_unittest.cc",
+      "peer_connection_media_unittest.cc",
+      "peer_connection_rtp_unittest.cc",
+      "peer_connection_signaling_unittest.cc",
+      "peer_connection_wrapper.cc",
+      "peer_connection_wrapper.h",
       "proxy_unittest.cc",
-      "rtcstats_integrationtest.cc",
-      "rtcstatscollector_unittest.cc",
-      "rtcstatstraversal_unittest.cc",
-      "rtpmediautils_unittest.cc",
-      "rtpparametersconversion_unittest.cc",
-      "rtpsenderreceiver_unittest.cc",
-      "rtptransceiver_unittest.cc",
-      "sctputils_unittest.cc",
-      "sdpserializer_unittest.cc",
-      "statscollector_unittest.cc",
-      "test/fakeaudiocapturemodule_unittest.cc",
-      "test/testsdpstrings.h",
-      "trackmediainfomap_unittest.cc",
-      "videocapturertracksource_unittest.cc",
-      "videotrack_unittest.cc",
-      "webrtcsdp_unittest.cc",
+      "rtc_stats_collector_unittest.cc",
+      "rtc_stats_integrationtest.cc",
+      "rtc_stats_traversal_unittest.cc",
+      "rtp_media_utils_unittest.cc",
+      "rtp_parameters_conversion_unittest.cc",
+      "rtp_sender_receiver_unittest.cc",
+      "rtp_transceiver_unittest.cc",
+      "sctp_utils_unittest.cc",
+      "sdp_serializer_unittest.cc",
+      "stats_collector_unittest.cc",
+      "test/fake_audio_capture_module_unittest.cc",
+      "test/test_sdp_strings.h",
+      "track_media_info_map_unittest.cc",
+      "video_capturer_track_source_unittest.cc",
+      "video_track_unittest.cc",
+      "webrtc_sdp_unittest.cc",
     ]
 
     if (rtc_enable_sctp) {
@@ -593,8 +593,8 @@
       check_includes = false
       testonly = true
       sources = [
-        "test/androidtestinitializer.cc",
-        "test/androidtestinitializer.h",
+        "test/android_test_initializer.cc",
+        "test/android_test_initializer.h",
       ]
       deps = [
         "../sdk/android:libjingle_peerconnection_jni",
diff --git a/pc/audio_track.cc b/pc/audio_track.cc
index 2a3e5e3..f3bc3ff 100644
--- a/pc/audio_track.cc
+++ b/pc/audio_track.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/audiotrack.h"
+#include "pc/audio_track.h"
 
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 
 namespace webrtc {
 
diff --git a/pc/audio_track.h b/pc/audio_track.h
index 17ac700..6df8693 100644
--- a/pc/audio_track.h
+++ b/pc/audio_track.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_AUDIOTRACK_H_
-#define PC_AUDIOTRACK_H_
+#ifndef PC_AUDIO_TRACK_H_
+#define PC_AUDIO_TRACK_H_
 
 #include <string>
 
-#include "api/mediastreaminterface.h"
-#include "pc/mediastreamtrack.h"
-#include "rtc_base/constructormagic.h"
+#include "api/media_stream_interface.h"
+#include "pc/media_stream_track.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_checker.h"
 
@@ -55,4 +55,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_AUDIOTRACK_H_
+#endif  // PC_AUDIO_TRACK_H_
diff --git a/pc/channel.cc b/pc/channel.cc
index 8a2fcb5..b7bab92 100644
--- a/pc/channel.cc
+++ b/pc/channel.cc
@@ -16,24 +16,24 @@
 
 #include "absl/memory/memory.h"
 #include "api/call/audio_sink.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/rtputils.h"
+#include "media/base/media_constants.h"
+#include "media/base/rtp_utils.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "rtc_base/bind.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.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/strings/string_builder.h"
 #include "rtc_base/trace_event.h"
 // Adding 'nogncheck' to disable the gn include headers check to support modular
 // WebRTC build targets.
-#include "media/engine/webrtcvoiceengine.h"  // nogncheck
-#include "p2p/base/packettransportinternal.h"
-#include "pc/channelmanager.h"
-#include "pc/rtpmediautils.h"
+#include "media/engine/webrtc_voice_engine.h"  // nogncheck
+#include "p2p/base/packet_transport_internal.h"
+#include "pc/channel_manager.h"
+#include "pc/rtp_media_utils.h"
 
 namespace cricket {
 using rtc::Bind;
diff --git a/pc/channel.h b/pc/channel.h
index 6264bb3..6d6bd40 100644
--- a/pc/channel.h
+++ b/pc/channel.h
@@ -20,24 +20,24 @@
 
 #include "api/call/audio_sink.h"
 #include "api/jsep.h"
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
 #include "api/video/video_sink_interface.h"
 #include "api/video/video_source_interface.h"
 #include "call/rtp_packet_sink_interface.h"
-#include "media/base/mediachannel.h"
-#include "media/base/mediaengine.h"
-#include "media/base/streamparams.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/packettransportinternal.h"
-#include "pc/channelinterface.h"
-#include "pc/dtlssrtptransport.h"
-#include "pc/mediasession.h"
-#include "pc/rtptransport.h"
-#include "pc/srtpfilter.h"
-#include "pc/srtptransport.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/criticalsection.h"
+#include "media/base/media_channel.h"
+#include "media/base/media_engine.h"
+#include "media/base/stream_params.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "pc/channel_interface.h"
+#include "pc/dtls_srtp_transport.h"
+#include "pc/media_session.h"
+#include "pc/rtp_transport.h"
+#include "pc/srtp_filter.h"
+#include "pc/srtp_transport.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/network.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
diff --git a/pc/channel_interface.h b/pc/channel_interface.h
index 8e4109a..b623254 100644
--- a/pc/channel_interface.h
+++ b/pc/channel_interface.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_CHANNELINTERFACE_H_
-#define PC_CHANNELINTERFACE_H_
+#ifndef PC_CHANNEL_INTERFACE_H_
+#define PC_CHANNEL_INTERFACE_H_
 
 #include <string>
 
 #include "api/jsep.h"
-#include "api/mediatypes.h"
-#include "media/base/mediachannel.h"
-#include "pc/rtptransportinternal.h"
+#include "api/media_types.h"
+#include "media/base/media_channel.h"
+#include "pc/rtp_transport_internal.h"
 
 namespace cricket {
 
@@ -65,4 +65,4 @@
 
 }  // namespace cricket
 
-#endif  // PC_CHANNELINTERFACE_H_
+#endif  // PC_CHANNEL_INTERFACE_H_
diff --git a/pc/channel_manager.cc b/pc/channel_manager.cc
index d5cbd9c..c936caf 100644
--- a/pc/channel_manager.cc
+++ b/pc/channel_manager.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/channelmanager.h"
+#include "pc/channel_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
diff --git a/pc/channel_manager.h b/pc/channel_manager.h
index 8bd30d1..38d79ee 100644
--- a/pc/channel_manager.h
+++ b/pc/channel_manager.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_CHANNELMANAGER_H_
-#define PC_CHANNELMANAGER_H_
+#ifndef PC_CHANNEL_MANAGER_H_
+#define PC_CHANNEL_MANAGER_H_
 
 #include <stdint.h>
 #include <memory>
@@ -17,16 +17,16 @@
 #include <vector>
 
 #include "api/audio_options.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
 #include "api/media_transport_interface.h"
 #include "call/call.h"
 #include "media/base/codec.h"
-#include "media/base/mediachannel.h"
-#include "media/base/mediaconfig.h"
-#include "media/base/mediaengine.h"
+#include "media/base/media_channel.h"
+#include "media/base/media_config.h"
+#include "media/base/media_engine.h"
 #include "pc/channel.h"
-#include "pc/rtptransportinternal.h"
-#include "pc/sessiondescription.h"
+#include "pc/rtp_transport_internal.h"
+#include "pc/session_description.h"
 #include "rtc_base/platform_file.h"
 #include "rtc_base/thread.h"
 
@@ -172,4 +172,4 @@
 
 }  // namespace cricket
 
-#endif  // PC_CHANNELMANAGER_H_
+#endif  // PC_CHANNEL_MANAGER_H_
diff --git a/pc/channel_manager_unittest.cc b/pc/channel_manager_unittest.cc
index ed09b72..999e36e 100644
--- a/pc/channel_manager_unittest.cc
+++ b/pc/channel_manager_unittest.cc
@@ -11,17 +11,17 @@
 #include <memory>
 
 #include "absl/memory/memory.h"
-#include "api/rtcerror.h"
+#include "api/rtc_error.h"
 #include "api/test/fake_media_transport.h"
-#include "media/base/fakemediaengine.h"
-#include "media/base/testutils.h"
-#include "media/engine/fakewebrtccall.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/packettransportinternal.h"
-#include "pc/channelmanager.h"
-#include "pc/dtlssrtptransport.h"
+#include "media/base/fake_media_engine.h"
+#include "media/base/test_utils.h"
+#include "media/engine/fake_webrtc_call.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "pc/channel_manager.h"
+#include "pc/dtls_srtp_transport.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
diff --git a/pc/channel_unittest.cc b/pc/channel_unittest.cc
index e675375..5e15dbd 100644
--- a/pc/channel_unittest.cc
+++ b/pc/channel_unittest.cc
@@ -15,26 +15,26 @@
 #include "absl/memory/memory.h"
 #include "api/array_view.h"
 #include "api/audio_options.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "media/base/codec.h"
-#include "media/base/fakemediaengine.h"
-#include "media/base/fakertp.h"
-#include "media/base/mediachannel.h"
-#include "p2p/base/candidatepairinterface.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/fakepackettransport.h"
-#include "p2p/base/icetransportinternal.h"
-#include "p2p/base/p2pconstants.h"
+#include "media/base/fake_media_engine.h"
+#include "media/base/fake_rtp.h"
+#include "media/base/media_channel.h"
+#include "p2p/base/candidate_pair_interface.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/fake_packet_transport.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "p2p/base/p2p_constants.h"
 #include "pc/channel.h"
-#include "pc/dtlssrtptransport.h"
-#include "pc/jseptransport.h"
-#include "pc/rtptransport.h"
+#include "pc/dtls_srtp_transport.h"
+#include "pc/jsep_transport.h"
+#include "pc/rtp_transport.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_identity.h"
 #include "test/gtest.h"
 
 using cricket::DtlsTransportInternal;
diff --git a/pc/data_channel.cc b/pc/data_channel.cc
index a632b8e..f854def 100644
--- a/pc/data_channel.cc
+++ b/pc/data_channel.cc
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/datachannel.h"
+#include "pc/data_channel.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "media/sctp/sctptransportinternal.h"
-#include "pc/sctputils.h"
+#include "media/sctp/sctp_transport_internal.h"
+#include "pc/sctp_utils.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/pc/data_channel.h b/pc/data_channel.h
index 55a52db..af8dd93 100644
--- a/pc/data_channel.h
+++ b/pc/data_channel.h
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_DATACHANNEL_H_
-#define PC_DATACHANNEL_H_
+#ifndef PC_DATA_CHANNEL_H_
+#define PC_DATA_CHANNEL_H_
 
 #include <deque>
 #include <memory>
 #include <set>
 #include <string>
 
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 #include "api/proxy.h"
-#include "media/base/mediachannel.h"
+#include "media/base/media_channel.h"
 #include "pc/channel.h"
-#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/async_invoker.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
@@ -313,4 +313,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_DATACHANNEL_H_
+#endif  // PC_DATA_CHANNEL_H_
diff --git a/pc/data_channel_unittest.cc b/pc/data_channel_unittest.cc
index 4addfbb..4aa9dee 100644
--- a/pc/data_channel_unittest.cc
+++ b/pc/data_channel_unittest.cc
@@ -12,9 +12,9 @@
 #include <memory>
 #include <vector>
 
-#include "pc/datachannel.h"
-#include "pc/sctputils.h"
-#include "pc/test/fakedatachannelprovider.h"
+#include "pc/data_channel.h"
+#include "pc/sctp_utils.h"
+#include "pc/test/fake_data_channel_provider.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "test/gtest.h"
diff --git a/pc/dtls_srtp_transport.cc b/pc/dtls_srtp_transport.cc
index 48d3e49..fcf0727 100644
--- a/pc/dtls_srtp_transport.cc
+++ b/pc/dtls_srtp_transport.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/dtlssrtptransport.h"
+#include "pc/dtls_srtp_transport.h"
 
 #include <string.h>
 #include <string>
@@ -16,7 +16,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
 
 namespace {
 // Value specified in RFC 5764.
diff --git a/pc/dtls_srtp_transport.h b/pc/dtls_srtp_transport.h
index 995e537..c63a3ca 100644
--- a/pc/dtls_srtp_transport.h
+++ b/pc/dtls_srtp_transport.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_DTLSSRTPTRANSPORT_H_
-#define PC_DTLSSRTPTRANSPORT_H_
+#ifndef PC_DTLS_SRTP_TRANSPORT_H_
+#define PC_DTLS_SRTP_TRANSPORT_H_
 
 #include <vector>
 
 #include "absl/types/optional.h"
-#include "api/cryptoparams.h"
-#include "api/rtcerror.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/packettransportinternal.h"
-#include "pc/srtptransport.h"
+#include "api/crypto_params.h"
+#include "api/rtc_error.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "pc/srtp_transport.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
@@ -100,4 +100,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_DTLSSRTPTRANSPORT_H_
+#endif  // PC_DTLS_SRTP_TRANSPORT_H_
diff --git a/pc/dtls_srtp_transport_unittest.cc b/pc/dtls_srtp_transport_unittest.cc
index 50d0eaf..abf1b2d 100644
--- a/pc/dtls_srtp_transport_unittest.cc
+++ b/pc/dtls_srtp_transport_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/dtlssrtptransport.h"
+#include "pc/dtls_srtp_transport.h"
 
 #include <string.h>
 #include <cstdint>
@@ -17,18 +17,18 @@
 
 #include "absl/memory/memory.h"
 #include "call/rtp_demuxer.h"
-#include "media/base/fakertp.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/fakeicetransport.h"
-#include "p2p/base/p2pconstants.h"
-#include "pc/rtptransport.h"
-#include "pc/rtptransporttestutil.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/byteorder.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "media/base/fake_rtp.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/fake_ice_transport.h"
+#include "p2p/base/p2p_constants.h"
+#include "pc/rtp_transport.h"
+#include "pc/test/rtp_transport_test_util.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_identity.h"
 #include "test/gtest.h"
 
 using cricket::FakeDtlsTransport;
diff --git a/pc/dtls_transport.cc b/pc/dtls_transport.cc
index eb1bc04..4709107 100644
--- a/pc/dtls_transport.cc
+++ b/pc/dtls_transport.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/dtlstransport.h"
+#include "pc/dtls_transport.h"
 
 #include <utility>
 
diff --git a/pc/dtls_transport.h b/pc/dtls_transport.h
index b3f1637..0fdcc0f 100644
--- a/pc/dtls_transport.h
+++ b/pc/dtls_transport.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_DTLSTRANSPORT_H_
-#define PC_DTLSTRANSPORT_H_
+#ifndef PC_DTLS_TRANSPORT_H_
+#define PC_DTLS_TRANSPORT_H_
 
 #include <memory>
 
-#include "api/dtlstransportinterface.h"
-#include "p2p/base/dtlstransport.h"
-#include "rtc_base/asyncinvoker.h"
+#include "api/dtls_transport_interface.h"
+#include "p2p/base/dtls_transport.h"
+#include "rtc_base/async_invoker.h"
 
 namespace webrtc {
 
@@ -54,4 +54,4 @@
 };
 
 }  // namespace webrtc
-#endif  // PC_DTLSTRANSPORT_H_
+#endif  // PC_DTLS_TRANSPORT_H_
diff --git a/pc/dtlstransport_unittest.cc b/pc/dtlstransport_unittest.cc
index 05e3797..508e557 100644
--- a/pc/dtlstransport_unittest.cc
+++ b/pc/dtlstransport_unittest.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/dtlstransport.h"
+#include "pc/dtls_transport.h"
 
 #include <utility>
 #include <vector>
 
 #include "absl/memory/memory.h"
-#include "p2p/base/fakedtlstransport.h"
+#include "p2p/base/fake_dtls_transport.h"
 #include "rtc_base/gunit.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/pc/dtmf_sender.cc b/pc/dtmf_sender.cc
index 6d39f5b..f4c3617 100644
--- a/pc/dtmf_sender.cc
+++ b/pc/dtmf_sender.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/dtmfsender.h"
+#include "pc/dtmf_sender.h"
 
 #include <ctype.h>
 #include <string.h>
@@ -16,7 +16,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/pc/dtmf_sender.h b/pc/dtmf_sender.h
index 59ab549..692c74b 100644
--- a/pc/dtmf_sender.h
+++ b/pc/dtmf_sender.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_DTMFSENDER_H_
-#define PC_DTMFSENDER_H_
+#ifndef PC_DTMF_SENDER_H_
+#define PC_DTMF_SENDER_H_
 
 #include <string>
 
-#include "api/dtmfsenderinterface.h"
+#include "api/dtmf_sender_interface.h"
 #include "api/proxy.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/thread.h"
 
 // DtmfSender is the native implementation of the RTCDTMFSender defined by
@@ -107,4 +107,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_DTMFSENDER_H_
+#endif  // PC_DTMF_SENDER_H_
diff --git a/pc/dtmf_sender_unittest.cc b/pc/dtmf_sender_unittest.cc
index 8f9109d..b98b035 100644
--- a/pc/dtmf_sender_unittest.cc
+++ b/pc/dtmf_sender_unittest.cc
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/dtmfsender.h"
+#include "pc/dtmf_sender.h"
 
 #include <stddef.h>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 using webrtc::DtmfProviderInterface;
diff --git a/pc/external_hmac.cc b/pc/external_hmac.cc
index 41f13e5..99021f8 100644
--- a/pc/external_hmac.cc
+++ b/pc/external_hmac.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/externalhmac.h"
+#include "pc/external_hmac.h"
 
 #include <stdlib.h>  // For malloc/free.
 #include <string.h>
diff --git a/pc/external_hmac.h b/pc/external_hmac.h
index eea7c12..3319bea 100644
--- a/pc/external_hmac.h
+++ b/pc/external_hmac.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_EXTERNALHMAC_H_
-#define PC_EXTERNALHMAC_H_
+#ifndef PC_EXTERNAL_HMAC_H_
+#define PC_EXTERNAL_HMAC_H_
 
 // External libsrtp HMAC auth module which implements methods defined in
 // auth_type_t.
@@ -69,4 +69,4 @@
 
 srtp_err_status_t external_crypto_init();
 
-#endif  // PC_EXTERNALHMAC_H_
+#endif  // PC_EXTERNAL_HMAC_H_
diff --git a/pc/ice_server_parsing.cc b/pc/ice_server_parsing.cc
index 1bb5d87..533d597 100644
--- a/pc/ice_server_parsing.cc
+++ b/pc/ice_server_parsing.cc
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/iceserverparsing.h"
+#include "pc/ice_server_parsing.h"
 
 #include <stddef.h>
 #include <cctype>  // For std::isdigit.
 #include <string>
 
-#include "p2p/base/portinterface.h"
+#include "p2p/base/port_interface.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/string_encode.h"
 
 namespace webrtc {
 
diff --git a/pc/ice_server_parsing.h b/pc/ice_server_parsing.h
index f1c26c1..c73d803 100644
--- a/pc/ice_server_parsing.h
+++ b/pc/ice_server_parsing.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_ICESERVERPARSING_H_
-#define PC_ICESERVERPARSING_H_
+#ifndef PC_ICE_SERVER_PARSING_H_
+#define PC_ICE_SERVER_PARSING_H_
 
 #include <vector>
 
-#include "api/peerconnectioninterface.h"
-#include "api/rtcerror.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
 #include "p2p/base/port.h"
-#include "p2p/base/portallocator.h"
+#include "p2p/base/port_allocator.h"
 
 namespace webrtc {
 
@@ -33,4 +33,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_ICESERVERPARSING_H_
+#endif  // PC_ICE_SERVER_PARSING_H_
diff --git a/pc/ice_server_parsing_unittest.cc b/pc/ice_server_parsing_unittest.cc
index 291afd1..0ec59ca 100644
--- a/pc/ice_server_parsing_unittest.cc
+++ b/pc/ice_server_parsing_unittest.cc
@@ -11,10 +11,10 @@
 #include <string>
 #include <vector>
 
-#include "p2p/base/portinterface.h"
-#include "pc/iceserverparsing.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/socketaddress.h"
+#include "p2p/base/port_interface.h"
+#include "pc/ice_server_parsing.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/socket_address.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/pc/jsep_ice_candidate.cc b/pc/jsep_ice_candidate.cc
index 4753ca2..c9dc9c1 100644
--- a/pc/jsep_ice_candidate.cc
+++ b/pc/jsep_ice_candidate.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/jsepicecandidate.h"
+#include "api/jsep_ice_candidate.h"
 
 #include <memory>
 
 #include "absl/memory/memory.h"
-#include "pc/webrtcsdp.h"
+#include "pc/webrtc_sdp.h"
 
 namespace webrtc {
 
diff --git a/pc/jsep_session_description.cc b/pc/jsep_session_description.cc
index d00ca52..9499e9a 100644
--- a/pc/jsep_session_description.cc
+++ b/pc/jsep_session_description.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/jsepsessiondescription.h"
+#include "api/jsep_session_description.h"
 
 #include <memory>
 
 #include "absl/memory/memory.h"
 #include "p2p/base/port.h"
-#include "pc/mediasession.h"
-#include "pc/webrtcsdp.h"
+#include "pc/media_session.h"
+#include "pc/webrtc_sdp.h"
 #include "rtc_base/arraysize.h"
 
 using cricket::SessionDescription;
diff --git a/pc/jsep_session_description_unittest.cc b/pc/jsep_session_description_unittest.cc
index 04577e2..2eb1db0 100644
--- a/pc/jsep_session_description_unittest.cc
+++ b/pc/jsep_session_description_unittest.cc
@@ -18,18 +18,18 @@
 #include "absl/memory/memory.h"
 #include "api/candidate.h"
 #include "api/jsep.h"
-#include "api/jsepicecandidate.h"
-#include "api/jsepsessiondescription.h"
+#include "api/jsep_ice_candidate.h"
+#include "api/jsep_session_description.h"
 #include "media/base/codec.h"
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
 #include "p2p/base/port.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/sessiondescription.h"
-#include "pc/webrtcsdp.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_info.h"
+#include "pc/session_description.h"
+#include "pc/webrtc_sdp.h"
 #include "rtc_base/helpers.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/string_encode.h"
 #include "test/gtest.h"
 
 using cricket::MediaProtocolType;
diff --git a/pc/jsep_transport.cc b/pc/jsep_transport.cc
index 3372f19..fd6bd0d 100644
--- a/pc/jsep_transport.cc
+++ b/pc/jsep_transport.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/jseptransport.h"
+#include "pc/jsep_transport.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -19,10 +19,10 @@
 #include "absl/memory/memory.h"
 #include "api/array_view.h"
 #include "api/candidate.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/p2ptransportchannel.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/p2p_transport_channel.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
 
diff --git a/pc/jsep_transport.h b/pc/jsep_transport.h
index dee5500..648fe29 100644
--- a/pc/jsep_transport.h
+++ b/pc/jsep_transport.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_JSEPTRANSPORT_H_
-#define PC_JSEPTRANSPORT_H_
+#ifndef PC_JSEP_TRANSPORT_H_
+#define PC_JSEP_TRANSPORT_H_
 
 #include <map>
 #include <memory>
@@ -20,21 +20,21 @@
 #include "api/candidate.h"
 #include "api/jsep.h"
 #include "api/media_transport_interface.h"
-#include "p2p/base/dtlstransport.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/dtlssrtptransport.h"
-#include "pc/dtlstransport.h"
-#include "pc/rtcpmuxfilter.h"
-#include "pc/rtptransport.h"
-#include "pc/sessiondescription.h"
-#include "pc/srtpfilter.h"
-#include "pc/srtptransport.h"
-#include "pc/transportstats.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "p2p/base/dtls_transport.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/transport_info.h"
+#include "pc/dtls_srtp_transport.h"
+#include "pc/dtls_transport.h"
+#include "pc/rtcp_mux_filter.h"
+#include "pc/rtp_transport.h"
+#include "pc/session_description.h"
+#include "pc/srtp_filter.h"
+#include "pc/srtp_transport.h"
+#include "pc/transport_stats.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace cricket {
@@ -307,4 +307,4 @@
 
 }  // namespace cricket
 
-#endif  // PC_JSEPTRANSPORT_H_
+#endif  // PC_JSEP_TRANSPORT_H_
diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc
index c1f18b9..5163e01 100644
--- a/pc/jsep_transport_controller.cc
+++ b/pc/jsep_transport_controller.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/jseptransportcontroller.h"
+#include "pc/jsep_transport_controller.h"
 
 #include <algorithm>
 #include <memory>
@@ -16,7 +16,7 @@
 
 #include "absl/memory/memory.h"
 #include "p2p/base/port.h"
-#include "pc/srtpfilter.h"
+#include "pc/srtp_filter.h"
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/key_derivation.h"
diff --git a/pc/jsep_transport_controller.h b/pc/jsep_transport_controller.h
index 653c4c9..1f4a632 100644
--- a/pc/jsep_transport_controller.h
+++ b/pc/jsep_transport_controller.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_JSEPTRANSPORTCONTROLLER_H_
-#define PC_JSEPTRANSPORTCONTROLLER_H_
+#ifndef PC_JSEP_TRANSPORT_CONTROLLER_H_
+#define PC_JSEP_TRANSPORT_CONTROLLER_H_
 
 #include <map>
 #include <memory>
@@ -18,23 +18,23 @@
 #include <vector>
 
 #include "api/candidate.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
 #include "api/media_transport_interface.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
-#include "media/sctp/sctptransportinternal.h"
-#include "p2p/base/dtlstransport.h"
-#include "p2p/base/p2ptransportchannel.h"
-#include "p2p/base/transportfactoryinterface.h"
+#include "media/sctp/sctp_transport_internal.h"
+#include "p2p/base/dtls_transport.h"
+#include "p2p/base/p2p_transport_channel.h"
+#include "p2p/base/transport_factory_interface.h"
 #include "pc/channel.h"
-#include "pc/dtlssrtptransport.h"
-#include "pc/dtlstransport.h"
-#include "pc/jseptransport.h"
-#include "pc/rtptransport.h"
-#include "pc/srtptransport.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcountedobject.h"
+#include "pc/dtls_srtp_transport.h"
+#include "pc/dtls_transport.h"
+#include "pc/jsep_transport.h"
+#include "pc/rtp_transport.h"
+#include "pc/srtp_transport.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace rtc {
@@ -373,4 +373,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_JSEPTRANSPORTCONTROLLER_H_
+#endif  // PC_JSEP_TRANSPORT_CONTROLLER_H_
diff --git a/pc/jsep_transport_controller_unittest.cc b/pc/jsep_transport_controller_unittest.cc
index c019013..d34c4a9 100644
--- a/pc/jsep_transport_controller_unittest.cc
+++ b/pc/jsep_transport_controller_unittest.cc
@@ -14,11 +14,11 @@
 #include "absl/memory/memory.h"
 #include "api/media_transport_interface.h"
 #include "api/test/fake_media_transport.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/fakeicetransport.h"
-#include "p2p/base/transportfactoryinterface.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/jseptransportcontroller.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/fake_ice_transport.h"
+#include "p2p/base/transport_factory_interface.h"
+#include "p2p/base/transport_info.h"
+#include "pc/jsep_transport_controller.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
diff --git a/pc/jsep_transport_unittest.cc b/pc/jsep_transport_unittest.cc
index 4d68d37..efb2394 100644
--- a/pc/jsep_transport_unittest.cc
+++ b/pc/jsep_transport_unittest.cc
@@ -13,10 +13,10 @@
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "media/base/fakertp.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/fakeicetransport.h"
-#include "pc/jseptransport.h"
+#include "media/base/fake_rtp.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/fake_ice_transport.h"
+#include "pc/jsep_transport.h"
 #include "rtc_base/gunit.h"
 
 namespace cricket {
diff --git a/pc/local_audio_source.cc b/pc/local_audio_source.cc
index 2e89a7a..22ab1c3 100644
--- a/pc/local_audio_source.cc
+++ b/pc/local_audio_source.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/localaudiosource.h"
+#include "pc/local_audio_source.h"
 
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 
 using webrtc::MediaSourceInterface;
 
diff --git a/pc/local_audio_source.h b/pc/local_audio_source.h
index dfd72e0..0223fd4 100644
--- a/pc/local_audio_source.h
+++ b/pc/local_audio_source.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_LOCALAUDIOSOURCE_H_
-#define PC_LOCALAUDIOSOURCE_H_
+#ifndef PC_LOCAL_AUDIO_SOURCE_H_
+#define PC_LOCAL_AUDIO_SOURCE_H_
 
 #include "api/audio_options.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/notifier.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
@@ -47,4 +47,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_LOCALAUDIOSOURCE_H_
+#endif  // PC_LOCAL_AUDIO_SOURCE_H_
diff --git a/pc/local_audio_source_unittest.cc b/pc/local_audio_source_unittest.cc
index d28014a..76d3b36 100644
--- a/pc/local_audio_source_unittest.cc
+++ b/pc/local_audio_source_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/localaudiosource.h"
+#include "pc/local_audio_source.h"
 
 #include "absl/types/optional.h"
 #include "test/gtest.h"
diff --git a/pc/media_constraints_interface_unittest.cc b/pc/media_constraints_interface_unittest.cc
index 4f46e70..b62e092 100644
--- a/pc/media_constraints_interface_unittest.cc
+++ b/pc/media_constraints_interface_unittest.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
 
 #include "absl/types/optional.h"
-#include "api/test/fakeconstraints.h"
-#include "media/base/mediaconfig.h"
+#include "api/test/fake_constraints.h"
+#include "media/base/media_config.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/pc/media_session.cc b/pc/media_session.cc
index e650dd2..99e7e40 100644
--- a/pc/media_session.cc
+++ b/pc/media_session.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/mediasession.h"
+#include "pc/media_session.h"
 
 #include <algorithm>  // For std::find_if, std::sort.
 #include <functional>
@@ -21,13 +21,13 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
 #include "absl/types/optional.h"
-#include "api/cryptoparams.h"
+#include "api/crypto_params.h"
 #include "media/base/h264_profile_level_id.h"
-#include "media/base/mediaconstants.h"
-#include "p2p/base/p2pconstants.h"
-#include "pc/channelmanager.h"
-#include "pc/rtpmediautils.h"
-#include "pc/srtpfilter.h"
+#include "media/base/media_constants.h"
+#include "p2p/base/p2p_constants.h"
+#include "pc/channel_manager.h"
+#include "pc/rtp_media_utils.h"
+#include "pc/srtp_filter.h"
 #include "pc/unique_id_generator.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/helpers.h"
diff --git a/pc/media_session.h b/pc/media_session.h
index f732cb2..2251b5b 100644
--- a/pc/media_session.h
+++ b/pc/media_session.h
@@ -10,8 +10,8 @@
 
 // Types and classes used in media session descriptions.
 
-#ifndef PC_MEDIASESSION_H_
-#define PC_MEDIASESSION_H_
+#ifndef PC_MEDIA_SESSION_H_
+#define PC_MEDIA_SESSION_H_
 
 #include <algorithm>
 #include <map>
@@ -19,13 +19,13 @@
 #include <string>
 #include <vector>
 
-#include "api/mediatypes.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/mediaengine.h"  // For DataChannelType
-#include "p2p/base/icecredentialsiterator.h"
-#include "p2p/base/transportdescriptionfactory.h"
-#include "pc/jseptransport.h"
-#include "pc/sessiondescription.h"
+#include "api/media_types.h"
+#include "media/base/media_constants.h"
+#include "media/base/media_engine.h"  // For DataChannelType
+#include "p2p/base/ice_credentials_iterator.h"
+#include "p2p/base/transport_description_factory.h"
+#include "pc/jsep_transport.h"
+#include "pc/session_description.h"
 
 namespace cricket {
 
@@ -371,4 +371,4 @@
 
 }  // namespace cricket
 
-#endif  // PC_MEDIASESSION_H_
+#endif  // PC_MEDIA_SESSION_H_
diff --git a/pc/media_session_unittest.cc b/pc/media_session_unittest.cc
index c73c19e..b6be353 100644
--- a/pc/media_session_unittest.cc
+++ b/pc/media_session_unittest.cc
@@ -15,18 +15,18 @@
 
 #include "absl/memory/memory.h"
 #include "media/base/codec.h"
-#include "media/base/testutils.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/mediasession.h"
-#include "pc/rtpmediautils.h"
-#include "pc/srtpfilter.h"
+#include "media/base/test_utils.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_info.h"
+#include "pc/media_session.h"
+#include "pc/rtp_media_utils.h"
+#include "pc/srtp_filter.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/fakesslidentity.h"
+#include "rtc_base/fake_ssl_identity.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/ssl_adapter.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/gmock.h"
 
diff --git a/pc/media_stream.cc b/pc/media_stream.cc
index 2e857fa..e083b96 100644
--- a/pc/media_stream.cc
+++ b/pc/media_stream.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/mediastream.h"
+#include "pc/media_stream.h"
 
 #include <stddef.h>
 #include <vector>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 
 namespace webrtc {
 
diff --git a/pc/media_stream.h b/pc/media_stream.h
index e170c6e..e513226 100644
--- a/pc/media_stream.h
+++ b/pc/media_stream.h
@@ -10,12 +10,12 @@
 
 // This file contains the implementation of MediaStreamInterface interface.
 
-#ifndef PC_MEDIASTREAM_H_
-#define PC_MEDIASTREAM_H_
+#ifndef PC_MEDIA_STREAM_H_
+#define PC_MEDIA_STREAM_H_
 
 #include <string>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/notifier.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
@@ -55,4 +55,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_MEDIASTREAM_H_
+#endif  // PC_MEDIA_STREAM_H_
diff --git a/pc/media_stream_observer.cc b/pc/media_stream_observer.cc
index 1a611a3..e3ef3c7 100644
--- a/pc/media_stream_observer.cc
+++ b/pc/media_stream_observer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/mediastreamobserver.h"
+#include "pc/media_stream_observer.h"
 
 #include <algorithm>
 #include <string>
diff --git a/pc/media_stream_observer.h b/pc/media_stream_observer.h
index 217c9b6..faa6772 100644
--- a/pc/media_stream_observer.h
+++ b/pc/media_stream_observer.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_MEDIASTREAMOBSERVER_H_
-#define PC_MEDIASTREAMOBSERVER_H_
+#ifndef PC_MEDIA_STREAM_OBSERVER_H_
+#define PC_MEDIA_STREAM_OBSERVER_H_
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
@@ -45,4 +45,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_MEDIASTREAMOBSERVER_H_
+#endif  // PC_MEDIA_STREAM_OBSERVER_H_
diff --git a/pc/media_stream_track.h b/pc/media_stream_track.h
index 33ffbe2..358d89a 100644
--- a/pc/media_stream_track.h
+++ b/pc/media_stream_track.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_MEDIASTREAMTRACK_H_
-#define PC_MEDIASTREAMTRACK_H_
+#ifndef PC_MEDIA_STREAM_TRACK_H_
+#define PC_MEDIA_STREAM_TRACK_H_
 
 #include <string>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/notifier.h"
 
 namespace webrtc {
@@ -59,4 +59,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_MEDIASTREAMTRACK_H_
+#endif  // PC_MEDIA_STREAM_TRACK_H_
diff --git a/pc/media_stream_unittest.cc b/pc/media_stream_unittest.cc
index 69f6e8c..4b25e78 100644
--- a/pc/media_stream_unittest.cc
+++ b/pc/media_stream_unittest.cc
@@ -11,10 +11,10 @@
 #include <stddef.h>
 #include <string>
 
-#include "pc/audiotrack.h"
-#include "pc/mediastream.h"
-#include "pc/test/fakevideotracksource.h"
-#include "pc/videotrack.h"
+#include "pc/audio_track.h"
+#include "pc/media_stream.h"
+#include "pc/test/fake_video_track_source.h"
+#include "pc/video_track.h"
 #include "rtc_base/thread.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc
index 2cf14a1..2d68c81 100644
--- a/pc/peer_connection.cc
+++ b/pc/peer_connection.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/peerconnection.h"
+#include "pc/peer_connection.h"
 
 #include <algorithm>
 #include <limits>
@@ -19,37 +19,37 @@
 
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
-#include "api/jsepicecandidate.h"
-#include "api/jsepsessiondescription.h"
-#include "api/mediastreamproxy.h"
-#include "api/mediastreamtrackproxy.h"
-#include "api/umametrics.h"
+#include "api/jsep_ice_candidate.h"
+#include "api/jsep_session_description.h"
+#include "api/media_stream_proxy.h"
+#include "api/media_stream_track_proxy.h"
+#include "api/uma_metrics.h"
 #include "call/call.h"
-#include "logging/rtc_event_log/icelogger.h"
+#include "logging/rtc_event_log/ice_logger.h"
 #include "logging/rtc_event_log/output/rtc_event_log_output_file.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
-#include "media/sctp/sctptransport.h"
-#include "pc/audiotrack.h"
+#include "media/sctp/sctp_transport.h"
+#include "pc/audio_track.h"
 #include "pc/channel.h"
-#include "pc/channelmanager.h"
-#include "pc/dtmfsender.h"
-#include "pc/mediastream.h"
-#include "pc/mediastreamobserver.h"
-#include "pc/remoteaudiosource.h"
-#include "pc/rtpmediautils.h"
-#include "pc/rtpreceiver.h"
-#include "pc/rtpsender.h"
-#include "pc/sctputils.h"
-#include "pc/sdputils.h"
-#include "pc/streamcollection.h"
+#include "pc/channel_manager.h"
+#include "pc/dtmf_sender.h"
+#include "pc/media_stream.h"
+#include "pc/media_stream_observer.h"
+#include "pc/remote_audio_source.h"
+#include "pc/rtp_media_utils.h"
+#include "pc/rtp_receiver.h"
+#include "pc/rtp_sender.h"
+#include "pc/sctp_utils.h"
+#include "pc/sdp_utils.h"
+#include "pc/stream_collection.h"
 #include "pc/unique_id_generator.h"
-#include "pc/videocapturertracksource.h"
-#include "pc/videotrack.h"
+#include "pc/video_capturer_track_source.h"
+#include "pc/video_track.h"
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/clock.h"
diff --git a/pc/peer_connection.h b/pc/peer_connection.h
index c663520..b11c867 100644
--- a/pc/peer_connection.h
+++ b/pc/peer_connection.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_PEERCONNECTION_H_
-#define PC_PEERCONNECTION_H_
+#ifndef PC_PEER_CONNECTION_H_
+#define PC_PEER_CONNECTION_H_
 
 #include <map>
 #include <memory>
@@ -18,18 +18,18 @@
 #include <vector>
 
 #include "api/media_transport_interface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/turncustomizer.h"
-#include "pc/iceserverparsing.h"
-#include "pc/jseptransportcontroller.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/peerconnectioninternal.h"
-#include "pc/rtcstatscollector.h"
-#include "pc/rtptransceiver.h"
-#include "pc/statscollector.h"
-#include "pc/streamcollection.h"
+#include "api/peer_connection_interface.h"
+#include "api/turn_customizer.h"
+#include "pc/ice_server_parsing.h"
+#include "pc/jsep_transport_controller.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/peer_connection_internal.h"
+#include "pc/rtc_stats_collector.h"
+#include "pc/rtp_transceiver.h"
+#include "pc/stats_collector.h"
+#include "pc/stream_collection.h"
 #include "pc/unique_id_generator.h"
-#include "pc/webrtcsessiondescriptionfactory.h"
+#include "pc/webrtc_session_description_factory.h"
 
 namespace webrtc {
 
@@ -1151,4 +1151,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_PEERCONNECTION_H_
+#endif  // PC_PEER_CONNECTION_H_
diff --git a/pc/peer_connection_bundle_unittest.cc b/pc/peer_connection_bundle_unittest.cc
index fca9914..8f44c39 100644
--- a/pc/peer_connection_bundle_unittest.cc
+++ b/pc/peer_connection_bundle_unittest.cc
@@ -11,24 +11,24 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/create_peerconnection_factory.h"
-#include "api/peerconnectionproxy.h"
+#include "api/peer_connection_proxy.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
 #ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 #endif
 #include "absl/memory/memory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "rtc_base/fakenetwork.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "rtc_base/fake_network.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/pc/peer_connection_crypto_unittest.cc b/pc/peer_connection_crypto_unittest.cc
index 6f7e23b..b25aeda 100644
--- a/pc/peer_connection_crypto_unittest.cc
+++ b/pc/peer_connection_crypto_unittest.cc
@@ -13,18 +13,18 @@
 #include "api/create_peerconnection_factory.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
-#include "p2p/base/fakeportallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
 #ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 #endif
 #include "absl/memory/memory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakertccertificategenerator.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 
 namespace webrtc {
 
diff --git a/pc/peer_connection_data_channel_unittest.cc b/pc/peer_connection_data_channel_unittest.cc
index 8cb295b..c120143 100644
--- a/pc/peer_connection_data_channel_unittest.cc
+++ b/pc/peer_connection_data_channel_unittest.cc
@@ -15,39 +15,39 @@
 #include <vector>
 
 #include "absl/types/optional.h"
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
 #include "api/jsep.h"
 #include "api/media_transport_interface.h"
-#include "api/mediatypes.h"
-#include "api/peerconnectioninterface.h"
-#include "api/peerconnectionproxy.h"
+#include "api/media_types.h"
+#include "api/peer_connection_interface.h"
+#include "api/peer_connection_proxy.h"
 #include "api/test/fake_media_transport.h"
 #include "media/base/codec.h"
-#include "media/base/fakemediaengine.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/mediaengine.h"
-#include "media/sctp/sctptransportinternal.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/portallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
-#include "pc/sessiondescription.h"
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "media/base/fake_media_engine.h"
+#include "media/base/media_constants.h"
+#include "media/base/media_engine.h"
+#include "media/sctp/sctp_transport_internal.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
+#include "pc/session_description.h"
+#include "pc/test/mock_peer_connection_observers.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
 #ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 #endif
 #include "absl/memory/memory.h"
-#include "pc/test/fakesctptransport.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "pc/test/fake_sctp_transport.h"
+#include "rtc_base/virtual_socket_server.h"
 
 namespace webrtc {
 
diff --git a/pc/peer_connection_end_to_end_unittest.cc b/pc/peer_connection_end_to_end_unittest.cc
index 18f3563..dd56b26 100644
--- a/pc/peer_connection_end_to_end_unittest.cc
+++ b/pc/peer_connection_end_to_end_unittest.cc
@@ -23,11 +23,11 @@
 #include "rtc_base/logging.h"
 
 #ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 #endif
-#include "pc/test/peerconnectiontestwrapper.h"
+#include "pc/test/peer_connection_test_wrapper.h"
 // Notice that mockpeerconnectionobservers.h must be included after the above!
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "pc/test/mock_peer_connection_observers.h"
 #include "test/mock_audio_decoder.h"
 #include "test/mock_audio_decoder_factory.h"
 #include "test/mock_audio_encoder_factory.h"
diff --git a/pc/peer_connection_factory.cc b/pc/peer_connection_factory.cc
index e1b3e6c..4c52b21 100644
--- a/pc/peer_connection_factory.cc
+++ b/pc/peer_connection_factory.cc
@@ -8,43 +8,43 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/peerconnectionfactory.h"
+#include "pc/peer_connection_factory.h"
 
 #include <utility>
 #include <vector>
 
 #include "absl/memory/memory.h"
 #include "api/fec_controller.h"
+#include "api/media_constraints_interface.h"
+#include "api/media_stream_proxy.h"
+#include "api/media_stream_track_proxy.h"
 #include "api/media_transport_interface.h"
-#include "api/mediaconstraintsinterface.h"
-#include "api/mediastreamproxy.h"
-#include "api/mediastreamtrackproxy.h"
-#include "api/peerconnectionfactoryproxy.h"
-#include "api/peerconnectionproxy.h"
-#include "api/turncustomizer.h"
-#include "api/videosourceproxy.h"
+#include "api/peer_connection_factory_proxy.h"
+#include "api/peer_connection_proxy.h"
+#include "api/turn_customizer.h"
+#include "api/video_track_source_proxy.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
-#include "media/base/rtpdataengine.h"
-#include "media/sctp/sctptransport.h"
-#include "pc/rtpparametersconversion.h"
+#include "media/base/rtp_data_engine.h"
+#include "media/sctp/sctp_transport.h"
+#include "pc/rtp_parameters_conversion.h"
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
 // Adding 'nogncheck' to disable the gn include headers check to support modular
 // WebRTC build targets.
 // TODO(zhihuang): This wouldn't be necessary if the interface and
 // implementation of the media engine were in separate build targets.
-#include "media/engine/webrtcmediaengine.h"             // nogncheck
-#include "media/engine/webrtcvideodecoderfactory.h"     // nogncheck
-#include "media/engine/webrtcvideoencoderfactory.h"     // nogncheck
+#include "media/engine/webrtc_media_engine.h"           // nogncheck
+#include "media/engine/webrtc_video_decoder_factory.h"  // nogncheck
+#include "media/engine/webrtc_video_encoder_factory.h"  // nogncheck
 #include "modules/audio_device/include/audio_device.h"  // nogncheck
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/audiotrack.h"
-#include "pc/localaudiosource.h"
-#include "pc/mediastream.h"
-#include "pc/peerconnection.h"
-#include "pc/videocapturertracksource.h"
-#include "pc/videotrack.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/audio_track.h"
+#include "pc/local_audio_source.h"
+#include "pc/media_stream.h"
+#include "pc/peer_connection.h"
+#include "pc/video_capturer_track_source.h"
+#include "pc/video_track.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
diff --git a/pc/peer_connection_factory.h b/pc/peer_connection_factory.h
index e64eb10..6b1958c 100644
--- a/pc/peer_connection_factory.h
+++ b/pc/peer_connection_factory.h
@@ -9,18 +9,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_PEERCONNECTIONFACTORY_H_
-#define PC_PEERCONNECTIONFACTORY_H_
+#ifndef PC_PEER_CONNECTION_FACTORY_H_
+#define PC_PEER_CONNECTION_FACTORY_H_
 
 #include <memory>
 #include <string>
 
+#include "api/media_stream_interface.h"
 #include "api/media_transport_interface.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "media/sctp/sctptransportinternal.h"
-#include "pc/channelmanager.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "api/peer_connection_interface.h"
+#include "media/sctp/sctp_transport_internal.h"
+#include "pc/channel_manager.h"
+#include "rtc_base/rtc_certificate_generator.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
 
@@ -156,4 +156,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_PEERCONNECTIONFACTORY_H_
+#endif  // PC_PEER_CONNECTION_FACTORY_H_
diff --git a/pc/peer_connection_factory_unittest.cc b/pc/peer_connection_factory_unittest.cc
index 01a6fb2..3f3cc15 100644
--- a/pc/peer_connection_factory_unittest.cc
+++ b/pc/peer_connection_factory_unittest.cc
@@ -20,29 +20,29 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/create_peerconnection_factory.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 #include "api/jsep.h"
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "media/base/fakevideocapturer.h"
+#include "media/base/fake_video_capturer.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/fakeportallocator.h"
+#include "p2p/base/fake_port_allocator.h"
 #include "p2p/base/port.h"
-#include "p2p/base/portinterface.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "rtc_base/socketaddress.h"
+#include "p2p/base/port_interface.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "rtc_base/socket_address.h"
 #include "test/gtest.h"
 
 #ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 #endif
-#include "pc/test/fakertccertificategenerator.h"
-#include "pc/test/fakevideotrackrenderer.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
+#include "pc/test/fake_video_track_renderer.h"
 
 using webrtc::DataChannelInterface;
 using webrtc::FakeVideoTrackRenderer;
diff --git a/pc/peer_connection_histogram_unittest.cc b/pc/peer_connection_histogram_unittest.cc
index 987fa3a..2bbebdb 100644
--- a/pc/peer_connection_histogram_unittest.cc
+++ b/pc/peer_connection_histogram_unittest.cc
@@ -16,28 +16,28 @@
 
 #include "absl/memory/memory.h"
 #include "absl/types/optional.h"
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
 #include "api/jsep.h"
-#include "api/peerconnectioninterface.h"
-#include "api/peerconnectionproxy.h"
-#include "api/rtcerror.h"
-#include "media/base/fakemediaengine.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "api/peer_connection_interface.h"
+#include "api/peer_connection_proxy.h"
+#include "api/rtc_error.h"
+#include "media/base/fake_media_engine.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
+#include "pc/test/mock_peer_connection_observers.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/fakenetwork.h"
+#include "rtc_base/fake_network.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "system_wrappers/include/metrics.h"
 #include "test/gtest.h"
 
diff --git a/pc/peer_connection_ice_unittest.cc b/pc/peer_connection_ice_unittest.cc
index 619705b..4ef5458 100644
--- a/pc/peer_connection_ice_unittest.cc
+++ b/pc/peer_connection_ice_unittest.cc
@@ -8,29 +8,29 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
 #ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 #endif
 #include "absl/memory/memory.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/create_peerconnection_factory.h"
-#include "api/peerconnectionproxy.h"
-#include "api/umametrics.h"
+#include "api/peer_connection_proxy.h"
+#include "api/uma_metrics.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "rtc_base/fakenetwork.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "rtc_base/fake_network.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "system_wrappers/include/metrics.h"
 
 namespace webrtc {
diff --git a/pc/peer_connection_integrationtest.cc b/pc/peer_connection_integrationtest.cc
index 0bd3d09..84c5c88 100644
--- a/pc/peer_connection_integrationtest.cc
+++ b/pc/peer_connection_integrationtest.cc
@@ -25,12 +25,12 @@
 #include "absl/memory/memory.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/peerconnectionproxy.h"
-#include "api/rtpreceiverinterface.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/peer_connection_proxy.h"
+#include "api/rtp_receiver_interface.h"
 #include "api/test/loopback_media_transport.h"
-#include "api/umametrics.h"
+#include "api/uma_metrics.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
 #include "api/video_codecs/sdp_video_format.h"
@@ -38,35 +38,35 @@
 #include "logging/rtc_event_log/fake_rtc_event_log_factory.h"
 #include "logging/rtc_event_log/rtc_event_log_factory.h"
 #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
-#include "media/engine/fakewebrtcvideoengine.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/fake_webrtc_video_engine.h"
+#include "media/engine/webrtc_media_engine.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/mockasyncresolver.h"
-#include "p2p/base/p2pconstants.h"
-#include "p2p/base/portinterface.h"
-#include "p2p/base/teststunserver.h"
-#include "p2p/base/testturncustomizer.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/dtmfsender.h"
-#include "pc/localaudiosource.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/rtpmediautils.h"
-#include "pc/sessiondescription.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakeperiodicvideotracksource.h"
-#include "pc/test/fakertccertificategenerator.h"
-#include "pc/test/fakevideotrackrenderer.h"
-#include "pc/test/mockpeerconnectionobservers.h"
-#include "rtc_base/fakenetwork.h"
-#include "rtc_base/firewallsocketserver.h"
+#include "p2p/base/mock_async_resolver.h"
+#include "p2p/base/p2p_constants.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/test_stun_server.h"
+#include "p2p/base/test_turn_customizer.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/dtmf_sender.h"
+#include "pc/local_audio_source.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/rtp_media_utils.h"
+#include "pc/session_description.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_periodic_video_track_source.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
+#include "pc/test/fake_video_track_renderer.h"
+#include "pc/test/mock_peer_connection_observers.h"
+#include "rtc_base/fake_network.h"
+#include "rtc_base/firewall_socket_server.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/testcertificateverifier.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/test_certificate_verifier.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "system_wrappers/include/metrics.h"
 #include "test/gmock.h"
 
diff --git a/pc/peer_connection_interface_unittest.cc b/pc/peer_connection_interface_unittest.cc
index 5b9f775..9cd1e14 100644
--- a/pc/peer_connection_interface_unittest.cc
+++ b/pc/peer_connection_interface_unittest.cc
@@ -23,19 +23,19 @@
 #include "api/audio_codecs/audio_encoder_factory.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
 #include "api/create_peerconnection_factory.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 #include "api/jsep.h"
-#include "api/jsepsessiondescription.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtcerror.h"
-#include "api/rtceventlogoutput.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "api/rtptransceiverinterface.h"
+#include "api/jsep_session_description.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtc_event_log_output.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_interface.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
 #include "api/video_codecs/video_decoder_factory.h"
@@ -45,54 +45,54 @@
 #include "logging/rtc_event_log/rtc_event_log_factory.h"
 #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
 #include "media/base/codec.h"
-#include "media/base/fakevideocapturer.h"
-#include "media/base/mediaconfig.h"
-#include "media/base/mediaengine.h"
-#include "media/base/streamparams.h"
-#include "media/base/videocapturer.h"
-#include "media/engine/webrtcmediaengine.h"
-#include "media/sctp/sctptransportinternal.h"
+#include "media/base/fake_video_capturer.h"
+#include "media/base/media_config.h"
+#include "media/base/media_engine.h"
+#include "media/base/stream_params.h"
+#include "media/base/video_capturer.h"
+#include "media/engine/webrtc_media_engine.h"
+#include "media/sctp/sctp_transport_internal.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/p2p_constants.h"
 #include "p2p/base/port.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/audiotrack.h"
-#include "pc/mediasession.h"
-#include "pc/mediastream.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/rtcstatscollector.h"
-#include "pc/rtpsender.h"
-#include "pc/sessiondescription.h"
-#include "pc/streamcollection.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakertccertificategenerator.h"
-#include "pc/test/fakevideotracksource.h"
-#include "pc/test/mockpeerconnectionobservers.h"
-#include "pc/test/testsdpstrings.h"
-#include "pc/videotrack.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_info.h"
+#include "pc/audio_track.h"
+#include "pc/media_session.h"
+#include "pc/media_stream.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/rtc_stats_collector.h"
+#include "pc/rtp_sender.h"
+#include "pc/session_description.h"
+#include "pc/stream_collection.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
+#include "pc/test/fake_video_track_source.h"
+#include "pc/test/mock_peer_connection_observers.h"
+#include "pc/test/test_sdp_strings.h"
+#include "pc/video_track.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/platform_file.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/string_utils.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 #ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 #endif
 
 namespace webrtc {
diff --git a/pc/peer_connection_internal.h b/pc/peer_connection_internal.h
index cb3627b..2cfee76 100644
--- a/pc/peer_connection_internal.h
+++ b/pc/peer_connection_internal.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_PEERCONNECTIONINTERNAL_H_
-#define PC_PEERCONNECTIONINTERNAL_H_
+#ifndef PC_PEER_CONNECTION_INTERNAL_H_
+#define PC_PEER_CONNECTION_INTERNAL_H_
 
 #include <map>
 #include <memory>
@@ -17,10 +17,10 @@
 #include <string>
 #include <vector>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "call/call.h"
-#include "pc/datachannel.h"
-#include "pc/rtptransceiver.h"
+#include "pc/data_channel.h"
+#include "pc/rtp_transceiver.h"
 
 namespace webrtc {
 
@@ -90,4 +90,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_PEERCONNECTIONINTERNAL_H_
+#endif  // PC_PEER_CONNECTION_INTERNAL_H_
diff --git a/pc/peer_connection_jsep_unittest.cc b/pc/peer_connection_jsep_unittest.cc
index 7a04474..3acf11e 100644
--- a/pc/peer_connection_jsep_unittest.cc
+++ b/pc/peer_connection_jsep_unittest.cc
@@ -12,20 +12,20 @@
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtc_media_engine.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnectionfactory.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection_factory.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
 #ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 #endif
 #include "absl/memory/memory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakesctptransport.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_sctp_transport.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gmock.h"
 
 // This file contains tests that ensure the PeerConnection's implementation of
diff --git a/pc/peer_connection_media_unittest.cc b/pc/peer_connection_media_unittest.cc
index 25aea98..3115eb6 100644
--- a/pc/peer_connection_media_unittest.cc
+++ b/pc/peer_connection_media_unittest.cc
@@ -14,22 +14,22 @@
 
 #include <tuple>
 
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
 #include "api/test/fake_media_transport.h"
 #include "logging/rtc_event_log/rtc_event_log_factory.h"
-#include "media/base/fakemediaengine.h"
-#include "p2p/base/fakeportallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/rtpmediautils.h"
-#include "pc/sdputils.h"
+#include "media/base/fake_media_engine.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/rtp_media_utils.h"
+#include "pc/sdp_utils.h"
 #ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 #endif
 #include "absl/memory/memory.h"
-#include "pc/test/fakertccertificategenerator.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/pc/peer_connection_rampup_tests.cc b/pc/peer_connection_rampup_tests.cc
index abec373..321affd 100644
--- a/pc/peer_connection_rampup_tests.cc
+++ b/pc/peer_connection_rampup_tests.cc
@@ -23,39 +23,39 @@
 #include "api/audio_options.h"
 #include "api/create_peerconnection_factory.h"
 #include "api/jsep.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/stats/rtcstats.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/stats/rtc_stats.h"
+#include "api/stats/rtc_stats_report.h"
 #include "api/stats/rtcstats_objects.h"
-#include "api/stats/rtcstatsreport.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/portallocator.h"
-#include "p2p/base/portinterface.h"
-#include "p2p/base/testturnserver.h"
-#include "p2p/client/basicportallocator.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/framegeneratorcapturervideotracksource.h"
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "p2p/base/port_allocator.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/test_turn_server.h"
+#include "p2p/client/basic_port_allocator.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/frame_generator_capturer_video_track_source.h"
+#include "pc/test/mock_peer_connection_observers.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/fakenetwork.h"
-#include "rtc_base/firewallsocketserver.h"
+#include "rtc_base/fake_network.h"
+#include "rtc_base/firewall_socket_server.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/location.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/testcertificateverifier.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/test_certificate_verifier.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
 #include "test/testsupport/perf_test.h"
diff --git a/pc/peer_connection_rtp_unittest.cc b/pc/peer_connection_rtp_unittest.cc
index 7d49fec..0b95d2d 100644
--- a/pc/peer_connection_rtp_unittest.cc
+++ b/pc/peer_connection_rtp_unittest.cc
@@ -23,34 +23,34 @@
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/create_peerconnection_factory.h"
 #include "api/jsep.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtcerror.h"
-#include "api/rtpparameters.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "api/rtptransceiverinterface.h"
-#include "api/setremotedescriptionobserverinterface.h"
-#include "api/umametrics.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_interface.h"
+#include "api/set_remote_description_observer_interface.h"
+#include "api/uma_metrics.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "media/base/streamparams.h"
+#include "media/base/stream_params.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/portallocator.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
-#include "pc/sessiondescription.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "p2p/base/port_allocator.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
+#include "pc/session_description.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/mock_peer_connection_observers.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
 #include "system_wrappers/include/metrics.h"
diff --git a/pc/peer_connection_signaling_unittest.cc b/pc/peer_connection_signaling_unittest.cc
index d90411c..ed76753 100644
--- a/pc/peer_connection_signaling_unittest.cc
+++ b/pc/peer_connection_signaling_unittest.cc
@@ -16,20 +16,20 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/create_peerconnection_factory.h"
-#include "api/peerconnectionproxy.h"
+#include "api/peer_connection_proxy.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
-#include "pc/peerconnection.h"
-#include "pc/peerconnectionwrapper.h"
-#include "pc/sdputils.h"
+#include "pc/peer_connection.h"
+#include "pc/peer_connection_wrapper.h"
+#include "pc/sdp_utils.h"
 #ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 #endif
 #include "absl/memory/memory.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakertccertificategenerator.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/pc/peer_connection_wrapper.cc b/pc/peer_connection_wrapper.cc
index 05e7cf7..6bfb59f 100644
--- a/pc/peer_connection_wrapper.cc
+++ b/pc/peer_connection_wrapper.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/peerconnectionwrapper.h"
+#include "pc/peer_connection_wrapper.h"
 
 #include <stdint.h>
 #include <memory>
@@ -16,14 +16,14 @@
 #include <utility>
 #include <vector>
 
-#include "api/setremotedescriptionobserverinterface.h"
-#include "pc/sdputils.h"
-#include "pc/test/fakevideotracksource.h"
+#include "api/set_remote_description_observer_interface.h"
+#include "pc/sdp_utils.h"
+#include "pc/test/fake_video_track_source.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/function_view.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/pc/peer_connection_wrapper.h b/pc/peer_connection_wrapper.h
index 63a2501..0acd58f 100644
--- a/pc/peer_connection_wrapper.h
+++ b/pc/peer_connection_wrapper.h
@@ -8,23 +8,23 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_PEERCONNECTIONWRAPPER_H_
-#define PC_PEERCONNECTIONWRAPPER_H_
+#ifndef PC_PEER_CONNECTION_WRAPPER_H_
+#define PC_PEER_CONNECTION_WRAPPER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 #include "api/jsep.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtcerror.h"
-#include "api/rtpsenderinterface.h"
-#include "api/rtptransceiverinterface.h"
-#include "api/stats/rtcstatsreport.h"
-#include "pc/test/mockpeerconnectionobservers.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_interface.h"
+#include "api/stats/rtc_stats_report.h"
+#include "pc/test/mock_peer_connection_observers.h"
 #include "rtc_base/function_view.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
@@ -192,4 +192,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_PEERCONNECTIONWRAPPER_H_
+#endif  // PC_PEER_CONNECTION_WRAPPER_H_
diff --git a/pc/proxy_unittest.cc b/pc/proxy_unittest.cc
index 072e606..f9b7063 100644
--- a/pc/proxy_unittest.cc
+++ b/pc/proxy_unittest.cc
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "rtc_base/gunit.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "test/gmock.h"
 
 using ::testing::_;
diff --git a/pc/remote_audio_source.cc b/pc/remote_audio_source.cc
index 53a9726..ac7604d 100644
--- a/pc/remote_audio_source.cc
+++ b/pc/remote_audio_source.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/remoteaudiosource.h"
+#include "pc/remote_audio_source.h"
 
 #include <stddef.h>
 #include <algorithm>
@@ -16,7 +16,7 @@
 
 #include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/scoped_ref_ptr.h"
diff --git a/pc/remote_audio_source.h b/pc/remote_audio_source.h
index 4d87331..399e7e3 100644
--- a/pc/remote_audio_source.h
+++ b/pc/remote_audio_source.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_REMOTEAUDIOSOURCE_H_
-#define PC_REMOTEAUDIOSOURCE_H_
+#ifndef PC_REMOTE_AUDIO_SOURCE_H_
+#define PC_REMOTE_AUDIO_SOURCE_H_
 
 #include <list>
 #include <string>
@@ -17,8 +17,8 @@
 #include "api/call/audio_sink.h"
 #include "api/notifier.h"
 #include "pc/channel.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/message_handler.h"
 
 namespace rtc {
 struct Message;
@@ -73,4 +73,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_REMOTEAUDIOSOURCE_H_
+#endif  // PC_REMOTE_AUDIO_SOURCE_H_
diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc
index d48ecc0..b1a44ee 100644
--- a/pc/rtc_stats_collector.cc
+++ b/pc/rtc_stats_collector.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/rtcstatscollector.h"
+#include "pc/rtc_stats_collector.h"
 
 #include <memory>
 #include <string>
@@ -17,16 +17,16 @@
 
 #include "absl/memory/memory.h"
 #include "api/candidate.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "media/base/mediachannel.h"
-#include "p2p/base/p2pconstants.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
+#include "media/base/media_channel.h"
+#include "p2p/base/p2p_constants.h"
 #include "p2p/base/port.h"
-#include "pc/peerconnection.h"
-#include "pc/rtcstatstraversal.h"
+#include "pc/peer_connection.h"
+#include "pc/rtc_stats_traversal.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 
 namespace webrtc {
diff --git a/pc/rtc_stats_collector.h b/pc/rtc_stats_collector.h
index 8dd16e3..e3402df 100644
--- a/pc/rtc_stats_collector.h
+++ b/pc/rtc_stats_collector.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_RTCSTATSCOLLECTOR_H_
-#define PC_RTCSTATSCOLLECTOR_H_
+#ifndef PC_RTC_STATS_COLLECTOR_H_
+#define PC_RTC_STATS_COLLECTOR_H_
 
 #include <map>
 #include <memory>
@@ -18,20 +18,20 @@
 #include <vector>
 
 #include "absl/types/optional.h"
+#include "api/stats/rtc_stats_collector_callback.h"
+#include "api/stats/rtc_stats_report.h"
 #include "api/stats/rtcstats_objects.h"
-#include "api/stats/rtcstatscollectorcallback.h"
-#include "api/stats/rtcstatsreport.h"
 #include "call/call.h"
-#include "media/base/mediachannel.h"
-#include "pc/datachannel.h"
-#include "pc/peerconnectioninternal.h"
-#include "pc/trackmediainfomap.h"
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/refcount.h"
+#include "media/base/media_channel.h"
+#include "pc/data_channel.h"
+#include "pc/peer_connection_internal.h"
+#include "pc/track_media_info_map.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/ssl_identity.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
@@ -271,4 +271,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_RTCSTATSCOLLECTOR_H_
+#endif  // PC_RTC_STATS_COLLECTOR_H_
diff --git a/pc/rtc_stats_collector_unittest.cc b/pc/rtc_stats_collector_unittest.cc
index 2be4371..4635d0e 100644
--- a/pc/rtc_stats_collector_unittest.cc
+++ b/pc/rtc_stats_collector_unittest.cc
@@ -16,26 +16,26 @@
 #include <vector>
 
 #include "absl/memory/memory.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
+#include "api/stats/rtc_stats_report.h"
 #include "api/stats/rtcstats_objects.h"
-#include "api/stats/rtcstatsreport.h"
 #include "api/units/time_delta.h"
-#include "p2p/base/p2pconstants.h"
+#include "p2p/base/p2p_constants.h"
 #include "p2p/base/port.h"
-#include "pc/mediastream.h"
-#include "pc/mediastreamtrack.h"
-#include "pc/rtcstatscollector.h"
-#include "pc/test/fakepeerconnectionforstats.h"
-#include "pc/test/mock_datachannel.h"
-#include "pc/test/mock_rtpreceiverinternal.h"
-#include "pc/test/mock_rtpsenderinternal.h"
-#include "pc/test/rtcstatsobtainer.h"
+#include "pc/media_stream.h"
+#include "pc/media_stream_track.h"
+#include "pc/rtc_stats_collector.h"
+#include "pc/test/fake_peer_connection_for_stats.h"
+#include "pc/test/mock_data_channel.h"
+#include "pc/test/mock_rtp_receiver_internal.h"
+#include "pc/test/mock_rtp_sender_internal.h"
+#include "pc/test/rtc_stats_obtainer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/fakeclock.h"
-#include "rtc_base/fakesslidentity.h"
+#include "rtc_base/fake_clock.h"
+#include "rtc_base/fake_ssl_identity.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 using testing::AtLeast;
 using testing::Invoke;
diff --git a/pc/rtc_stats_integrationtest.cc b/pc/rtc_stats_integrationtest.cc
index aa45975..cae01ae 100644
--- a/pc/rtc_stats_integrationtest.cc
+++ b/pc/rtc_stats_integrationtest.cc
@@ -22,25 +22,25 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/audio_options.h"
-#include "api/datachannelinterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "api/stats/rtcstats.h"
+#include "api/data_channel_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/stats/rtc_stats.h"
+#include "api/stats/rtc_stats_report.h"
 #include "api/stats/rtcstats_objects.h"
-#include "api/stats/rtcstatsreport.h"
-#include "api/test/fakeconstraints.h"
-#include "pc/rtcstatstraversal.h"
-#include "pc/test/peerconnectiontestwrapper.h"
-#include "pc/test/rtcstatsobtainer.h"
+#include "api/test/fake_constraints.h"
+#include "pc/rtc_stats_traversal.h"
+#include "pc/test/peer_connection_test_wrapper.h"
+#include "pc/test/rtc_stats_obtainer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/event_tracer.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/trace_event.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/pc/rtc_stats_traversal.cc b/pc/rtc_stats_traversal.cc
index 62b8c52..e7af0e1 100644
--- a/pc/rtc_stats_traversal.cc
+++ b/pc/rtc_stats_traversal.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/rtcstatstraversal.h"
+#include "pc/rtc_stats_traversal.h"
 
 #include <memory>
 #include <string>
diff --git a/pc/rtc_stats_traversal.h b/pc/rtc_stats_traversal.h
index eb5c809..f648ec6 100644
--- a/pc/rtc_stats_traversal.h
+++ b/pc/rtc_stats_traversal.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_RTCSTATSTRAVERSAL_H_
-#define PC_RTCSTATSTRAVERSAL_H_
+#ifndef PC_RTC_STATS_TRAVERSAL_H_
+#define PC_RTC_STATS_TRAVERSAL_H_
 
 #include <string>
 #include <vector>
 
-#include "api/stats/rtcstats.h"
-#include "api/stats/rtcstatsreport.h"
+#include "api/stats/rtc_stats.h"
+#include "api/stats/rtc_stats_report.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
@@ -41,4 +41,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_RTCSTATSTRAVERSAL_H_
+#endif  // PC_RTC_STATS_TRAVERSAL_H_
diff --git a/pc/rtc_stats_traversal_unittest.cc b/pc/rtc_stats_traversal_unittest.cc
index d5b0de7..de2aae7 100644
--- a/pc/rtc_stats_traversal_unittest.cc
+++ b/pc/rtc_stats_traversal_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/rtcstatstraversal.h"
+#include "pc/rtc_stats_traversal.h"
 
 #include <memory>
 #include <string>
diff --git a/pc/rtcp_mux_filter.cc b/pc/rtcp_mux_filter.cc
index dceaf46..a8cf717 100644
--- a/pc/rtcp_mux_filter.cc
+++ b/pc/rtcp_mux_filter.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/rtcpmuxfilter.h"
+#include "pc/rtcp_mux_filter.h"
 
 #include "rtc_base/logging.h"
 
diff --git a/pc/rtcp_mux_filter.h b/pc/rtcp_mux_filter.h
index 55b6ea6..48050de 100644
--- a/pc/rtcp_mux_filter.h
+++ b/pc/rtcp_mux_filter.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_RTCPMUXFILTER_H_
-#define PC_RTCPMUXFILTER_H_
+#ifndef PC_RTCP_MUX_FILTER_H_
+#define PC_RTCP_MUX_FILTER_H_
 
-#include "pc/sessiondescription.h"
+#include "pc/session_description.h"
 
 namespace cricket {
 
@@ -75,4 +75,4 @@
 
 }  // namespace cricket
 
-#endif  // PC_RTCPMUXFILTER_H_
+#endif  // PC_RTCP_MUX_FILTER_H_
diff --git a/pc/rtcp_mux_filter_unittest.cc b/pc/rtcp_mux_filter_unittest.cc
index 095f08f..586da23 100644
--- a/pc/rtcp_mux_filter_unittest.cc
+++ b/pc/rtcp_mux_filter_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/rtcpmuxfilter.h"
+#include "pc/rtcp_mux_filter.h"
 
 #include "test/gtest.h"
 
diff --git a/pc/rtp_media_utils.cc b/pc/rtp_media_utils.cc
index 051cc0a..f4a6120 100644
--- a/pc/rtp_media_utils.cc
+++ b/pc/rtp_media_utils.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/rtpmediautils.h"
+#include "pc/rtp_media_utils.h"
 
 #include "rtc_base/checks.h"
 
diff --git a/pc/rtp_media_utils.h b/pc/rtp_media_utils.h
index 5f02d89..3ff40c9 100644
--- a/pc/rtp_media_utils.h
+++ b/pc/rtp_media_utils.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_RTPMEDIAUTILS_H_
-#define PC_RTPMEDIAUTILS_H_
+#ifndef PC_RTP_MEDIA_UTILS_H_
+#define PC_RTP_MEDIA_UTILS_H_
 
-#include "api/rtptransceiverinterface.h"
+#include "api/rtp_transceiver_interface.h"
 
 namespace webrtc {
 
@@ -54,4 +54,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_RTPMEDIAUTILS_H_
+#endif  // PC_RTP_MEDIA_UTILS_H_
diff --git a/pc/rtp_media_utils_unittest.cc b/pc/rtp_media_utils_unittest.cc
index af7e8f6..fbaa7a3 100644
--- a/pc/rtp_media_utils_unittest.cc
+++ b/pc/rtp_media_utils_unittest.cc
@@ -10,7 +10,7 @@
 
 #include <tuple>
 
-#include "pc/rtpmediautils.h"
+#include "pc/rtp_media_utils.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/pc/rtp_parameters_conversion.cc b/pc/rtp_parameters_conversion.cc
index 000b980..cf9e6e1 100644
--- a/pc/rtp_parameters_conversion.cc
+++ b/pc/rtp_parameters_conversion.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/rtpparametersconversion.h"
+#include "pc/rtp_parameters_conversion.h"
 
 #include <cstdint>
 #include <set>
@@ -17,9 +17,9 @@
 #include <utility>
 
 #include "api/array_view.h"
-#include "api/mediatypes.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/rtputils.h"
+#include "api/media_types.h"
+#include "media/base/media_constants.h"
+#include "media/base/rtp_utils.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
diff --git a/pc/rtp_parameters_conversion.h b/pc/rtp_parameters_conversion.h
index b77d3b7..dc24a45 100644
--- a/pc/rtp_parameters_conversion.h
+++ b/pc/rtp_parameters_conversion.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_RTPPARAMETERSCONVERSION_H_
-#define PC_RTPPARAMETERSCONVERSION_H_
+#ifndef PC_RTP_PARAMETERS_CONVERSION_H_
+#define PC_RTP_PARAMETERS_CONVERSION_H_
 
 #include <iosfwd>
 #include <vector>
 
 #include "absl/types/optional.h"
-#include "api/rtcerror.h"
-#include "api/rtpparameters.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
 #include "media/base/codec.h"
-#include "media/base/streamparams.h"
-#include "pc/sessiondescription.h"
+#include "media/base/stream_params.h"
+#include "pc/session_description.h"
 
 namespace webrtc {
 
@@ -106,4 +106,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_RTPPARAMETERSCONVERSION_H_
+#endif  // PC_RTP_PARAMETERS_CONVERSION_H_
diff --git a/pc/rtp_parameters_conversion_unittest.cc b/pc/rtp_parameters_conversion_unittest.cc
index f4f1b92..27708cc 100644
--- a/pc/rtp_parameters_conversion_unittest.cc
+++ b/pc/rtp_parameters_conversion_unittest.cc
@@ -10,7 +10,7 @@
 
 #include <algorithm>
 
-#include "pc/rtpparametersconversion.h"
+#include "pc/rtp_parameters_conversion.h"
 #include "rtc_base/gunit.h"
 
 namespace webrtc {
diff --git a/pc/rtp_receiver.cc b/pc/rtp_receiver.cc
index be1bd4b..837175a 100644
--- a/pc/rtp_receiver.cc
+++ b/pc/rtp_receiver.cc
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/rtpreceiver.h"
+#include "pc/rtp_receiver.h"
 
 #include <stddef.h>
 #include <utility>
 #include <vector>
 
-#include "api/mediastreamproxy.h"
-#include "api/mediastreamtrackproxy.h"
-#include "api/videosourceproxy.h"
-#include "pc/audiotrack.h"
-#include "pc/mediastream.h"
-#include "pc/videotrack.h"
+#include "api/media_stream_proxy.h"
+#include "api/media_stream_track_proxy.h"
+#include "api/video_track_source_proxy.h"
+#include "pc/audio_track.h"
+#include "pc/media_stream.h"
+#include "pc/video_track.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
diff --git a/pc/rtp_receiver.h b/pc/rtp_receiver.h
index ca477a6..754fce0 100644
--- a/pc/rtp_receiver.h
+++ b/pc/rtp_receiver.h
@@ -12,27 +12,27 @@
 // An RtpReceiver associates a MediaStreamTrackInterface with an underlying
 // transport (provided by cricket::VoiceChannel/cricket::VideoChannel)
 
-#ifndef PC_RTPRECEIVER_H_
-#define PC_RTPRECEIVER_H_
+#ifndef PC_RTP_RECEIVER_H_
+#define PC_RTP_RECEIVER_H_
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
 #include "absl/types/optional.h"
-#include "api/crypto/framedecryptorinterface.h"
-#include "api/mediastreaminterface.h"
-#include "api/mediatypes.h"
-#include "api/rtpparameters.h"
-#include "api/rtpreceiverinterface.h"
+#include "api/crypto/frame_decryptor_interface.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_receiver_interface.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_sink_interface.h"
 #include "api/video/video_source_interface.h"
-#include "media/base/mediachannel.h"
-#include "media/base/videobroadcaster.h"
-#include "pc/remoteaudiosource.h"
-#include "pc/videotracksource.h"
-#include "rtc_base/refcountedobject.h"
+#include "media/base/media_channel.h"
+#include "media/base/video_broadcaster.h"
+#include "pc/remote_audio_source.h"
+#include "pc/video_track_source.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
 
@@ -261,4 +261,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_RTPRECEIVER_H_
+#endif  // PC_RTP_RECEIVER_H_
diff --git a/pc/rtp_sender.cc b/pc/rtp_sender.cc
index ec99a4b..b97b876 100644
--- a/pc/rtp_sender.cc
+++ b/pc/rtp_sender.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/rtpsender.h"
+#include "pc/rtp_sender.h"
 
 #include <utility>
 #include <vector>
 
 #include "api/audio_options.h"
-#include "api/mediastreaminterface.h"
-#include "media/base/mediaengine.h"
-#include "pc/statscollector.h"
+#include "api/media_stream_interface.h"
+#include "media/base/media_engine.h"
+#include "pc/stats_collector.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/location.h"
diff --git a/pc/rtp_sender.h b/pc/rtp_sender.h
index 07fae6b..6ed0603 100644
--- a/pc/rtp_sender.h
+++ b/pc/rtp_sender.h
@@ -12,19 +12,19 @@
 // An RtpSender associates a MediaStreamTrackInterface with an underlying
 // transport (provided by AudioProviderInterface/VideoProviderInterface)
 
-#ifndef PC_RTPSENDER_H_
-#define PC_RTPSENDER_H_
+#ifndef PC_RTP_SENDER_H_
+#define PC_RTP_SENDER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "api/mediastreaminterface.h"
-#include "api/rtpsenderinterface.h"
-#include "media/base/audiosource.h"
-#include "media/base/mediachannel.h"
-#include "pc/dtmfsender.h"
-#include "rtc_base/criticalsection.h"
+#include "api/media_stream_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "media/base/audio_source.h"
+#include "media/base/media_channel.h"
+#include "pc/dtmf_sender.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
@@ -270,4 +270,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_RTPSENDER_H_
+#endif  // PC_RTP_SENDER_H_
diff --git a/pc/rtp_sender_receiver_unittest.cc b/pc/rtp_sender_receiver_unittest.cc
index ec1e949..5672a9c 100644
--- a/pc/rtp_sender_receiver_unittest.cc
+++ b/pc/rtp_sender_receiver_unittest.cc
@@ -18,39 +18,39 @@
 #include "absl/memory/memory.h"
 #include "absl/types/optional.h"
 #include "api/audio_options.h"
-#include "api/crypto/cryptooptions.h"
-#include "api/crypto/framedecryptorinterface.h"
-#include "api/crypto/frameencryptorinterface.h"
-#include "api/dtmfsenderinterface.h"
-#include "api/mediastreaminterface.h"
-#include "api/rtcerror.h"
-#include "api/rtpparameters.h"
+#include "api/crypto/crypto_options.h"
+#include "api/crypto/frame_decryptor_interface.h"
+#include "api/crypto/frame_encryptor_interface.h"
+#include "api/dtmf_sender_interface.h"
+#include "api/media_stream_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
 #include "api/test/fake_frame_decryptor.h"
 #include "api/test/fake_frame_encryptor.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
 #include "media/base/codec.h"
-#include "media/base/fakemediaengine.h"
-#include "media/base/mediachannel.h"
-#include "media/base/mediaconfig.h"
-#include "media/base/mediaengine.h"
-#include "media/base/rtpdataengine.h"
-#include "media/base/streamparams.h"
-#include "media/base/testutils.h"
-#include "media/engine/fakewebrtccall.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/fakedtlstransport.h"
-#include "p2p/base/p2pconstants.h"
-#include "pc/audiotrack.h"
+#include "media/base/fake_media_engine.h"
+#include "media/base/media_channel.h"
+#include "media/base/media_config.h"
+#include "media/base/media_engine.h"
+#include "media/base/rtp_data_engine.h"
+#include "media/base/stream_params.h"
+#include "media/base/test_utils.h"
+#include "media/engine/fake_webrtc_call.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/fake_dtls_transport.h"
+#include "p2p/base/p2p_constants.h"
+#include "pc/audio_track.h"
 #include "pc/channel.h"
-#include "pc/channelmanager.h"
-#include "pc/dtlssrtptransport.h"
-#include "pc/localaudiosource.h"
-#include "pc/mediastream.h"
-#include "pc/rtpreceiver.h"
-#include "pc/rtpsender.h"
-#include "pc/rtptransportinternal.h"
-#include "pc/test/fakevideotracksource.h"
-#include "pc/videotrack.h"
+#include "pc/channel_manager.h"
+#include "pc/dtls_srtp_transport.h"
+#include "pc/local_audio_source.h"
+#include "pc/media_stream.h"
+#include "pc/rtp_receiver.h"
+#include "pc/rtp_sender.h"
+#include "pc/rtp_transport_internal.h"
+#include "pc/test/fake_video_track_source.h"
+#include "pc/video_track.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/scoped_ref_ptr.h"
diff --git a/pc/rtp_transceiver.cc b/pc/rtp_transceiver.cc
index ffb9bdd..b04c20c 100644
--- a/pc/rtp_transceiver.cc
+++ b/pc/rtp_transceiver.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/rtptransceiver.h"
+#include "pc/rtp_transceiver.h"
 
 #include <algorithm>
 #include <string>
 
-#include "pc/rtpmediautils.h"
+#include "pc/rtp_media_utils.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 
diff --git a/pc/rtp_transceiver.h b/pc/rtp_transceiver.h
index 07db196..7c234ce 100644
--- a/pc/rtp_transceiver.h
+++ b/pc/rtp_transceiver.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_RTPTRANSCEIVER_H_
-#define PC_RTPTRANSCEIVER_H_
+#ifndef PC_RTP_TRANSCEIVER_H_
+#define PC_RTP_TRANSCEIVER_H_
 
 #include <string>
 #include <vector>
 
-#include "api/rtptransceiverinterface.h"
-#include "pc/rtpreceiver.h"
-#include "pc/rtpsender.h"
+#include "api/rtp_transceiver_interface.h"
+#include "pc/rtp_receiver.h"
+#include "pc/rtp_sender.h"
 
 namespace webrtc {
 
@@ -216,4 +216,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_RTPTRANSCEIVER_H_
+#endif  // PC_RTP_TRANSCEIVER_H_
diff --git a/pc/rtp_transceiver_unittest.cc b/pc/rtp_transceiver_unittest.cc
index f8af12f..885a5a1 100644
--- a/pc/rtp_transceiver_unittest.cc
+++ b/pc/rtp_transceiver_unittest.cc
@@ -10,9 +10,9 @@
 
 // This file contains tests for |RtpTransceiver|.
 
-#include "pc/rtptransceiver.h"
+#include "pc/rtp_transceiver.h"
 
-#include "pc/test/mock_channelinterface.h"
+#include "pc/test/mock_channel_interface.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 
diff --git a/pc/rtp_transport.cc b/pc/rtp_transport.cc
index f4adb80..0b076f7 100644
--- a/pc/rtp_transport.cc
+++ b/pc/rtp_transport.cc
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/rtptransport.h"
+#include "pc/rtp_transport.h"
 
 #include <errno.h>
 #include <string>
 #include <utility>
 
 #include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
-#include "media/base/rtputils.h"
+#include "api/rtp_parameters.h"
+#include "media/base/rtp_utils.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/trace_event.h"
diff --git a/pc/rtp_transport.h b/pc/rtp_transport.h
index dab5903..f188a17 100644
--- a/pc/rtp_transport.h
+++ b/pc/rtp_transport.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_RTPTRANSPORT_H_
-#define PC_RTPTRANSPORT_H_
+#ifndef PC_RTP_TRANSPORT_H_
+#define PC_RTP_TRANSPORT_H_
 
 #include <string>
 
 #include "call/rtp_demuxer.h"
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
-#include "pc/rtptransportinternal.h"
+#include "pc/rtp_transport_internal.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace rtc {
@@ -152,4 +152,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_RTPTRANSPORT_H_
+#endif  // PC_RTP_TRANSPORT_H_
diff --git a/pc/rtp_transport_internal.h b/pc/rtp_transport_internal.h
index e633836..f8a5f2b 100644
--- a/pc/rtp_transport_internal.h
+++ b/pc/rtp_transport_internal.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_RTPTRANSPORTINTERNAL_H_
-#define PC_RTPTRANSPORTINTERNAL_H_
+#ifndef PC_RTP_TRANSPORT_INTERNAL_H_
+#define PC_RTP_TRANSPORT_INTERNAL_H_
 
 #include <string>
 
-#include "api/ortc/srtptransportinterface.h"
+#include "api/ortc/srtp_transport_interface.h"
 #include "call/rtp_demuxer.h"
-#include "p2p/base/icetransportinternal.h"
-#include "pc/sessiondescription.h"
-#include "rtc_base/networkroute.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "p2p/base/ice_transport_internal.h"
+#include "pc/session_description.h"
+#include "rtc_base/network_route.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace rtc {
@@ -105,4 +105,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_RTPTRANSPORTINTERNAL_H_
+#endif  // PC_RTP_TRANSPORT_INTERNAL_H_
diff --git a/pc/rtp_transport_internal_adapter.h b/pc/rtp_transport_internal_adapter.h
index fd92c51..c8fa8cc 100644
--- a/pc/rtp_transport_internal_adapter.h
+++ b/pc/rtp_transport_internal_adapter.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_RTPTRANSPORTINTERNALADAPTER_H_
-#define PC_RTPTRANSPORTINTERNALADAPTER_H_
+#ifndef PC_RTP_TRANSPORT_INTERNAL_ADAPTER_H_
+#define PC_RTP_TRANSPORT_INTERNAL_ADAPTER_H_
 
 #include <memory>
 #include <utility>
 
-#include "pc/rtptransportinternal.h"
+#include "pc/rtp_transport_internal.h"
 
 namespace webrtc {
 
@@ -111,4 +111,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_RTPTRANSPORTINTERNALADAPTER_H_
+#endif  // PC_RTP_TRANSPORT_INTERNAL_ADAPTER_H_
diff --git a/pc/rtp_transport_unittest.cc b/pc/rtp_transport_unittest.cc
index 3b28c67..f3b2bb6 100644
--- a/pc/rtp_transport_unittest.cc
+++ b/pc/rtp_transport_unittest.cc
@@ -14,10 +14,10 @@
 #include <utility>
 
 #include "api/rtp_headers.h"
-#include "api/rtpparameters.h"
-#include "p2p/base/fakepackettransport.h"
-#include "pc/rtptransport.h"
-#include "pc/rtptransporttestutil.h"
+#include "api/rtp_parameters.h"
+#include "p2p/base/fake_packet_transport.h"
+#include "pc/rtp_transport.h"
+#include "pc/test/rtp_transport_test_util.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "test/gtest.h"
diff --git a/pc/sctp_utils.cc b/pc/sctp_utils.cc
index 58fbde8..aa7b6c1 100644
--- a/pc/sctp_utils.cc
+++ b/pc/sctp_utils.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/sctputils.h"
+#include "pc/sctp_utils.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/logging.h"
 
 namespace webrtc {
diff --git a/pc/sctp_utils.h b/pc/sctp_utils.h
index 7a4708a..468c960 100644
--- a/pc/sctp_utils.h
+++ b/pc/sctp_utils.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_SCTPUTILS_H_
-#define PC_SCTPUTILS_H_
+#ifndef PC_SCTP_UTILS_H_
+#define PC_SCTP_UTILS_H_
 
 #include <string>
 
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 
 namespace rtc {
 class CopyOnWriteBuffer;
@@ -38,4 +38,4 @@
 void WriteDataChannelOpenAckMessage(rtc::CopyOnWriteBuffer* payload);
 }  // namespace webrtc
 
-#endif  // PC_SCTPUTILS_H_
+#endif  // PC_SCTP_UTILS_H_
diff --git a/pc/sctp_utils_unittest.cc b/pc/sctp_utils_unittest.cc
index 0718a23..72db952 100644
--- a/pc/sctp_utils_unittest.cc
+++ b/pc/sctp_utils_unittest.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/sctputils.h"
+#include "pc/sctp_utils.h"
 
 #include <stdint.h>
 
-#include "rtc_base/bytebuffer.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/byte_buffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "test/gtest.h"
 
 class SctpUtilsTest : public testing::Test {
diff --git a/pc/sdp_serializer.cc b/pc/sdp_serializer.cc
index 8e20aa2..cdaddd7 100644
--- a/pc/sdp_serializer.cc
+++ b/pc/sdp_serializer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/sdpserializer.h"
+#include "pc/sdp_serializer.h"
 
 #include <algorithm>
 #include <string>
@@ -17,8 +17,8 @@
 
 #include "api/jsep.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/string_to_number.h"
-#include "rtc_base/stringencode.h"
 #include "rtc_base/strings/string_builder.h"
 
 using cricket::RidDescription;
diff --git a/pc/sdp_serializer.h b/pc/sdp_serializer.h
index 3c6f31b..476ebaf 100644
--- a/pc/sdp_serializer.h
+++ b/pc/sdp_serializer.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_SDPSERIALIZER_H_
-#define PC_SDPSERIALIZER_H_
+#ifndef PC_SDP_SERIALIZER_H_
+#define PC_SDP_SERIALIZER_H_
 
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "api/rtcerror.h"
-#include "media/base/riddescription.h"
-#include "pc/sessiondescription.h"
+#include "api/rtc_error.h"
+#include "media/base/rid_description.h"
+#include "pc/session_description.h"
 
 namespace webrtc {
 
@@ -57,4 +57,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_SDPSERIALIZER_H_
+#endif  // PC_SDP_SERIALIZER_H_
diff --git a/pc/sdp_serializer_unittest.cc b/pc/sdp_serializer_unittest.cc
index c5e95d0..76fa8ba 100644
--- a/pc/sdp_serializer_unittest.cc
+++ b/pc/sdp_serializer_unittest.cc
@@ -13,7 +13,7 @@
 #include <utility>
 #include <vector>
 
-#include "pc/sdpserializer.h"
+#include "pc/sdp_serializer.h"
 #include "rtc_base/gunit.h"
 
 using ::testing::ValuesIn;
diff --git a/pc/sdp_utils.cc b/pc/sdp_utils.cc
index 07bff7b..b20a667 100644
--- a/pc/sdp_utils.cc
+++ b/pc/sdp_utils.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/sdputils.h"
+#include "pc/sdp_utils.h"
 
 #include <string>
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "api/jsepsessiondescription.h"
+#include "api/jsep_session_description.h"
 
 namespace webrtc {
 
diff --git a/pc/sdp_utils.h b/pc/sdp_utils.h
index 0d2d304..5e765fa 100644
--- a/pc/sdp_utils.h
+++ b/pc/sdp_utils.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_SDPUTILS_H_
-#define PC_SDPUTILS_H_
+#ifndef PC_SDP_UTILS_H_
+#define PC_SDP_UTILS_H_
 
 #include <functional>
 #include <memory>
 #include <string>
 
 #include "api/jsep.h"
-#include "pc/sessiondescription.h"
+#include "pc/session_description.h"
 
 namespace webrtc {
 
@@ -57,4 +57,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_SDPUTILS_H_
+#endif  // PC_SDP_UTILS_H_
diff --git a/pc/session_description.cc b/pc/session_description.cc
index dd56eaf..1029ee8 100644
--- a/pc/session_description.cc
+++ b/pc/session_description.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/sessiondescription.h"
+#include "pc/session_description.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/pc/session_description.h b/pc/session_description.h
index 9998356..13da227 100644
--- a/pc/session_description.h
+++ b/pc/session_description.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_SESSIONDESCRIPTION_H_
-#define PC_SESSIONDESCRIPTION_H_
+#ifndef PC_SESSION_DESCRIPTION_H_
+#define PC_SESSION_DESCRIPTION_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -17,16 +17,16 @@
 #include <string>
 #include <vector>
 
-#include "api/cryptoparams.h"
-#include "api/mediatypes.h"
-#include "api/rtpparameters.h"
-#include "api/rtptransceiverinterface.h"
-#include "media/base/mediachannel.h"
-#include "media/base/streamparams.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/simulcastdescription.h"
-#include "rtc_base/socketaddress.h"
+#include "api/crypto_params.h"
+#include "api/media_types.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_transceiver_interface.h"
+#include "media/base/media_channel.h"
+#include "media/base/stream_params.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_info.h"
+#include "pc/simulcast_description.h"
+#include "rtc_base/socket_address.h"
 
 namespace cricket {
 
@@ -549,4 +549,4 @@
 
 }  // namespace cricket
 
-#endif  // PC_SESSIONDESCRIPTION_H_
+#endif  // PC_SESSION_DESCRIPTION_H_
diff --git a/pc/session_description_unittest.cc b/pc/session_description_unittest.cc
index 4e9d7dc..3b05dca 100644
--- a/pc/session_description_unittest.cc
+++ b/pc/session_description_unittest.cc
@@ -7,7 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "pc/sessiondescription.h"
+#include "pc/session_description.h"
 
 #include "test/gtest.h"
 
diff --git a/pc/simulcast_description.cc b/pc/simulcast_description.cc
index 61849ce..0359ffc 100644
--- a/pc/simulcast_description.cc
+++ b/pc/simulcast_description.cc
@@ -10,7 +10,7 @@
 
 #include <utility>
 
-#include "pc/simulcastdescription.h"
+#include "pc/simulcast_description.h"
 #include "rtc_base/checks.h"
 
 namespace cricket {
diff --git a/pc/simulcast_description.h b/pc/simulcast_description.h
index 0781a6a..1337a9c 100644
--- a/pc/simulcast_description.h
+++ b/pc/simulcast_description.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_SIMULCASTDESCRIPTION_H_
-#define PC_SIMULCASTDESCRIPTION_H_
+#ifndef PC_SIMULCAST_DESCRIPTION_H_
+#define PC_SIMULCAST_DESCRIPTION_H_
 
 #include <string>
 #include <vector>
@@ -108,4 +108,4 @@
 
 }  // namespace cricket
 
-#endif  // PC_SIMULCASTDESCRIPTION_H_
+#endif  // PC_SIMULCAST_DESCRIPTION_H_
diff --git a/pc/srtp_filter.cc b/pc/srtp_filter.cc
index 0dff807..cdfaeaa 100644
--- a/pc/srtp_filter.cc
+++ b/pc/srtp_filter.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/srtpfilter.h"
+#include "pc/srtp_filter.h"
 
 #include <string.h>
 #include <cstdint>
 
 #include "rtc_base/logging.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/third_party/base64/base64.h"
 #include "rtc_base/zero_memory.h"
 
diff --git a/pc/srtp_filter.h b/pc/srtp_filter.h
index 4ab0dd7..5b6c99d 100644
--- a/pc/srtp_filter.h
+++ b/pc/srtp_filter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_SRTPFILTER_H_
-#define PC_SRTPFILTER_H_
+#ifndef PC_SRTP_FILTER_H_
+#define PC_SRTP_FILTER_H_
 
 #include <list>
 #include <map>
@@ -19,13 +19,13 @@
 
 #include "absl/types/optional.h"
 #include "api/array_view.h"
-#include "api/cryptoparams.h"
+#include "api/crypto_params.h"
 #include "api/jsep.h"
-#include "pc/sessiondescription.h"
+#include "pc/session_description.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/thread_checker.h"
 
 // Forward declaration to avoid pulling in libsrtp headers here
@@ -143,4 +143,4 @@
 
 }  // namespace cricket
 
-#endif  // PC_SRTPFILTER_H_
+#endif  // PC_SRTP_FILTER_H_
diff --git a/pc/srtp_filter_unittest.cc b/pc/srtp_filter_unittest.cc
index 326e1ba..d7368d1 100644
--- a/pc/srtp_filter_unittest.cc
+++ b/pc/srtp_filter_unittest.cc
@@ -10,9 +10,9 @@
 
 #include <string.h>
 
-#include "api/cryptoparams.h"
-#include "pc/srtpfilter.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "api/crypto_params.h"
+#include "pc/srtp_filter.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "test/gtest.h"
 
 using cricket::CryptoParams;
diff --git a/pc/srtp_session.cc b/pc/srtp_session.cc
index aadd471..fccf7da 100644
--- a/pc/srtp_session.cc
+++ b/pc/srtp_session.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/srtpsession.h"
+#include "pc/srtp_session.h"
 
-#include "media/base/rtputils.h"
-#include "pc/externalhmac.h"
-#include "rtc_base/criticalsection.h"
+#include "media/base/rtp_utils.h"
+#include "pc/external_hmac.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "system_wrappers/include/metrics.h"
 #include "third_party/libsrtp/include/srtp.h"
 #include "third_party/libsrtp/include/srtp_priv.h"
diff --git a/pc/srtp_session.h b/pc/srtp_session.h
index ce05ce6..dd89e43 100644
--- a/pc/srtp_session.h
+++ b/pc/srtp_session.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_SRTPSESSION_H_
-#define PC_SRTPSESSION_H_
+#ifndef PC_SRTP_SESSION_H_
+#define PC_SRTP_SESSION_H_
 
 #include <vector>
 
@@ -128,4 +128,4 @@
 
 }  // namespace cricket
 
-#endif  // PC_SRTPSESSION_H_
+#endif  // PC_SRTP_SESSION_H_
diff --git a/pc/srtp_session_unittest.cc b/pc/srtp_session_unittest.cc
index b95f19f..dc0be62 100644
--- a/pc/srtp_session_unittest.cc
+++ b/pc/srtp_session_unittest.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/srtpsession.h"
+#include "pc/srtp_session.h"
 
 #include <string.h>
 #include <string>
 
-#include "media/base/fakertp.h"
-#include "pc/srtptestutil.h"
-#include "rtc_base/byteorder.h"
-#include "rtc_base/sslstreamadapter.h"  // For rtc::SRTP_*
+#include "media/base/fake_rtp.h"
+#include "pc/test/srtp_test_util.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/ssl_stream_adapter.h"  // For rtc::SRTP_*
 #include "system_wrappers/include/metrics.h"
 #include "test/gtest.h"
 #include "third_party/libsrtp/include/srtp.h"
diff --git a/pc/srtp_transport.cc b/pc/srtp_transport.cc
index 8585fec..c7e4f0e 100644
--- a/pc/srtp_transport.cc
+++ b/pc/srtp_transport.cc
@@ -8,22 +8,22 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/srtptransport.h"
+#include "pc/srtp_transport.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <string>
 #include <vector>
 
-#include "media/base/rtputils.h"
-#include "pc/rtptransport.h"
-#include "pc/srtpsession.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "media/base/rtp_utils.h"
+#include "pc/rtp_transport.h"
+#include "pc/srtp_session.h"
+#include "rtc_base/async_packet_socket.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/third_party/base64/base64.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/trace_event.h"
diff --git a/pc/srtp_transport.h b/pc/srtp_transport.h
index 57809d4..7512711 100644
--- a/pc/srtp_transport.h
+++ b/pc/srtp_transport.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_SRTPTRANSPORT_H_
-#define PC_SRTPTRANSPORT_H_
+#ifndef PC_SRTP_TRANSPORT_H_
+#define PC_SRTP_TRANSPORT_H_
 
 #include <stddef.h>
 #include <cstdint>
@@ -18,15 +18,15 @@
 #include <vector>
 
 #include "absl/types/optional.h"
-#include "api/cryptoparams.h"
-#include "api/rtcerror.h"
-#include "p2p/base/packettransportinternal.h"
-#include "pc/rtptransport.h"
-#include "pc/srtpsession.h"
-#include "rtc_base/asyncpacketsocket.h"
+#include "api/crypto_params.h"
+#include "api/rtc_error.h"
+#include "p2p/base/packet_transport_internal.h"
+#include "pc/rtp_transport.h"
+#include "pc/srtp_session.h"
+#include "rtc_base/async_packet_socket.h"
 #include "rtc_base/buffer.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"
 
 namespace webrtc {
 
@@ -170,4 +170,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_SRTPTRANSPORT_H_
+#endif  // PC_SRTP_TRANSPORT_H_
diff --git a/pc/srtp_transport_unittest.cc b/pc/srtp_transport_unittest.cc
index 8f16836..d429283 100644
--- a/pc/srtp_transport_unittest.cc
+++ b/pc/srtp_transport_unittest.cc
@@ -14,16 +14,16 @@
 
 #include "absl/memory/memory.h"
 #include "call/rtp_demuxer.h"
-#include "media/base/fakertp.h"
-#include "p2p/base/dtlstransportinternal.h"
-#include "p2p/base/fakepackettransport.h"
-#include "pc/rtptransporttestutil.h"
-#include "pc/srtptestutil.h"
-#include "pc/srtptransport.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/byteorder.h"
+#include "media/base/fake_rtp.h"
+#include "p2p/base/dtls_transport_internal.h"
+#include "p2p/base/fake_packet_transport.h"
+#include "pc/srtp_transport.h"
+#include "pc/test/rtp_transport_test_util.h"
+#include "pc/test/srtp_test_util.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "test/gtest.h"
 
diff --git a/pc/stats_collector.cc b/pc/stats_collector.cc
index f9aa4f4..178f05e 100644
--- a/pc/stats_collector.cc
+++ b/pc/stats_collector.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/statscollector.h"
+#include "pc/stats_collector.h"
 
 #include <memory>
 #include <set>
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "pc/channel.h"
-#include "pc/peerconnection.h"
+#include "pc/peer_connection.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/third_party/base64/base64.h"
 
diff --git a/pc/stats_collector.h b/pc/stats_collector.h
index 786d5df..d0be338 100644
--- a/pc/stats_collector.h
+++ b/pc/stats_collector.h
@@ -11,8 +11,8 @@
 // This file contains a class used for gathering statistics from an ongoing
 // libjingle PeerConnection.
 
-#ifndef PC_STATSCOLLECTOR_H_
-#define PC_STATSCOLLECTOR_H_
+#ifndef PC_STATS_COLLECTOR_H_
+#define PC_STATS_COLLECTOR_H_
 
 #include <stdint.h>
 #include <map>
@@ -21,13 +21,13 @@
 #include <utility>
 #include <vector>
 
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/statstypes.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/stats_types.h"
 #include "p2p/base/port.h"
-#include "pc/peerconnectioninternal.h"
+#include "pc/peer_connection_internal.h"
 #include "rtc_base/network_constants.h"
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/ssl_certificate.h"
 
 namespace webrtc {
 
@@ -154,4 +154,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_STATSCOLLECTOR_H_
+#endif  // PC_STATS_COLLECTOR_H_
diff --git a/pc/stats_collector_unittest.cc b/pc/stats_collector_unittest.cc
index 582b60d..4fdb8cd2 100644
--- a/pc/stats_collector_unittest.cc
+++ b/pc/stats_collector_unittest.cc
@@ -16,28 +16,28 @@
 #include "absl/types/optional.h"
 #include "api/audio_codecs/audio_encoder.h"
 #include "api/candidate.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 #include "call/call.h"
-#include "media/base/mediachannel.h"
+#include "media/base/media_channel.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
-#include "pc/datachannel.h"
-#include "pc/mediastream.h"
-#include "pc/mediastreamtrack.h"
-#include "pc/statscollector.h"
-#include "pc/test/fakepeerconnectionforstats.h"
-#include "pc/test/fakevideotracksource.h"
-#include "pc/transportstats.h"
-#include "pc/videotrack.h"
-#include "rtc_base/fakesslidentity.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/nethelper.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificate.h"
+#include "pc/data_channel.h"
+#include "pc/media_stream.h"
+#include "pc/media_stream_track.h"
+#include "pc/stats_collector.h"
+#include "pc/test/fake_peer_connection_for_stats.h"
+#include "pc/test/fake_video_track_source.h"
+#include "pc/transport_stats.h"
+#include "pc/video_track.h"
+#include "rtc_base/fake_ssl_identity.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/net_helper.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/third_party/base64/base64.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
diff --git a/pc/stream_collection.h b/pc/stream_collection.h
index 76317f9..28cd46f 100644
--- a/pc/stream_collection.h
+++ b/pc/stream_collection.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_STREAMCOLLECTION_H_
-#define PC_STREAMCOLLECTION_H_
+#ifndef PC_STREAM_COLLECTION_H_
+#define PC_STREAM_COLLECTION_H_
 
 #include <string>
 #include <vector>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 
 namespace webrtc {
 
@@ -99,4 +99,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_STREAMCOLLECTION_H_
+#endif  // PC_STREAM_COLLECTION_H_
diff --git a/pc/test/android_test_initializer.cc b/pc/test/android_test_initializer.cc
index a67716d..584aeda 100644
--- a/pc/test/android_test_initializer.cc
+++ b/pc/test/android_test_initializer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 
 #include <pthread.h>
 
@@ -28,7 +28,7 @@
 // TODO(phoglund): This include is also to a target we can't really depend on.
 // We need to either break it out into a smaller target or find some way to
 // not use it.
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
 
 namespace webrtc {
 
diff --git a/pc/test/android_test_initializer.h b/pc/test/android_test_initializer.h
index 9c00a63..4181dd2 100644
--- a/pc/test/android_test_initializer.h
+++ b/pc/test/android_test_initializer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_ANDROIDTESTINITIALIZER_H_
-#define PC_TEST_ANDROIDTESTINITIALIZER_H_
+#ifndef PC_TEST_ANDROID_TEST_INITIALIZER_H_
+#define PC_TEST_ANDROID_TEST_INITIALIZER_H_
 
 namespace webrtc {
 
@@ -17,4 +17,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_ANDROIDTESTINITIALIZER_H_
+#endif  // PC_TEST_ANDROID_TEST_INITIALIZER_H_
diff --git a/pc/test/fake_audio_capture_module.cc b/pc/test/fake_audio_capture_module.cc
index fbb1ebb..db0886d 100644
--- a/pc/test/fake_audio_capture_module.cc
+++ b/pc/test/fake_audio_capture_module.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/test/fakeaudiocapturemodule.h"
+#include "pc/test/fake_audio_capture_module.h"
 
 #include <string.h>
 
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 // Audio sample value that is high enough that it doesn't occur naturally when
 // frames are being faked. E.g. NetEq will not generate this large sample value
diff --git a/pc/test/fake_audio_capture_module.h b/pc/test/fake_audio_capture_module.h
index 2f56ef4..495cd01 100644
--- a/pc/test/fake_audio_capture_module.h
+++ b/pc/test/fake_audio_capture_module.h
@@ -17,15 +17,15 @@
 // Note P postfix of a function indicates that it should only be called by the
 // processing thread.
 
-#ifndef PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
-#define PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
+#ifndef PC_TEST_FAKE_AUDIO_CAPTURE_MODULE_H_
+#define PC_TEST_FAKE_AUDIO_CAPTURE_MODULE_H_
 
 #include <memory>
 
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_device/include/audio_device.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/message_handler.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace rtc {
@@ -224,4 +224,4 @@
   rtc::CriticalSection crit_callback_;
 };
 
-#endif  // PC_TEST_FAKEAUDIOCAPTUREMODULE_H_
+#endif  // PC_TEST_FAKE_AUDIO_CAPTURE_MODULE_H_
diff --git a/pc/test/fake_audio_capture_module_unittest.cc b/pc/test/fake_audio_capture_module_unittest.cc
index 8e6db4b..30a8090 100644
--- a/pc/test/fake_audio_capture_module_unittest.cc
+++ b/pc/test/fake_audio_capture_module_unittest.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/test/fakeaudiocapturemodule.h"
+#include "pc/test/fake_audio_capture_module.h"
 
 #include <string.h>
 #include <algorithm>
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/gtest.h"
diff --git a/pc/test/fake_data_channel_provider.h b/pc/test/fake_data_channel_provider.h
index 83c5cb3..2ada4a9 100644
--- a/pc/test/fake_data_channel_provider.h
+++ b/pc/test/fake_data_channel_provider.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_FAKEDATACHANNELPROVIDER_H_
-#define PC_TEST_FAKEDATACHANNELPROVIDER_H_
+#ifndef PC_TEST_FAKE_DATA_CHANNEL_PROVIDER_H_
+#define PC_TEST_FAKE_DATA_CHANNEL_PROVIDER_H_
 
 #include <set>
 
-#include "pc/datachannel.h"
+#include "pc/data_channel.h"
 #include "rtc_base/checks.h"
 
 class FakeDataChannelProvider : public webrtc::DataChannelProviderInterface {
@@ -152,4 +152,4 @@
   std::set<uint32_t> send_ssrcs_;
   std::set<uint32_t> recv_ssrcs_;
 };
-#endif  // PC_TEST_FAKEDATACHANNELPROVIDER_H_
+#endif  // PC_TEST_FAKE_DATA_CHANNEL_PROVIDER_H_
diff --git a/pc/test/fake_peer_connection_base.h b/pc/test/fake_peer_connection_base.h
index b4bc7b9..85feebc 100644
--- a/pc/test/fake_peer_connection_base.h
+++ b/pc/test/fake_peer_connection_base.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_FAKEPEERCONNECTIONBASE_H_
-#define PC_TEST_FAKEPEERCONNECTIONBASE_H_
+#ifndef PC_TEST_FAKE_PEER_CONNECTION_BASE_H_
+#define PC_TEST_FAKE_PEER_CONNECTION_BASE_H_
 
 #include <map>
 #include <memory>
@@ -17,7 +17,7 @@
 #include <string>
 #include <vector>
 
-#include "pc/peerconnectioninternal.h"
+#include "pc/peer_connection_internal.h"
 
 namespace webrtc {
 
@@ -299,4 +299,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_FAKEPEERCONNECTIONBASE_H_
+#endif  // PC_TEST_FAKE_PEER_CONNECTION_BASE_H_
diff --git a/pc/test/fake_peer_connection_for_stats.h b/pc/test/fake_peer_connection_for_stats.h
index 9540ee7..e33514a 100644
--- a/pc/test/fake_peer_connection_for_stats.h
+++ b/pc/test/fake_peer_connection_for_stats.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_
-#define PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_
+#ifndef PC_TEST_FAKE_PEER_CONNECTION_FOR_STATS_H_
+#define PC_TEST_FAKE_PEER_CONNECTION_FOR_STATS_H_
 
 #include <map>
 #include <memory>
@@ -19,10 +19,10 @@
 #include <vector>
 
 #include "absl/memory/memory.h"
-#include "media/base/fakemediaengine.h"
-#include "pc/streamcollection.h"
-#include "pc/test/fakedatachannelprovider.h"
-#include "pc/test/fakepeerconnectionbase.h"
+#include "media/base/fake_media_engine.h"
+#include "pc/stream_collection.h"
+#include "pc/test/fake_data_channel_provider.h"
+#include "pc/test/fake_peer_connection_base.h"
 
 namespace webrtc {
 
@@ -384,4 +384,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_FAKEPEERCONNECTIONFORSTATS_H_
+#endif  // PC_TEST_FAKE_PEER_CONNECTION_FOR_STATS_H_
diff --git a/pc/test/fake_periodic_video_source.h b/pc/test/fake_periodic_video_source.h
index 146d49e..597f0ee 100644
--- a/pc/test/fake_periodic_video_source.h
+++ b/pc/test/fake_periodic_video_source.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_FAKEPERIODICVIDEOSOURCE_H_
-#define PC_TEST_FAKEPERIODICVIDEOSOURCE_H_
+#ifndef PC_TEST_FAKE_PERIODIC_VIDEO_SOURCE_H_
+#define PC_TEST_FAKE_PERIODIC_VIDEO_SOURCE_H_
 
 #include <memory>
 
 #include "absl/memory/memory.h"
 #include "api/video/video_source_interface.h"
-#include "media/base/fakeframesource.h"
-#include "media/base/videobroadcaster.h"
+#include "media/base/fake_frame_source.h"
+#include "media/base/video_broadcaster.h"
 #include "rtc_base/task_queue.h"
 
 namespace webrtc {
@@ -99,4 +99,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_FAKEPERIODICVIDEOSOURCE_H_
+#endif  // PC_TEST_FAKE_PERIODIC_VIDEO_SOURCE_H_
diff --git a/pc/test/fake_periodic_video_track_source.h b/pc/test/fake_periodic_video_track_source.h
index ab428d8..cc406d6 100644
--- a/pc/test/fake_periodic_video_track_source.h
+++ b/pc/test/fake_periodic_video_track_source.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_
-#define PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_
+#ifndef PC_TEST_FAKE_PERIODIC_VIDEO_TRACK_SOURCE_H_
+#define PC_TEST_FAKE_PERIODIC_VIDEO_TRACK_SOURCE_H_
 
-#include "pc/test/fakeperiodicvideosource.h"
-#include "pc/videotracksource.h"
+#include "pc/test/fake_periodic_video_source.h"
+#include "pc/video_track_source.h"
 
 namespace webrtc {
 
@@ -38,4 +38,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_FAKEPERIODICVIDEOTRACKSOURCE_H_
+#endif  // PC_TEST_FAKE_PERIODIC_VIDEO_TRACK_SOURCE_H_
diff --git a/pc/test/fake_rtc_certificate_generator.h b/pc/test/fake_rtc_certificate_generator.h
index a3e7654..9c43ba9 100644
--- a/pc/test/fake_rtc_certificate_generator.h
+++ b/pc/test/fake_rtc_certificate_generator.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
-#define PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
+#ifndef PC_TEST_FAKE_RTC_CERTIFICATE_GENERATOR_H_
+#define PC_TEST_FAKE_RTC_CERTIFICATE_GENERATOR_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 
-#include "api/peerconnectioninterface.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "api/peer_connection_interface.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/rtc_certificate_generator.h"
 
 // RSA with mod size 1024, pub exp 0x10001.
 static const rtc::RTCCertificatePEM kRsaPems[] = {
@@ -241,4 +241,4 @@
   int generated_failures_ = 0;
 };
 
-#endif  // PC_TEST_FAKERTCCERTIFICATEGENERATOR_H_
+#endif  // PC_TEST_FAKE_RTC_CERTIFICATE_GENERATOR_H_
diff --git a/pc/test/fake_sctp_transport.h b/pc/test/fake_sctp_transport.h
index 294376d..b2c5c1a 100644
--- a/pc/test/fake_sctp_transport.h
+++ b/pc/test/fake_sctp_transport.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_FAKESCTPTRANSPORT_H_
-#define PC_TEST_FAKESCTPTRANSPORT_H_
+#ifndef PC_TEST_FAKE_SCTP_TRANSPORT_H_
+#define PC_TEST_FAKE_SCTP_TRANSPORT_H_
 
 #include <memory>
 
-#include "media/sctp/sctptransportinternal.h"
+#include "media/sctp/sctp_transport_internal.h"
 
 // Used for tests in this file to verify that PeerConnection responds to signals
 // from the SctpTransport correctly, and calls Start with the correct
@@ -61,4 +61,4 @@
   FakeSctpTransport* last_fake_sctp_transport_ = nullptr;
 };
 
-#endif  // PC_TEST_FAKESCTPTRANSPORT_H_
+#endif  // PC_TEST_FAKE_SCTP_TRANSPORT_H_
diff --git a/pc/test/fake_video_track_renderer.h b/pc/test/fake_video_track_renderer.h
index 617261a..f6e341b 100644
--- a/pc/test/fake_video_track_renderer.h
+++ b/pc/test/fake_video_track_renderer.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_FAKEVIDEOTRACKRENDERER_H_
-#define PC_TEST_FAKEVIDEOTRACKRENDERER_H_
+#ifndef PC_TEST_FAKE_VIDEO_TRACK_RENDERER_H_
+#define PC_TEST_FAKE_VIDEO_TRACK_RENDERER_H_
 
-#include "api/mediastreaminterface.h"
-#include "media/base/fakevideorenderer.h"
+#include "api/media_stream_interface.h"
+#include "media/base/fake_video_renderer.h"
 
 namespace webrtc {
 
@@ -30,4 +30,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_FAKEVIDEOTRACKRENDERER_H_
+#endif  // PC_TEST_FAKE_VIDEO_TRACK_RENDERER_H_
diff --git a/pc/test/fake_video_track_source.h b/pc/test/fake_video_track_source.h
index 1b5bd87..295201e 100644
--- a/pc/test/fake_video_track_source.h
+++ b/pc/test/fake_video_track_source.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_FAKEVIDEOTRACKSOURCE_H_
-#define PC_TEST_FAKEVIDEOTRACKSOURCE_H_
+#ifndef PC_TEST_FAKE_VIDEO_TRACK_SOURCE_H_
+#define PC_TEST_FAKE_VIDEO_TRACK_SOURCE_H_
 
-#include "api/mediastreaminterface.h"
-#include "pc/videotracksource.h"
+#include "api/media_stream_interface.h"
+#include "pc/video_track_source.h"
 
 namespace webrtc {
 
@@ -47,4 +47,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_FAKEVIDEOTRACKSOURCE_H_
+#endif  // PC_TEST_FAKE_VIDEO_TRACK_SOURCE_H_
diff --git a/pc/test/frame_generator_capturer_video_track_source.h b/pc/test/frame_generator_capturer_video_track_source.h
index c9324ed..3c68d1b 100644
--- a/pc/test/frame_generator_capturer_video_track_source.h
+++ b/pc/test/frame_generator_capturer_video_track_source.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_
-#define PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_
+#ifndef PC_TEST_FRAME_GENERATOR_CAPTURER_VIDEO_TRACK_SOURCE_H_
+#define PC_TEST_FRAME_GENERATOR_CAPTURER_VIDEO_TRACK_SOURCE_H_
 
 #include <memory>
 #include <utility>
 
-#include "pc/videotracksource.h"
+#include "pc/video_track_source.h"
 #include "test/frame_generator_capturer.h"
 
 namespace webrtc {
@@ -73,4 +73,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_FRAMEGENERATORCAPTURERVIDEOTRACKSOURCE_H_
+#endif  // PC_TEST_FRAME_GENERATOR_CAPTURER_VIDEO_TRACK_SOURCE_H_
diff --git a/pc/test/mock_channel_interface.h b/pc/test/mock_channel_interface.h
index 4c32a8f..b559e84 100644
--- a/pc/test/mock_channel_interface.h
+++ b/pc/test/mock_channel_interface.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_MOCK_CHANNELINTERFACE_H_
-#define PC_TEST_MOCK_CHANNELINTERFACE_H_
+#ifndef PC_TEST_MOCK_CHANNEL_INTERFACE_H_
+#define PC_TEST_MOCK_CHANNEL_INTERFACE_H_
 
 #include <string>
 
-#include "pc/channelinterface.h"
+#include "pc/channel_interface.h"
 #include "test/gmock.h"
 
 namespace cricket {
@@ -44,4 +44,4 @@
 
 }  // namespace cricket
 
-#endif  // PC_TEST_MOCK_CHANNELINTERFACE_H_
+#endif  // PC_TEST_MOCK_CHANNEL_INTERFACE_H_
diff --git a/pc/test/mock_data_channel.h b/pc/test/mock_data_channel.h
index fe88714..2db0c36 100644
--- a/pc/test/mock_data_channel.h
+++ b/pc/test/mock_data_channel.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_MOCK_DATACHANNEL_H_
-#define PC_TEST_MOCK_DATACHANNEL_H_
+#ifndef PC_TEST_MOCK_DATA_CHANNEL_H_
+#define PC_TEST_MOCK_DATA_CHANNEL_H_
 
 #include <string>
 
-#include "pc/datachannel.h"
+#include "pc/data_channel.h"
 #include "test/gmock.h"
 
 namespace webrtc {
@@ -54,4 +54,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_MOCK_DATACHANNEL_H_
+#endif  // PC_TEST_MOCK_DATA_CHANNEL_H_
diff --git a/pc/test/mock_peer_connection_observers.h b/pc/test/mock_peer_connection_observers.h
index 0657853..eeac9b0 100644
--- a/pc/test/mock_peer_connection_observers.h
+++ b/pc/test/mock_peer_connection_observers.h
@@ -11,8 +11,8 @@
 // This file contains mock implementations of observers used in PeerConnection.
 // TODO(steveanton): These aren't really mocks and should be renamed.
 
-#ifndef PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
-#define PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
+#ifndef PC_TEST_MOCK_PEER_CONNECTION_OBSERVERS_H_
+#define PC_TEST_MOCK_PEER_CONNECTION_OBSERVERS_H_
 
 #include <map>
 #include <memory>
@@ -21,9 +21,9 @@
 #include <vector>
 
 #include "absl/memory/memory.h"
-#include "api/datachannelinterface.h"
-#include "api/jsepicecandidate.h"
-#include "pc/streamcollection.h"
+#include "api/data_channel_interface.h"
+#include "api/jsep_ice_candidate.h"
+#include "pc/stream_collection.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
@@ -515,4 +515,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_MOCKPEERCONNECTIONOBSERVERS_H_
+#endif  // PC_TEST_MOCK_PEER_CONNECTION_OBSERVERS_H_
diff --git a/pc/test/mock_rtp_receiver_internal.h b/pc/test/mock_rtp_receiver_internal.h
index 84b0d71..10807da 100644
--- a/pc/test/mock_rtp_receiver_internal.h
+++ b/pc/test/mock_rtp_receiver_internal.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_
-#define PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_
+#ifndef PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_
+#define PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_
 
 #include <string>
 #include <vector>
 
-#include "pc/rtpreceiver.h"
+#include "pc/rtp_receiver.h"
 #include "test/gmock.h"
 
 namespace webrtc {
@@ -54,4 +54,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_MOCK_RTPRECEIVERINTERNAL_H_
+#endif  // PC_TEST_MOCK_RTP_RECEIVER_INTERNAL_H_
diff --git a/pc/test/mock_rtp_sender_internal.h b/pc/test/mock_rtp_sender_internal.h
index dd4f694..7859175 100644
--- a/pc/test/mock_rtp_sender_internal.h
+++ b/pc/test/mock_rtp_sender_internal.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_MOCK_RTPSENDERINTERNAL_H_
-#define PC_TEST_MOCK_RTPSENDERINTERNAL_H_
+#ifndef PC_TEST_MOCK_RTP_SENDER_INTERNAL_H_
+#define PC_TEST_MOCK_RTP_SENDER_INTERNAL_H_
 
 #include <string>
 #include <vector>
 
-#include "pc/rtpsender.h"
+#include "pc/rtp_sender.h"
 #include "test/gmock.h"
 
 namespace webrtc {
@@ -50,4 +50,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_MOCK_RTPSENDERINTERNAL_H_
+#endif  // PC_TEST_MOCK_RTP_SENDER_INTERNAL_H_
diff --git a/pc/test/peer_connection_test_wrapper.cc b/pc/test/peer_connection_test_wrapper.cc
index 96007bb..089a780 100644
--- a/pc/test/peer_connection_test_wrapper.cc
+++ b/pc/test/peer_connection_test_wrapper.cc
@@ -23,20 +23,20 @@
 #include "api/video_codecs/video_encoder_factory.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
-#include "p2p/base/fakeportallocator.h"
-#include "p2p/base/portallocator.h"
-#include "pc/test/fakeperiodicvideosource.h"
-#include "pc/test/fakeperiodicvideotracksource.h"
-#include "pc/test/fakertccertificategenerator.h"
-#include "pc/test/mockpeerconnectionobservers.h"
-#include "pc/test/peerconnectiontestwrapper.h"
+#include "p2p/base/fake_port_allocator.h"
+#include "p2p/base/port_allocator.h"
+#include "pc/test/fake_periodic_video_source.h"
+#include "pc/test/fake_periodic_video_track_source.h"
+#include "pc/test/fake_rtc_certificate_generator.h"
+#include "pc/test/mock_peer_connection_observers.h"
+#include "pc/test/peer_connection_test_wrapper.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/rtccertificategenerator.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/thread_checker.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 using webrtc::FakeConstraints;
diff --git a/pc/test/peer_connection_test_wrapper.h b/pc/test/peer_connection_test_wrapper.h
index defe8f3..8bbf42f 100644
--- a/pc/test/peer_connection_test_wrapper.h
+++ b/pc/test/peer_connection_test_wrapper.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
-#define PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
+#ifndef PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_
+#define PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_
 
 #include <memory>
 #include <string>
@@ -18,15 +18,15 @@
 #include "api/audio_codecs/audio_decoder_factory.h"
 #include "api/audio_codecs/audio_encoder_factory.h"
 #include "api/audio_options.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 #include "api/jsep.h"
-#include "api/mediastreaminterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtcerror.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/test/fakeconstraints.h"
-#include "pc/test/fakeaudiocapturemodule.h"
-#include "pc/test/fakevideotrackrenderer.h"
+#include "api/media_stream_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/test/fake_constraints.h"
+#include "pc/test/fake_audio_capture_module.h"
+#include "pc/test/fake_video_track_renderer.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
@@ -126,4 +126,4 @@
   int num_get_user_media_calls_ = 0;
 };
 
-#endif  // PC_TEST_PEERCONNECTIONTESTWRAPPER_H_
+#endif  // PC_TEST_PEER_CONNECTION_TEST_WRAPPER_H_
diff --git a/pc/test/rtc_stats_obtainer.h b/pc/test/rtc_stats_obtainer.h
index cb8ecd5..f0ec3eb 100644
--- a/pc/test/rtc_stats_obtainer.h
+++ b/pc/test/rtc_stats_obtainer.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TEST_RTCSTATSOBTAINER_H_
-#define PC_TEST_RTCSTATSOBTAINER_H_
+#ifndef PC_TEST_RTC_STATS_OBTAINER_H_
+#define PC_TEST_RTC_STATS_OBTAINER_H_
 
-#include "api/stats/rtcstatsreport.h"
+#include "api/stats/rtc_stats_report.h"
 #include "rtc_base/gunit.h"
 
 namespace webrtc {
@@ -50,4 +50,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_RTCSTATSOBTAINER_H_
+#endif  // PC_TEST_RTC_STATS_OBTAINER_H_
diff --git a/pc/test/rtp_transport_test_util.h b/pc/test/rtp_transport_test_util.h
index f2c3512..0353b74 100644
--- a/pc/test/rtp_transport_test_util.h
+++ b/pc/test/rtp_transport_test_util.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_RTPTRANSPORTTESTUTIL_H_
-#define PC_RTPTRANSPORTTESTUTIL_H_
+#ifndef PC_TEST_RTP_TRANSPORT_TEST_UTIL_H_
+#define PC_TEST_RTP_TRANSPORT_TEST_UTIL_H_
 
 #include "call/rtp_packet_sink_interface.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "pc/rtptransportinternal.h"
+#include "pc/rtp_transport_internal.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace webrtc {
@@ -75,4 +75,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_RTPTRANSPORTTESTUTIL_H_
+#endif  // PC_TEST_RTP_TRANSPORT_TEST_UTIL_H_
diff --git a/pc/test/srtp_test_util.h b/pc/test/srtp_test_util.h
index edb3d76..ed12e54 100644
--- a/pc/test/srtp_test_util.h
+++ b/pc/test/srtp_test_util.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_SRTPTESTUTIL_H_
-#define PC_SRTPTESTUTIL_H_
+#ifndef PC_TEST_SRTP_TEST_UTIL_H_
+#define PC_TEST_SRTP_TEST_UTIL_H_
 
 #include <string>
 
@@ -42,4 +42,4 @@
 
 }  // namespace rtc
 
-#endif  // PC_SRTPTESTUTIL_H_
+#endif  // PC_TEST_SRTP_TEST_UTIL_H_
diff --git a/pc/test/test_sdp_strings.h b/pc/test/test_sdp_strings.h
index ba139e2..849757d 100644
--- a/pc/test/test_sdp_strings.h
+++ b/pc/test/test_sdp_strings.h
@@ -10,8 +10,8 @@
 
 // This file contain SDP strings used for testing.
 
-#ifndef PC_TEST_TESTSDPSTRINGS_H_
-#define PC_TEST_TESTSDPSTRINGS_H_
+#ifndef PC_TEST_TEST_SDP_STRINGS_H_
+#define PC_TEST_TEST_SDP_STRINGS_H_
 
 namespace webrtc {
 
@@ -181,4 +181,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TEST_TESTSDPSTRINGS_H_
+#endif  // PC_TEST_TEST_SDP_STRINGS_H_
diff --git a/pc/track_media_info_map.cc b/pc/track_media_info_map.cc
index b5abb7e..459f3ea 100644
--- a/pc/track_media_info_map.cc
+++ b/pc/track_media_info_map.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/trackmediainfomap.h"
+#include "pc/track_media_info_map.h"
 
 #include <string>
 #include <utility>
diff --git a/pc/track_media_info_map.h b/pc/track_media_info_map.h
index fa1f7e7..542501e 100644
--- a/pc/track_media_info_map.h
+++ b/pc/track_media_info_map.h
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TRACKMEDIAINFOMAP_H_
-#define PC_TRACKMEDIAINFOMAP_H_
+#ifndef PC_TRACK_MEDIA_INFO_MAP_H_
+#define PC_TRACK_MEDIA_INFO_MAP_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "api/mediastreaminterface.h"
-#include "media/base/mediachannel.h"
-#include "pc/rtpreceiver.h"
-#include "pc/rtpsender.h"
-#include "rtc_base/refcount.h"
+#include "api/media_stream_interface.h"
+#include "media/base/media_channel.h"
+#include "pc/rtp_receiver.h"
+#include "pc/rtp_sender.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 
@@ -127,4 +127,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_TRACKMEDIAINFOMAP_H_
+#endif  // PC_TRACK_MEDIA_INFO_MAP_H_
diff --git a/pc/track_media_info_map_unittest.cc b/pc/track_media_info_map_unittest.cc
index 1b320d0..9edd60e 100644
--- a/pc/track_media_info_map_unittest.cc
+++ b/pc/track_media_info_map_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/trackmediainfomap.h"
+#include "pc/track_media_info_map.h"
 
 #include <initializer_list>
 #include <memory>
@@ -16,15 +16,15 @@
 #include <utility>
 #include <vector>
 
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "media/base/mediachannel.h"
-#include "pc/audiotrack.h"
-#include "pc/test/fakevideotracksource.h"
-#include "pc/test/mock_rtpreceiverinternal.h"
-#include "pc/test/mock_rtpsenderinternal.h"
-#include "pc/videotrack.h"
-#include "rtc_base/refcount.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "media/base/media_channel.h"
+#include "pc/audio_track.h"
+#include "pc/test/fake_video_track_source.h"
+#include "pc/test/mock_rtp_receiver_internal.h"
+#include "pc/test/mock_rtp_sender_internal.h"
+#include "pc/video_track.h"
+#include "rtc_base/ref_count.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/pc/transport_stats.cc b/pc/transport_stats.cc
index df2df58..f6dd7d6 100644
--- a/pc/transport_stats.cc
+++ b/pc/transport_stats.cc
@@ -7,7 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "pc/transportstats.h"
+#include "pc/transport_stats.h"
 
 namespace cricket {
 
diff --git a/pc/transport_stats.h b/pc/transport_stats.h
index 84abc54..8813dbe 100644
--- a/pc/transport_stats.h
+++ b/pc/transport_stats.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_TRANSPORTSTATS_H_
-#define PC_TRANSPORTSTATS_H_
+#ifndef PC_TRANSPORT_STATS_H_
+#define PC_TRANSPORT_STATS_H_
 
 #include <string>
 #include <vector>
 
-#include "p2p/base/dtlstransportinternal.h"
+#include "p2p/base/dtls_transport_internal.h"
 #include "p2p/base/port.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
 
 namespace cricket {
 
@@ -48,4 +48,4 @@
 
 }  // namespace cricket
 
-#endif  // PC_TRANSPORTSTATS_H_
+#endif  // PC_TRANSPORT_STATS_H_
diff --git a/pc/unique_id_generator.cc b/pc/unique_id_generator.cc
index 6927bbe..6b508f1 100644
--- a/pc/unique_id_generator.cc
+++ b/pc/unique_id_generator.cc
@@ -14,8 +14,8 @@
 #include <vector>
 
 #include "rtc_base/helpers.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/string_to_number.h"
-#include "rtc_base/stringencode.h"
 
 namespace webrtc {
 
diff --git a/pc/video_capturer_track_source.cc b/pc/video_capturer_track_source.cc
index 0767dcf..c7403f7 100644
--- a/pc/video_capturer_track_source.cc
+++ b/pc/video_capturer_track_source.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/videocapturertracksource.h"
+#include "pc/video_capturer_track_source.h"
 
 #include <cstdlib>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 
diff --git a/pc/video_capturer_track_source.h b/pc/video_capturer_track_source.h
index 0a254db..6915b4b 100644
--- a/pc/video_capturer_track_source.h
+++ b/pc/video_capturer_track_source.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_VIDEOCAPTURERTRACKSOURCE_H_
-#define PC_VIDEOCAPTURERTRACKSOURCE_H_
+#ifndef PC_VIDEO_CAPTURER_TRACK_SOURCE_H_
+#define PC_VIDEO_CAPTURER_TRACK_SOURCE_H_
 
 #include <memory>
 
-#include "api/mediastreaminterface.h"
-#include "media/base/videocapturer.h"
-#include "media/base/videocommon.h"
-#include "pc/videotracksource.h"
-#include "rtc_base/asyncinvoker.h"
+#include "api/media_stream_interface.h"
+#include "media/base/video_capturer.h"
+#include "media/base/video_common.h"
+#include "pc/video_track_source.h"
+#include "rtc_base/async_invoker.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 // VideoCapturerTrackSource implements VideoTrackSourceInterface. It owns a
@@ -83,4 +83,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_VIDEOCAPTURERTRACKSOURCE_H_
+#endif  // PC_VIDEO_CAPTURER_TRACK_SOURCE_H_
diff --git a/pc/video_capturer_track_source_unittest.cc b/pc/video_capturer_track_source_unittest.cc
index aef82a1..4d2e4c3 100644
--- a/pc/video_capturer_track_source_unittest.cc
+++ b/pc/video_capturer_track_source_unittest.cc
@@ -13,11 +13,11 @@
 #include <utility>
 #include <vector>
 
-#include "api/test/fakeconstraints.h"
-#include "media/base/fakevideocapturer.h"
-#include "media/base/fakevideorenderer.h"
-#include "media/base/mediachannel.h"
-#include "pc/videocapturertracksource.h"
+#include "api/test/fake_constraints.h"
+#include "media/base/fake_video_capturer.h"
+#include "media/base/fake_video_renderer.h"
+#include "media/base/media_channel.h"
+#include "pc/video_capturer_track_source.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/event.h"
 #include "rtc_base/gunit.h"
diff --git a/pc/video_track.cc b/pc/video_track.cc
index 8975287..f93e3d5 100644
--- a/pc/video_track.cc
+++ b/pc/video_track.cc
@@ -12,10 +12,10 @@
 #include <vector>
 
 #include "api/notifier.h"
-#include "pc/videotrack.h"
+#include "pc/video_track.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 
 namespace webrtc {
 
diff --git a/pc/video_track.h b/pc/video_track.h
index e6761e1..0111a66 100644
--- a/pc/video_track.h
+++ b/pc/video_track.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_VIDEOTRACK_H_
-#define PC_VIDEOTRACK_H_
+#ifndef PC_VIDEO_TRACK_H_
+#define PC_VIDEO_TRACK_H_
 
 #include <string>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_sink_interface.h"
 #include "api/video/video_source_interface.h"
-#include "media/base/videosourcebase.h"
-#include "pc/mediastreamtrack.h"
+#include "media/base/video_source_base.h"
+#include "pc/media_stream_track.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_annotations.h"
@@ -65,4 +65,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_VIDEOTRACK_H_
+#endif  // PC_VIDEO_TRACK_H_
diff --git a/pc/video_track_source.cc b/pc/video_track_source.cc
index cf0ffd7..408c8d7 100644
--- a/pc/video_track_source.cc
+++ b/pc/video_track_source.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/videotracksource.h"
+#include "pc/video_track_source.h"
 
 #include "rtc_base/checks.h"
 
diff --git a/pc/video_track_source.h b/pc/video_track_source.h
index cedb75b..ad0fe09 100644
--- a/pc/video_track_source.h
+++ b/pc/video_track_source.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_VIDEOTRACKSOURCE_H_
-#define PC_VIDEOTRACKSOURCE_H_
+#ifndef PC_VIDEO_TRACK_SOURCE_H_
+#define PC_VIDEO_TRACK_SOURCE_H_
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/notifier.h"
 #include "api/video/video_sink_interface.h"
-#include "media/base/mediachannel.h"
+#include "media/base/media_channel.h"
 #include "rtc_base/system/rtc_export.h"
 #include "rtc_base/thread_checker.h"
 
@@ -52,4 +52,4 @@
 
 }  // namespace webrtc
 
-#endif  //  PC_VIDEOTRACKSOURCE_H_
+#endif  //  PC_VIDEO_TRACK_SOURCE_H_
diff --git a/pc/video_track_unittest.cc b/pc/video_track_unittest.cc
index 4973d8e..806da7c 100644
--- a/pc/video_track_unittest.cc
+++ b/pc/video_track_unittest.cc
@@ -10,12 +10,12 @@
 
 #include <memory>
 
-#include "media/base/fakevideocapturer.h"
-#include "media/base/videocommon.h"
-#include "pc/test/fakevideotrackrenderer.h"
-#include "pc/videotrack.h"
-#include "pc/videotracksource.h"
-#include "rtc_base/refcountedobject.h"
+#include "media/base/fake_video_capturer.h"
+#include "media/base/video_common.h"
+#include "pc/test/fake_video_track_renderer.h"
+#include "pc/video_track.h"
+#include "pc/video_track_source.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/gtest.h"
 
 using webrtc::FakeVideoTrackRenderer;
diff --git a/pc/webrtc_sdp.cc b/pc/webrtc_sdp.cc
index 5707b3c..094525a 100644
--- a/pc/webrtc_sdp.cc
+++ b/pc/webrtc_sdp.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/webrtcsdp.h"
+#include "pc/webrtc_sdp.h"
 
 #include <ctype.h>
 #include <limits.h>
@@ -26,24 +26,24 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
 #include "api/candidate.h"
-#include "api/cryptoparams.h"
-#include "api/jsepicecandidate.h"
-#include "api/jsepsessiondescription.h"
-#include "api/mediatypes.h"
+#include "api/crypto_params.h"
+#include "api/jsep_ice_candidate.h"
+#include "api/jsep_session_description.h"
+#include "api/media_types.h"
 // for RtpExtension
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/rtputils.h"
-#include "media/sctp/sctptransportinternal.h"
-#include "p2p/base/p2pconstants.h"
+#include "media/base/media_constants.h"
+#include "media/base/rtp_utils.h"
+#include "media/sctp/sctp_transport_internal.h"
+#include "p2p/base/p2p_constants.h"
 #include "p2p/base/port.h"
-#include "pc/mediasession.h"
-#include "pc/sdpserializer.h"
+#include "pc/media_session.h"
+#include "pc/sdp_serializer.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
 #include "rtc_base/strings/string_builder.h"
 
 using cricket::AudioContentDescription;
diff --git a/pc/webrtc_sdp.h b/pc/webrtc_sdp.h
index f185c08..1d1e7aa 100644
--- a/pc/webrtc_sdp.h
+++ b/pc/webrtc_sdp.h
@@ -17,8 +17,8 @@
 // * draft-lennox-mmusic-sdp-source-selection-02 -
 //   Mechanisms for Media Source Selection in SDP
 
-#ifndef PC_WEBRTCSDP_H_
-#define PC_WEBRTCSDP_H_
+#ifndef PC_WEBRTC_SDP_H_
+#define PC_WEBRTC_SDP_H_
 
 #include <string>
 
@@ -86,4 +86,4 @@
 
 }  // namespace webrtc
 
-#endif  // PC_WEBRTCSDP_H_
+#endif  // PC_WEBRTC_SDP_H_
diff --git a/pc/webrtc_sdp_unittest.cc b/pc/webrtc_sdp_unittest.cc
index 849f6c5..210848f 100644
--- a/pc/webrtc_sdp_unittest.cc
+++ b/pc/webrtc_sdp_unittest.cc
@@ -18,33 +18,33 @@
 #include <vector>
 
 #include "api/array_view.h"
-#include "api/cryptoparams.h"
-#include "api/jsepsessiondescription.h"
-#include "api/mediatypes.h"
-#include "api/rtpparameters.h"
-#include "api/rtptransceiverinterface.h"
+#include "api/crypto_params.h"
+#include "api/jsep_session_description.h"
+#include "api/media_types.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_transceiver_interface.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
-#include "media/base/streamparams.h"
-#include "p2p/base/p2pconstants.h"
+#include "media/base/media_constants.h"
+#include "media/base/stream_params.h"
+#include "p2p/base/p2p_constants.h"
 #include "p2p/base/port.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportinfo.h"
-#include "pc/mediasession.h"
-#include "pc/sessiondescription.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_info.h"
+#include "pc/media_session.h"
+#include "pc/session_description.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/sslfingerprint.h"
-#include "rtc_base/stringencode.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_fingerprint.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/string_utils.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
 
 #ifdef WEBRTC_ANDROID
-#include "pc/test/androidtestinitializer.h"
+#include "pc/test/android_test_initializer.h"
 #endif
-#include "pc/webrtcsdp.h"
+#include "pc/webrtc_sdp.h"
 
 using cricket::AudioCodec;
 using cricket::AudioContentDescription;
diff --git a/pc/webrtc_session_description_factory.cc b/pc/webrtc_session_description_factory.cc
index 754a06c..563632c 100644
--- a/pc/webrtc_session_description_factory.cc
+++ b/pc/webrtc_session_description_factory.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "pc/webrtcsessiondescriptionfactory.h"
+#include "pc/webrtc_session_description_factory.h"
 
 #include <stddef.h>
 #include <algorithm>
@@ -19,16 +19,16 @@
 #include "absl/memory/memory.h"
 #include "absl/types/optional.h"
 #include "api/jsep.h"
-#include "api/jsepsessiondescription.h"
-#include "api/rtcerror.h"
-#include "pc/sessiondescription.h"
+#include "api/jsep_session_description.h"
+#include "api/rtc_error.h"
+#include "pc/session_description.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
+#include "rtc_base/string_encode.h"
 
 using cricket::MediaSessionOptions;
 
diff --git a/pc/webrtc_session_description_factory.h b/pc/webrtc_session_description_factory.h
index 21859c7..a1bd0c7 100644
--- a/pc/webrtc_session_description_factory.h
+++ b/pc/webrtc_session_description_factory.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
-#define PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
+#ifndef PC_WEBRTC_SESSION_DESCRIPTION_FACTORY_H_
+#define PC_WEBRTC_SESSION_DESCRIPTION_FACTORY_H_
 
 #include <stdint.h>
 #include <memory>
@@ -17,16 +17,16 @@
 #include <string>
 
 #include "api/jsep.h"
-#include "api/peerconnectioninterface.h"
-#include "p2p/base/transportdescription.h"
-#include "p2p/base/transportdescriptionfactory.h"
-#include "pc/mediasession.h"
-#include "pc/peerconnectioninternal.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "api/peer_connection_interface.h"
+#include "p2p/base/transport_description.h"
+#include "p2p/base/transport_description_factory.h"
+#include "pc/media_session.h"
+#include "pc/peer_connection_internal.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/rtc_certificate_generator.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
@@ -159,4 +159,4 @@
 };
 }  // namespace webrtc
 
-#endif  // PC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
+#endif  // PC_WEBRTC_SESSION_DESCRIPTION_FACTORY_H_
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index f350028..4b3bdc3 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -90,18 +90,18 @@
 
   sources = [
     "bind.h",
-    "bitbuffer.cc",
-    "bitbuffer.h",
-    "bitrateallocationstrategy.cc",
-    "bitrateallocationstrategy.h",
+    "bit_buffer.cc",
+    "bit_buffer.h",
+    "bitrate_allocation_strategy.cc",
+    "bitrate_allocation_strategy.h",
     "buffer.h",
-    "bufferqueue.cc",
-    "bufferqueue.h",
-    "bytebuffer.cc",
-    "bytebuffer.h",
-    "byteorder.h",
-    "copyonwritebuffer.cc",
-    "copyonwritebuffer.h",
+    "buffer_queue.cc",
+    "buffer_queue.h",
+    "byte_buffer.cc",
+    "byte_buffer.h",
+    "byte_order.h",
+    "copy_on_write_buffer.cc",
+    "copy_on_write_buffer.h",
     "event_tracer.cc",
     "event_tracer.h",
     "file.cc",
@@ -119,7 +119,7 @@
     "numerics/moving_max_counter.h",
     "numerics/sample_counter.cc",
     "numerics/sample_counter.h",
-    "onetimeevent.h",
+    "one_time_event.h",
     "platform_file.cc",
     "platform_file.h",
     "race_checker.cc",
@@ -128,12 +128,12 @@
     "random.h",
     "rate_statistics.cc",
     "rate_statistics.h",
-    "ratetracker.cc",
-    "ratetracker.h",
+    "rate_tracker.cc",
+    "rate_tracker.h",
     "swap_queue.h",
     "template_util.h",
-    "timestampaligner.cc",
-    "timestampaligner.h",
+    "timestamp_aligner.cc",
+    "timestamp_aligner.h",
     "trace_event.h",
     "zero_memory.cc",
     "zero_memory.h",
@@ -184,7 +184,7 @@
   visibility = [ "*" ]
   sources = [
     "arraysize.h",
-    "constructormagic.h",
+    "constructor_magic.h",
     "format_macros.h",
     "stringize_macros.h",
     "thread_annotations.h",
@@ -214,9 +214,9 @@
 rtc_source_set("refcount") {
   visibility = [ "*" ]
   sources = [
-    "refcount.h",
-    "refcountedobject.h",
-    "refcounter.h",
+    "ref_count.h",
+    "ref_counted_object.h",
+    "ref_counter.h",
   ]
   deps = [
     ":atomicops",
@@ -226,8 +226,8 @@
 
 rtc_source_set("criticalsection") {
   sources = [
-    "criticalsection.cc",
-    "criticalsection.h",
+    "critical_section.cc",
+    "critical_section.h",
   ]
   deps = [
     ":atomicops",
@@ -342,7 +342,7 @@
 
 rtc_source_set("atomicops") {
   sources = [
-    "atomicops.h",
+    "atomic_ops.h",
   ]
 }
 
@@ -417,8 +417,8 @@
 rtc_source_set("timeutils") {
   visibility = [ "*" ]
   sources = [
-    "timeutils.cc",
-    "timeutils.h",
+    "time_utils.cc",
+    "time_utils.h",
   ]
   deps = [
     ":checks",
@@ -429,14 +429,14 @@
 
 rtc_source_set("stringutils") {
   sources = [
+    "string_encode.cc",
+    "string_encode.h",
     "string_to_number.cc",
     "string_to_number.h",
-    "stringencode.cc",
-    "stringencode.h",
+    "string_utils.cc",
+    "string_utils.h",
     "strings/string_builder.cc",
     "strings/string_builder.h",
-    "stringutils.cc",
-    "stringutils.h",
   ]
   deps = [
     ":checks",
@@ -728,8 +728,8 @@
   # TODO(bugs.webrtc.org/9987): This build target will soon contain
   #                             the following files:
   # sources = [
-  #   "nethelpers.cc",
-  #   "nethelpers.h",
+  #   "net_helpers.cc",
+  #   "net_helpers.h",
   # ]
 }
 
@@ -737,8 +737,8 @@
   # TODO(bugs.webrtc.org/9987): This build target will soon contain
   #                             the following files:
   # sources = [
-  #   "asyncresolverinterface.cc",
-  #   "asyncresolverinterface.h",
+  #   "async_resolver_interface.cc",
+  #   "async_resolver_interface.h",
   # ]
 }
 
@@ -746,8 +746,8 @@
   # TODO(bugs.webrtc.org/9987): This build target will soon contain
   #                             the following files:
   # sources = [
-  #   "ipaddress.cc",
-  #   "ipaddress.h",
+  #   "ip_address.cc",
+  #   "ip_address.h",
   # ]
 }
 
@@ -755,8 +755,8 @@
   # TODO(bugs.webrtc.org/9987): This build target will soon contain
   #                             the following files:
   # sources = [
-  #   "socketaddress.cc",
-  #   "socketaddress.h",
+  #   "socket_address.cc",
+  #   "socket_address.h",
   # ]
 }
 
@@ -764,8 +764,8 @@
   # TODO(bugs.webrtc.org/9987): This build target will soon contain
   #                             the following files:
   # sources = [
-  #   "nullsocketserver.cc",
-  #   "nullsocketserver.h",
+  #   "null_socket_server.cc",
+  #   "null_socket_server.h",
   # ]
 }
 
@@ -773,7 +773,7 @@
   # TODO(bugs.webrtc.org/9987): This build target will soon contain
   #                             the following files:
   # sources = [
-  #   "socketserver.h",
+  #   "socket_server.h",
   # ]
 }
 
@@ -785,16 +785,16 @@
   #   "asyncresolver.h",
   #   "defaultsocketserver.cc",
   #   "defaultsocketserver.h",
-  #   "messagehandler.cc",
-  #   "messagehandler.h",
-  #   "messagequeue.cc",
-  #   "messagequeue.h",
-  #   "networkmonitor.cc",
-  #   "networkmonitor.h",
-  #   "physicalsocketserver.cc",
-  #   "physicalsocketserver.h",
-  #   "signalthread.cc",
-  #   "signalthread.h",
+  #   "message_handler.cc",
+  #   "message_handler.h",
+  #   "message_queue.cc",
+  #   "message_queue.h",
+  #   "network_monitor.cc",
+  #   "network_monitor.h",
+  #   "physical_socket_server.cc",
+  #   "physical_socket_server.h",
+  #   "signal_thread.cc",
+  #   "signal_thread.h",
   #   "thread.cc",
   #   "thread.h",
   # ]
@@ -804,7 +804,7 @@
   # TODO(bugs.webrtc.org/9987): This build target will soon contain
   #                             the following files:
   # sources = [
-  #   "socketfactory.h",
+  #   "socket_factory.h",
   # ]
 }
 
@@ -812,8 +812,8 @@
   # TODO(bugs.webrtc.org/9987): This build target will soon contain
   #                             the following files:
   # sources = [
-  #   "asyncsocket.cc",
-  #   "asyncsocket.h",
+  #   "async_socket.cc",
+  #   "async_socket.h",
   # ]
 }
 
@@ -839,8 +839,8 @@
     # TODO(bugs.webrtc.org/9987): This build target will soon contain
     #                             the following files:
     # sources = [
-    #   "ifaddrs-android.cc",
-    #   "ifaddrs-android.h",
+    #   "ifaddrs_android.cc",
+    #   "ifaddrs_android.h",
     # ]
   }
 }
@@ -882,105 +882,105 @@
   all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
 
   sources = [
-    "asyncinvoker-inl.h",
-    "asyncinvoker.cc",
-    "asyncinvoker.h",
-    "asyncpacketsocket.cc",
-    "asyncpacketsocket.h",
-    "asyncresolverinterface.cc",
-    "asyncresolverinterface.h",
-    "asyncsocket.cc",
-    "asyncsocket.h",
-    "asynctcpsocket.cc",
-    "asynctcpsocket.h",
-    "asyncudpsocket.cc",
-    "asyncudpsocket.h",
+    "async_invoker.cc",
+    "async_invoker.h",
+    "async_invoker_inl.h",
+    "async_packet_socket.cc",
+    "async_packet_socket.h",
+    "async_resolver_interface.cc",
+    "async_resolver_interface.h",
+    "async_socket.cc",
+    "async_socket.h",
+    "async_tcp_socket.cc",
+    "async_tcp_socket.h",
+    "async_udp_socket.cc",
+    "async_udp_socket.h",
     "crc32.cc",
     "crc32.h",
-    "cryptstring.cc",
-    "cryptstring.h",
+    "crypt_string.cc",
+    "crypt_string.h",
     "data_rate_limiter.cc",
     "data_rate_limiter.h",
     "dscp.h",
-    "filerotatingstream.cc",
-    "filerotatingstream.h",
+    "file_rotating_stream.cc",
+    "file_rotating_stream.h",
     "gunit_prod.h",
     "helpers.cc",
     "helpers.h",
-    "httpcommon.cc",
-    "httpcommon.h",
-    "ipaddress.cc",
-    "ipaddress.h",
+    "http_common.cc",
+    "http_common.h",
+    "ip_address.cc",
+    "ip_address.h",
     "keep_ref_until_done.h",
     "key_derivation.cc",
     "key_derivation.h",
     "mdns_responder_interface.h",
-    "messagedigest.cc",
-    "messagedigest.h",
-    "messagehandler.cc",
-    "messagehandler.h",
-    "messagequeue.cc",
-    "messagequeue.h",
-    "nethelper.cc",
-    "nethelper.h",
-    "nethelpers.cc",
-    "nethelpers.h",
+    "message_digest.cc",
+    "message_digest.h",
+    "message_handler.cc",
+    "message_handler.h",
+    "message_queue.cc",
+    "message_queue.h",
+    "net_helper.cc",
+    "net_helper.h",
+    "net_helpers.cc",
+    "net_helpers.h",
     "network.cc",
     "network.h",
     "network_constants.h",
-    "networkmonitor.cc",
-    "networkmonitor.h",
-    "networkroute.h",
-    "nullsocketserver.cc",
-    "nullsocketserver.h",
+    "network_monitor.cc",
+    "network_monitor.h",
+    "network_route.h",
+    "null_socket_server.cc",
+    "null_socket_server.h",
     "openssl.h",
+    "openssl_adapter.cc",
+    "openssl_adapter.h",
+    "openssl_certificate.cc",
+    "openssl_certificate.h",
+    "openssl_digest.cc",
+    "openssl_digest.h",
+    "openssl_identity.cc",
+    "openssl_identity.h",
     "openssl_key_derivation_hkdf.cc",
     "openssl_key_derivation_hkdf.h",
-    "openssladapter.cc",
-    "openssladapter.h",
-    "opensslcertificate.cc",
-    "opensslcertificate.h",
-    "openssldigest.cc",
-    "openssldigest.h",
-    "opensslidentity.cc",
-    "opensslidentity.h",
-    "opensslsessioncache.cc",
-    "opensslsessioncache.h",
-    "opensslstreamadapter.cc",
-    "opensslstreamadapter.h",
-    "opensslutility.cc",
-    "opensslutility.h",
-    "physicalsocketserver.cc",
-    "physicalsocketserver.h",
-    "proxyinfo.cc",
-    "proxyinfo.h",
-    "rtccertificate.cc",
-    "rtccertificate.h",
-    "rtccertificategenerator.cc",
-    "rtccertificategenerator.h",
-    "signalthread.cc",
-    "signalthread.h",
-    "sigslotrepeater.h",
+    "openssl_session_cache.cc",
+    "openssl_session_cache.h",
+    "openssl_stream_adapter.cc",
+    "openssl_stream_adapter.h",
+    "openssl_utility.cc",
+    "openssl_utility.h",
+    "physical_socket_server.cc",
+    "physical_socket_server.h",
+    "proxy_info.cc",
+    "proxy_info.h",
+    "rtc_certificate.cc",
+    "rtc_certificate.h",
+    "rtc_certificate_generator.cc",
+    "rtc_certificate_generator.h",
+    "signal_thread.cc",
+    "signal_thread.h",
+    "sigslot_repeater.h",
     "socket.cc",
     "socket.h",
-    "socketadapters.cc",
-    "socketadapters.h",
-    "socketaddress.cc",
-    "socketaddress.h",
-    "socketaddresspair.cc",
-    "socketaddresspair.h",
-    "socketfactory.h",
-    "socketserver.h",
-    "ssladapter.cc",
-    "ssladapter.h",
-    "sslcertificate.cc",
-    "sslcertificate.h",
-    "sslfingerprint.cc",
-    "sslfingerprint.h",
-    "sslidentity.cc",
-    "sslidentity.h",
-    "sslstreamadapter.cc",
-    "sslstreamadapter.h",
+    "socket_adapters.cc",
+    "socket_adapters.h",
+    "socket_address.cc",
+    "socket_address.h",
+    "socket_address_pair.cc",
+    "socket_address_pair.h",
+    "socket_factory.h",
+    "socket_server.h",
+    "ssl_adapter.cc",
+    "ssl_adapter.h",
+    "ssl_certificate.cc",
+    "ssl_certificate.h",
+    "ssl_fingerprint.cc",
+    "ssl_fingerprint.h",
+    "ssl_identity.cc",
+    "ssl_identity.h",
+    "ssl_stream_adapter.cc",
+    "ssl_stream_adapter.h",
     "stream.cc",
     "stream.h",
     "thread.cc",
@@ -993,19 +993,19 @@
   } else {
     sources += [
       "callback.h",
-      "logsinks.cc",
-      "logsinks.h",
-      "numerics/mathutils.h",
-      "rollingaccumulator.h",
-      "sslroots.h",
+      "log_sinks.cc",
+      "log_sinks.h",
+      "numerics/math_utils.h",
+      "rolling_accumulator.h",
+      "ssl_roots.h",
     ]
 
     if (is_win) {
-      sources += [ "win32socketinit.h" ]
+      sources += [ "win32_socket_init.h" ]
       if (current_os != "winuwp") {
         sources += [
-          "win32socketserver.cc",
-          "win32socketserver.h",
+          "win32_socket_server.cc",
+          "win32_socket_server.h",
         ]
       }
     }
@@ -1019,8 +1019,8 @@
 
   if (is_android) {
     sources += [
-      "ifaddrs-android.cc",
-      "ifaddrs-android.h",
+      "ifaddrs_android.cc",
+      "ifaddrs_android.h",
     ]
 
     libs += [
@@ -1030,7 +1030,7 @@
   }
 
   if (is_ios || is_mac) {
-    sources += [ "macifaddrs_converter.cc" ]
+    sources += [ "mac_ifaddrs_converter.cc" ]
     deps += [ "system:cocoa_threading" ]
   }
 
@@ -1054,8 +1054,8 @@
 
   if (is_mac) {
     sources += [
-      "macutils.cc",
-      "macutils.h",
+      "mac_utils.cc",
+      "mac_utils.h",
     ]
   }
 
@@ -1063,8 +1063,8 @@
     sources += [
       "win32.cc",
       "win32.h",
-      "win32window.cc",
-      "win32window.h",
+      "win32_window.cc",
+      "win32_window.h",
     ]
 
     libs += [
@@ -1116,8 +1116,8 @@
 rtc_source_set("testclient") {
   testonly = true
   sources = [
-    "testclient.cc",
-    "testclient.h",
+    "test_client.cc",
+    "test_client.h",
   ]
   deps = [
     ":criticalsection",
@@ -1135,40 +1135,40 @@
   sources = [
     "cpu_time.cc",
     "cpu_time.h",
+    "fake_clock.cc",
+    "fake_clock.h",
     "fake_mdns_responder.h",
-    "fakeclock.cc",
-    "fakeclock.h",
-    "fakenetwork.h",
-    "fakesslidentity.cc",
-    "fakesslidentity.h",
-    "firewallsocketserver.cc",
-    "firewallsocketserver.h",
+    "fake_network.h",
+    "fake_ssl_identity.cc",
+    "fake_ssl_identity.h",
+    "firewall_socket_server.cc",
+    "firewall_socket_server.h",
     "memory_stream.cc",
     "memory_stream.h",
     "memory_usage.cc",
     "memory_usage.h",
-    "natserver.cc",
-    "natserver.h",
-    "natsocketfactory.cc",
-    "natsocketfactory.h",
-    "nattypes.cc",
-    "nattypes.h",
-    "proxyserver.cc",
-    "proxyserver.h",
+    "nat_server.cc",
+    "nat_server.h",
+    "nat_socket_factory.cc",
+    "nat_socket_factory.h",
+    "nat_types.cc",
+    "nat_types.h",
+    "proxy_server.cc",
+    "proxy_server.h",
     "server_socket_adapters.cc",
     "server_socket_adapters.h",
-    "sigslottester.h",
+    "sigslot_tester.h",
     "sigslottester.h.pump",
-    "socketstream.cc",
-    "socketstream.h",
-    "testbase64.h",
-    "testcertificateverifier.h",
-    "testechoserver.cc",
-    "testechoserver.h",
-    "testutils.cc",
-    "testutils.h",
-    "virtualsocketserver.cc",
-    "virtualsocketserver.h",
+    "socket_stream.cc",
+    "socket_stream.h",
+    "test_base64.h",
+    "test_certificate_verifier.h",
+    "test_echo_server.cc",
+    "test_echo_server.h",
+    "test_utils.cc",
+    "test_utils.h",
+    "virtual_socket_server.cc",
+    "virtual_socket_server.h",
   ]
   deps = [
     ":checks",
@@ -1235,12 +1235,12 @@
 
     sources = [
       "cpu_time_unittest.cc",
-      "filerotatingstream_unittest.cc",
-      "nullsocketserver_unittest.cc",
-      "physicalsocketserver_unittest.cc",
+      "file_rotating_stream_unittest.cc",
+      "null_socket_server_unittest.cc",
+      "physical_socket_server_unittest.cc",
+      "socket_address_unittest.cc",
       "socket_unittest.cc",
       "socket_unittest.h",
-      "socketaddress_unittest.cc",
     ]
     deps = [
       ":checks",
@@ -1257,7 +1257,7 @@
       "//third_party/abseil-cpp/absl/memory",
     ]
     if (is_win) {
-      sources += [ "win32socketserver_unittest.cc" ]
+      sources += [ "win32_socket_server_unittest.cc" ]
     }
   }
 
@@ -1267,17 +1267,17 @@
       cflags = [ "-fsanitize=memory" ]
     }
     sources = [
-      "atomicops_unittest.cc",
+      "atomic_ops_unittest.cc",
       "base64_unittest.cc",
       "bind_unittest.cc",
-      "bitbuffer_unittest.cc",
-      "bitrateallocationstrategy_unittest.cc",
+      "bit_buffer_unittest.cc",
+      "bitrate_allocation_strategy_unittest.cc",
+      "buffer_queue_unittest.cc",
       "buffer_unittest.cc",
-      "bufferqueue_unittest.cc",
-      "bytebuffer_unittest.cc",
-      "byteorder_unittest.cc",
-      "copyonwritebuffer_unittest.cc",
-      "criticalsection_unittest.cc",
+      "byte_buffer_unittest.cc",
+      "byte_order_unittest.cc",
+      "copy_on_write_buffer_unittest.cc",
+      "critical_section_unittest.cc",
       "event_tracer_unittest.cc",
       "event_unittest.cc",
       "file_unittest.cc",
@@ -1289,26 +1289,26 @@
       "numerics/safe_compare_unittest.cc",
       "numerics/safe_minmax_unittest.cc",
       "numerics/sample_counter_unittest.cc",
-      "onetimeevent_unittest.cc",
+      "one_time_event_unittest.cc",
       "platform_file_unittest.cc",
       "platform_thread_unittest.cc",
       "random_unittest.cc",
       "rate_limiter_unittest.cc",
       "rate_statistics_unittest.cc",
-      "ratetracker_unittest.cc",
-      "refcountedobject_unittest.cc",
+      "rate_tracker_unittest.cc",
+      "ref_counted_object_unittest.cc",
       "sanitizer_unittest.cc",
+      "string_encode_unittest.cc",
       "string_to_number_unittest.cc",
-      "stringencode_unittest.cc",
+      "string_utils_unittest.cc",
       "stringize_macros_unittest.cc",
       "strings/string_builder_unittest.cc",
-      "stringutils_unittest.cc",
       "swap_queue_unittest.cc",
       "thread_annotations_unittest.cc",
       "thread_checker_unittest.cc",
-      "timestampaligner_unittest.cc",
-      "timeutils_unittest.cc",
-      "virtualsocket_unittest.cc",
+      "time_utils_unittest.cc",
+      "timestamp_aligner_unittest.cc",
+      "virtual_socket_unittest.cc",
       "zero_memory_unittest.cc",
     ]
     if (is_win) {
@@ -1439,37 +1439,37 @@
       "crc32_unittest.cc",
       "data_rate_limiter_unittest.cc",
       "helpers_unittest.cc",
-      "ipaddress_unittest.cc",
+      "ip_address_unittest.cc",
       "memory_usage_unittest.cc",
-      "messagedigest_unittest.cc",
-      "messagequeue_unittest.cc",
+      "message_digest_unittest.cc",
+      "message_queue_unittest.cc",
       "nat_unittest.cc",
       "network_unittest.cc",
       "proxy_unittest.cc",
-      "rollingaccumulator_unittest.cc",
-      "rtccertificate_unittest.cc",
-      "rtccertificategenerator_unittest.cc",
-      "signalthread_unittest.cc",
-      "sigslottester_unittest.cc",
+      "rolling_accumulator_unittest.cc",
+      "rtc_certificate_generator_unittest.cc",
+      "rtc_certificate_unittest.cc",
+      "signal_thread_unittest.cc",
+      "sigslot_tester_unittest.cc",
       "stream_unittest.cc",
-      "testclient_unittest.cc",
+      "test_client_unittest.cc",
       "thread_unittest.cc",
     ]
     if (is_win) {
       sources += [
         "win32_unittest.cc",
-        "win32window_unittest.cc",
+        "win32_window_unittest.cc",
       ]
     }
     if (is_posix || is_fuchsia) {
       sources += [
+        "openssl_adapter_unittest.cc",
         "openssl_key_derivation_hkdf_unittest.cc",
-        "openssladapter_unittest.cc",
-        "opensslsessioncache_unittest.cc",
-        "opensslutility_unittest.cc",
-        "ssladapter_unittest.cc",
-        "sslidentity_unittest.cc",
-        "sslstreamadapter_unittest.cc",
+        "openssl_session_cache_unittest.cc",
+        "openssl_utility_unittest.cc",
+        "ssl_adapter_unittest.cc",
+        "ssl_identity_unittest.cc",
+        "ssl_stream_adapter_unittest.cc",
       ]
     }
     deps = [
diff --git a/rtc_base/async_invoker.cc b/rtc_base/async_invoker.cc
index f0dd188..8584bda 100644
--- a/rtc_base/async_invoker.cc
+++ b/rtc_base/async_invoker.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/async_invoker.h"
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
diff --git a/rtc_base/async_invoker.h b/rtc_base/async_invoker.h
index 474ec7c..805768b 100644
--- a/rtc_base/async_invoker.h
+++ b/rtc_base/async_invoker.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_ASYNCINVOKER_H_
-#define RTC_BASE_ASYNCINVOKER_H_
+#ifndef RTC_BASE_ASYNC_INVOKER_H_
+#define RTC_BASE_ASYNC_INVOKER_H_
 
 #include <atomic>
 #include <memory>
 #include <utility>
 
-#include "rtc_base/asyncinvoker-inl.h"
+#include "rtc_base/async_invoker_inl.h"
 #include "rtc_base/bind.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/event.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
@@ -262,4 +262,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_ASYNCINVOKER_H_
+#endif  // RTC_BASE_ASYNC_INVOKER_H_
diff --git a/rtc_base/async_invoker_inl.h b/rtc_base/async_invoker_inl.h
index 0dadc0f..50ee638 100644
--- a/rtc_base/async_invoker_inl.h
+++ b/rtc_base/async_invoker_inl.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_ASYNCINVOKER_INL_H_
-#define RTC_BASE_ASYNCINVOKER_INL_H_
+#ifndef RTC_BASE_ASYNC_INVOKER_INL_H_
+#define RTC_BASE_ASYNC_INVOKER_INL_H_
 
 #include "rtc_base/bind.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
@@ -58,4 +58,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_ASYNCINVOKER_INL_H_
+#endif  // RTC_BASE_ASYNC_INVOKER_INL_H_
diff --git a/rtc_base/async_packet_socket.cc b/rtc_base/async_packet_socket.cc
index 7e0cc8f..12afbeb 100644
--- a/rtc_base/async_packet_socket.cc
+++ b/rtc_base/async_packet_socket.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/nethelper.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/net_helper.h"
 
 namespace rtc {
 
diff --git a/rtc_base/async_packet_socket.h b/rtc_base/async_packet_socket.h
index 0e31c2b..3afff3b 100644
--- a/rtc_base/async_packet_socket.h
+++ b/rtc_base/async_packet_socket.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_ASYNCPACKETSOCKET_H_
-#define RTC_BASE_ASYNCPACKETSOCKET_H_
+#ifndef RTC_BASE_ASYNC_PACKET_SOCKET_H_
+#define RTC_BASE_ASYNC_PACKET_SOCKET_H_
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/dscp.h"
 #include "rtc_base/network/sent_packet.h"
 #include "rtc_base/socket.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 
@@ -140,4 +140,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_ASYNCPACKETSOCKET_H_
+#endif  // RTC_BASE_ASYNC_PACKET_SOCKET_H_
diff --git a/rtc_base/async_resolver_interface.cc b/rtc_base/async_resolver_interface.cc
index b2880f2..c8d6ab8 100644
--- a/rtc_base/async_resolver_interface.cc
+++ b/rtc_base/async_resolver_interface.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/asyncresolverinterface.h"
+#include "rtc_base/async_resolver_interface.h"
 
 namespace rtc {
 
diff --git a/rtc_base/async_resolver_interface.h b/rtc_base/async_resolver_interface.h
index f3df884..0f5e989 100644
--- a/rtc_base/async_resolver_interface.h
+++ b/rtc_base/async_resolver_interface.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_ASYNCRESOLVERINTERFACE_H_
-#define RTC_BASE_ASYNCRESOLVERINTERFACE_H_
+#ifndef RTC_BASE_ASYNC_RESOLVER_INTERFACE_H_
+#define RTC_BASE_ASYNC_RESOLVER_INTERFACE_H_
 
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace rtc {
diff --git a/rtc_base/async_socket.cc b/rtc_base/async_socket.cc
index acd5415..ab3f99e 100644
--- a/rtc_base/async_socket.cc
+++ b/rtc_base/async_socket.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/checks.h"
 
 namespace rtc {
diff --git a/rtc_base/async_socket.h b/rtc_base/async_socket.h
index c23929f..7b2f0e0 100644
--- a/rtc_base/async_socket.h
+++ b/rtc_base/async_socket.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_ASYNCSOCKET_H_
-#define RTC_BASE_ASYNCSOCKET_H_
+#ifndef RTC_BASE_ASYNC_SOCKET_H_
+#define RTC_BASE_ASYNC_SOCKET_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace rtc {
@@ -83,4 +83,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_ASYNCSOCKET_H_
+#endif  // RTC_BASE_ASYNC_SOCKET_H_
diff --git a/rtc_base/async_tcp_socket.cc b/rtc_base/async_tcp_socket.cc
index f15b524..148e459 100644
--- a/rtc_base/async_tcp_socket.cc
+++ b/rtc_base/async_tcp_socket.cc
@@ -8,19 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/asynctcpsocket.h"
+#include "rtc_base/async_tcp_socket.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <algorithm>
 #include <memory>
 
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/network/sent_packet.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h"  // for TimeMillis
+#include "rtc_base/time_utils.h"  // for TimeMillis
 
 #if defined(WEBRTC_POSIX)
 #include <errno.h>
diff --git a/rtc_base/async_tcp_socket.h b/rtc_base/async_tcp_socket.h
index 9567dd9..ae12a94 100644
--- a/rtc_base/async_tcp_socket.h
+++ b/rtc_base/async_tcp_socket.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_ASYNCTCPSOCKET_H_
-#define RTC_BASE_ASYNCTCPSOCKET_H_
+#ifndef RTC_BASE_ASYNC_TCP_SOCKET_H_
+#define RTC_BASE_ASYNC_TCP_SOCKET_H_
 
 #include <stddef.h>
 #include <memory>
 
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 
 namespace rtc {
 
@@ -109,4 +109,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_ASYNCTCPSOCKET_H_
+#endif  // RTC_BASE_ASYNC_TCP_SOCKET_H_
diff --git a/rtc_base/async_tcp_socket_unittest.cc b/rtc_base/async_tcp_socket_unittest.cc
index e8fd96c..69b5392 100644
--- a/rtc_base/async_tcp_socket_unittest.cc
+++ b/rtc_base/async_tcp_socket_unittest.cc
@@ -11,9 +11,9 @@
 #include <memory>
 #include <string>
 
-#include "rtc_base/asynctcpsocket.h"
+#include "rtc_base/async_tcp_socket.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 
 namespace rtc {
 
diff --git a/rtc_base/async_udp_socket.cc b/rtc_base/async_udp_socket.cc
index a83403b..8521910 100644
--- a/rtc_base/async_udp_socket.cc
+++ b/rtc_base/async_udp_socket.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_udp_socket.h"
 
 #include <stdint.h>
 #include <string>
@@ -17,7 +17,7 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/network/sent_packet.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/async_udp_socket.h b/rtc_base/async_udp_socket.h
index 030946d..237c88d 100644
--- a/rtc_base/async_udp_socket.h
+++ b/rtc_base/async_udp_socket.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_ASYNCUDPSOCKET_H_
-#define RTC_BASE_ASYNCUDPSOCKET_H_
+#ifndef RTC_BASE_ASYNC_UDP_SOCKET_H_
+#define RTC_BASE_ASYNC_UDP_SOCKET_H_
 
 #include <stddef.h>
 #include <memory>
 
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketfactory.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_factory.h"
 
 namespace rtc {
 
@@ -68,4 +68,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_ASYNCUDPSOCKET_H_
+#endif  // RTC_BASE_ASYNC_UDP_SOCKET_H_
diff --git a/rtc_base/async_udp_socket_unittest.cc b/rtc_base/async_udp_socket_unittest.cc
index 33b3d136..0484c3a 100644
--- a/rtc_base/async_udp_socket_unittest.cc
+++ b/rtc_base/async_udp_socket_unittest.cc
@@ -11,10 +11,10 @@
 #include <memory>
 #include <string>
 
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_udp_socket.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/virtual_socket_server.h"
 
 namespace rtc {
 
diff --git a/rtc_base/atomic_ops.h b/rtc_base/atomic_ops.h
index 16fa603..18a24a8 100644
--- a/rtc_base/atomic_ops.h
+++ b/rtc_base/atomic_ops.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_ATOMICOPS_H_
-#define RTC_BASE_ATOMICOPS_H_
+#ifndef RTC_BASE_ATOMIC_OPS_H_
+#define RTC_BASE_ATOMIC_OPS_H_
 
 #if defined(WEBRTC_WIN)
 // clang-format off
@@ -76,4 +76,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_ATOMICOPS_H_
+#endif  // RTC_BASE_ATOMIC_OPS_H_
diff --git a/rtc_base/base64_unittest.cc b/rtc_base/base64_unittest.cc
index 16dcd8d..dcc4d1b 100644
--- a/rtc_base/base64_unittest.cc
+++ b/rtc_base/base64_unittest.cc
@@ -15,7 +15,7 @@
 #include <algorithm>
 
 #include "rtc_base/logging.h"
-#include "rtc_base/testbase64.h"
+#include "rtc_base/test_base64.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/bind_unittest.cc b/rtc_base/bind_unittest.cc
index f0c6801..a62e547 100644
--- a/rtc_base/bind_unittest.cc
+++ b/rtc_base/bind_unittest.cc
@@ -11,8 +11,8 @@
 #include <string>
 
 #include "rtc_base/bind.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/bit_buffer.cc b/rtc_base/bit_buffer.cc
index be72d55..59b71fc 100644
--- a/rtc_base/bit_buffer.cc
+++ b/rtc_base/bit_buffer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 
 #include <algorithm>
 #include <limits>
diff --git a/rtc_base/bit_buffer.h b/rtc_base/bit_buffer.h
index ba96a12..b03677c 100644
--- a/rtc_base/bit_buffer.h
+++ b/rtc_base/bit_buffer.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_BITBUFFER_H_
-#define RTC_BASE_BITBUFFER_H_
+#ifndef RTC_BASE_BIT_BUFFER_H_
+#define RTC_BASE_BIT_BUFFER_H_
 
 #include <stddef.h>  // For size_t.
 #include <stdint.h>  // For integer types.
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace rtc {
 
@@ -123,4 +123,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_BITBUFFER_H_
+#endif  // RTC_BASE_BIT_BUFFER_H_
diff --git a/rtc_base/bit_buffer_unittest.cc b/rtc_base/bit_buffer_unittest.cc
index 0696c42..20c0049 100644
--- a/rtc_base/bit_buffer_unittest.cc
+++ b/rtc_base/bit_buffer_unittest.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/bitbuffer.h"
+#include "rtc_base/bit_buffer.h"
 
 #include <limits>
 
 #include "rtc_base/arraysize.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/bitrate_allocation_strategy.cc b/rtc_base/bitrate_allocation_strategy.cc
index 46e6674..af40af4 100644
--- a/rtc_base/bitrate_allocation_strategy.cc
+++ b/rtc_base/bitrate_allocation_strategy.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/bitrateallocationstrategy.h"
+#include "rtc_base/bitrate_allocation_strategy.h"
 
 #include <algorithm>
 #include <cstddef>
diff --git a/rtc_base/bitrate_allocation_strategy.h b/rtc_base/bitrate_allocation_strategy.h
index 13a4eee..fc54373 100644
--- a/rtc_base/bitrate_allocation_strategy.h
+++ b/rtc_base/bitrate_allocation_strategy.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_
-#define RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_
+#ifndef RTC_BASE_BITRATE_ALLOCATION_STRATEGY_H_
+#define RTC_BASE_BITRATE_ALLOCATION_STRATEGY_H_
 
 #include <stdint.h>
 #include <string>
@@ -117,4 +117,4 @@
 };
 }  // namespace rtc
 
-#endif  // RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_
+#endif  // RTC_BASE_BITRATE_ALLOCATION_STRATEGY_H_
diff --git a/rtc_base/bitrate_allocation_strategy_unittest.cc b/rtc_base/bitrate_allocation_strategy_unittest.cc
index 618a603..aea3966 100644
--- a/rtc_base/bitrate_allocation_strategy_unittest.cc
+++ b/rtc_base/bitrate_allocation_strategy_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/bitrateallocationstrategy.h"
+#include "rtc_base/bitrate_allocation_strategy.h"
 
 #include <cstdint>
 
diff --git a/rtc_base/buffer_queue.cc b/rtc_base/buffer_queue.cc
index 74f7a50..8f3ead9 100644
--- a/rtc_base/buffer_queue.cc
+++ b/rtc_base/buffer_queue.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/bufferqueue.h"
+#include "rtc_base/buffer_queue.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/rtc_base/buffer_queue.h b/rtc_base/buffer_queue.h
index 63f5182..bce3c8a 100644
--- a/rtc_base/buffer_queue.h
+++ b/rtc_base/buffer_queue.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_BUFFERQUEUE_H_
-#define RTC_BASE_BUFFERQUEUE_H_
+#ifndef RTC_BASE_BUFFER_QUEUE_H_
+#define RTC_BASE_BUFFER_QUEUE_H_
 
 #include <stddef.h>
 #include <deque>
 #include <vector>
 
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace rtc {
@@ -60,4 +60,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_BUFFERQUEUE_H_
+#endif  // RTC_BASE_BUFFER_QUEUE_H_
diff --git a/rtc_base/buffer_queue_unittest.cc b/rtc_base/buffer_queue_unittest.cc
index d21e22e..2a2f8cc 100644
--- a/rtc_base/buffer_queue_unittest.cc
+++ b/rtc_base/buffer_queue_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/bufferqueue.h"
+#include "rtc_base/buffer_queue.h"
 
 #include <string.h>
 
diff --git a/rtc_base/byte_buffer.cc b/rtc_base/byte_buffer.cc
index f8ce1a2..9f79120 100644
--- a/rtc_base/byte_buffer.cc
+++ b/rtc_base/byte_buffer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 
 #include <string.h>
 
diff --git a/rtc_base/byte_buffer.h b/rtc_base/byte_buffer.h
index 4d25c21..73e9040 100644
--- a/rtc_base/byte_buffer.h
+++ b/rtc_base/byte_buffer.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_BYTEBUFFER_H_
-#define RTC_BASE_BYTEBUFFER_H_
+#ifndef RTC_BASE_BYTE_BUFFER_H_
+#define RTC_BASE_BYTE_BUFFER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
 
 #include "rtc_base/buffer.h"
-#include "rtc_base/byteorder.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace rtc {
 
@@ -201,4 +201,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_BYTEBUFFER_H_
+#endif  // RTC_BASE_BYTE_BUFFER_H_
diff --git a/rtc_base/byte_buffer_unittest.cc b/rtc_base/byte_buffer_unittest.cc
index 8fb02ff..eafe670 100644
--- a/rtc_base/byte_buffer_unittest.cc
+++ b/rtc_base/byte_buffer_unittest.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 
 #include <string.h>
 
 #include "rtc_base/arraysize.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/byte_order.h b/rtc_base/byte_order.h
index 86546a5..2b50f0d 100644
--- a/rtc_base/byte_order.h
+++ b/rtc_base/byte_order.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_BYTEORDER_H_
-#define RTC_BASE_BYTEORDER_H_
+#ifndef RTC_BASE_BYTE_ORDER_H_
+#define RTC_BASE_BYTE_ORDER_H_
 
 #include <stdint.h>
 
@@ -177,4 +177,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_BYTEORDER_H_
+#endif  // RTC_BASE_BYTE_ORDER_H_
diff --git a/rtc_base/byte_order_unittest.cc b/rtc_base/byte_order_unittest.cc
index 7aac17b..82b5fe9 100644
--- a/rtc_base/byte_order_unittest.cc
+++ b/rtc_base/byte_order_unittest.cc
@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/callback.h b/rtc_base/callback.h
index 65b7c9c..bead5f4 100644
--- a/rtc_base/callback.h
+++ b/rtc_base/callback.h
@@ -62,8 +62,8 @@
 #ifndef RTC_BASE_CALLBACK_H_
 #define RTC_BASE_CALLBACK_H_
 
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace rtc {
diff --git a/rtc_base/callback.h.pump b/rtc_base/callback.h.pump
index 2c40eab..a8a3faa 100644
--- a/rtc_base/callback.h.pump
+++ b/rtc_base/callback.h.pump
@@ -57,8 +57,8 @@
 #ifndef RTC_BASE_CALLBACK_H_
 #define RTC_BASE_CALLBACK_H_
 
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace rtc {
diff --git a/rtc_base/callback_unittest.cc b/rtc_base/callback_unittest.cc
index 54480bd..8767295 100644
--- a/rtc_base/callback_unittest.cc
+++ b/rtc_base/callback_unittest.cc
@@ -12,7 +12,7 @@
 
 #include "rtc_base/bind.h"
 #include "rtc_base/keep_ref_until_done.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/cancelable_task_handle.cc b/rtc_base/cancelable_task_handle.cc
index 2267242..06c3e80 100644
--- a/rtc_base/cancelable_task_handle.cc
+++ b/rtc_base/cancelable_task_handle.cc
@@ -13,8 +13,8 @@
 #include <utility>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcounter.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counter.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
diff --git a/rtc_base/constructor_magic.h b/rtc_base/constructor_magic.h
index 6b6e83c..e63c2ff 100644
--- a/rtc_base/constructor_magic.h
+++ b/rtc_base/constructor_magic.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_CONSTRUCTORMAGIC_H_
-#define RTC_BASE_CONSTRUCTORMAGIC_H_
+#ifndef RTC_BASE_CONSTRUCTOR_MAGIC_H_
+#define RTC_BASE_CONSTRUCTOR_MAGIC_H_
 
 // Put this in the declarations for a class to be unassignable.
 #define RTC_DISALLOW_ASSIGN(TypeName) \
@@ -31,4 +31,4 @@
   TypeName() = delete;                               \
   RTC_DISALLOW_COPY_AND_ASSIGN(TypeName)
 
-#endif  // RTC_BASE_CONSTRUCTORMAGIC_H_
+#endif  // RTC_BASE_CONSTRUCTOR_MAGIC_H_
diff --git a/rtc_base/copy_on_write_buffer.cc b/rtc_base/copy_on_write_buffer.cc
index 8f5126a..de003f2 100644
--- a/rtc_base/copy_on_write_buffer.cc
+++ b/rtc_base/copy_on_write_buffer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 
 #include <stddef.h>
 
diff --git a/rtc_base/copy_on_write_buffer.h b/rtc_base/copy_on_write_buffer.h
index cc174df..e055f8d 100644
--- a/rtc_base/copy_on_write_buffer.h
+++ b/rtc_base/copy_on_write_buffer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_COPYONWRITEBUFFER_H_
-#define RTC_BASE_COPYONWRITEBUFFER_H_
+#ifndef RTC_BASE_COPY_ON_WRITE_BUFFER_H_
+#define RTC_BASE_COPY_ON_WRITE_BUFFER_H_
 
 #include <stdint.h>
 #include <algorithm>
@@ -20,7 +20,7 @@
 
 #include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace rtc {
@@ -243,4 +243,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_COPYONWRITEBUFFER_H_
+#endif  // RTC_BASE_COPY_ON_WRITE_BUFFER_H_
diff --git a/rtc_base/copy_on_write_buffer_unittest.cc b/rtc_base/copy_on_write_buffer_unittest.cc
index 9062611..fc569bd 100644
--- a/rtc_base/copy_on_write_buffer_unittest.cc
+++ b/rtc_base/copy_on_write_buffer_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 
 #include <cstdint>
 
diff --git a/rtc_base/cpu_time.cc b/rtc_base/cpu_time.cc
index 13a68db..b95bcb1 100644
--- a/rtc_base/cpu_time.cc
+++ b/rtc_base/cpu_time.cc
@@ -11,7 +11,7 @@
 #include "rtc_base/cpu_time.h"
 
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 #if defined(WEBRTC_LINUX)
 #include <time.h>
diff --git a/rtc_base/cpu_time_unittest.cc b/rtc_base/cpu_time_unittest.cc
index d362506..b5e0f67 100644
--- a/rtc_base/cpu_time_unittest.cc
+++ b/rtc_base/cpu_time_unittest.cc
@@ -11,7 +11,7 @@
 #include "rtc_base/cpu_time.h"
 
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/gtest.h"
 
diff --git a/rtc_base/critical_section.cc b/rtc_base/critical_section.cc
index 4e00be9..72a238f 100644
--- a/rtc_base/critical_section.cc
+++ b/rtc_base/critical_section.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 #include <time.h>
 
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/platform_thread_types.h"
 #include "rtc_base/system/unused.h"
diff --git a/rtc_base/critical_section.h b/rtc_base/critical_section.h
index f25e7d0..f744a5e 100644
--- a/rtc_base/critical_section.h
+++ b/rtc_base/critical_section.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_CRITICALSECTION_H_
-#define RTC_BASE_CRITICALSECTION_H_
+#ifndef RTC_BASE_CRITICAL_SECTION_H_
+#define RTC_BASE_CRITICAL_SECTION_H_
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/platform_thread_types.h"
 #include "rtc_base/thread_annotations.h"
 
@@ -157,4 +157,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_CRITICALSECTION_H_
+#endif  // RTC_BASE_CRITICAL_SECTION_H_
diff --git a/rtc_base/critical_section_unittest.cc b/rtc_base/critical_section_unittest.cc
index 6357736..e988046 100644
--- a/rtc_base/critical_section_unittest.cc
+++ b/rtc_base/critical_section_unittest.cc
@@ -16,13 +16,13 @@
 #include <vector>
 
 #include "rtc_base/arraysize.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/location.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/platform_thread.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
diff --git a/rtc_base/crypt_string.cc b/rtc_base/crypt_string.cc
index 2c7c0c7..3238255 100644
--- a/rtc_base/crypt_string.cc
+++ b/rtc_base/crypt_string.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/cryptstring.h"
+#include "rtc_base/crypt_string.h"
 
 namespace rtc {
 
diff --git a/rtc_base/crypt_string.h b/rtc_base/crypt_string.h
index d0e36cb..8aa757c 100644
--- a/rtc_base/crypt_string.h
+++ b/rtc_base/crypt_string.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_CRYPTSTRING_H_
-#define RTC_BASE_CRYPTSTRING_H_
+#ifndef RTC_BASE_CRYPT_STRING_H_
+#define RTC_BASE_CRYPT_STRING_H_
 
 #include <string.h>
 
@@ -83,4 +83,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_CRYPTSTRING_H_
+#endif  // RTC_BASE_CRYPT_STRING_H_
diff --git a/rtc_base/event_tracer.cc b/rtc_base/event_tracer.cc
index af88c9d..bcc8252 100644
--- a/rtc_base/event_tracer.cc
+++ b/rtc_base/event_tracer.cc
@@ -16,16 +16,16 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/platform_thread_types.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 
 // This is a guesstimate that should be enough in most cases.
diff --git a/rtc_base/fake_clock.cc b/rtc_base/fake_clock.cc
index f63b85c..6b7d96b 100644
--- a/rtc_base/fake_clock.cc
+++ b/rtc_base/fake_clock.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 
 #include "rtc_base/checks.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_queue.h"
 
 namespace rtc {
 
diff --git a/rtc_base/fake_clock.h b/rtc_base/fake_clock.h
index 5a0bbee..5ccf370 100644
--- a/rtc_base/fake_clock.h
+++ b/rtc_base/fake_clock.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_FAKECLOCK_H_
-#define RTC_BASE_FAKECLOCK_H_
+#ifndef RTC_BASE_FAKE_CLOCK_H_
+#define RTC_BASE_FAKE_CLOCK_H_
 
 #include <stdint.h>
 
 #include "api/units/time_delta.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 
@@ -72,4 +72,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_FAKECLOCK_H_
+#endif  // RTC_BASE_FAKE_CLOCK_H_
diff --git a/rtc_base/fake_network.h b/rtc_base/fake_network.h
index 98c6217..196d43e 100644
--- a/rtc_base/fake_network.h
+++ b/rtc_base/fake_network.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_FAKENETWORK_H_
-#define RTC_BASE_FAKENETWORK_H_
+#ifndef RTC_BASE_FAKE_NETWORK_H_
+#define RTC_BASE_FAKE_NETWORK_H_
 
 #include <memory>
 #include <string>
@@ -19,10 +19,10 @@
 #include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/fake_mdns_responder.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
 #include "rtc_base/network.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/thread.h"
 
 namespace rtc {
@@ -139,4 +139,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_FAKENETWORK_H_
+#endif  // RTC_BASE_FAKE_NETWORK_H_
diff --git a/rtc_base/fake_ssl_identity.cc b/rtc_base/fake_ssl_identity.cc
index 4799679..8607e0a 100644
--- a/rtc_base/fake_ssl_identity.cc
+++ b/rtc_base/fake_ssl_identity.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/fakesslidentity.h"
+#include "rtc_base/fake_ssl_identity.h"
 
 #include <string>
 #include <utility>
 
 #include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
 
 namespace rtc {
 
diff --git a/rtc_base/fake_ssl_identity.h b/rtc_base/fake_ssl_identity.h
index b19cbfb..c3a8d1f 100644
--- a/rtc_base/fake_ssl_identity.h
+++ b/rtc_base/fake_ssl_identity.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_FAKESSLIDENTITY_H_
-#define RTC_BASE_FAKESSLIDENTITY_H_
+#ifndef RTC_BASE_FAKE_SSL_IDENTITY_H_
+#define RTC_BASE_FAKE_SSL_IDENTITY_H_
 
 #include <memory>
 #include <vector>
 
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
 
 namespace rtc {
 
@@ -78,4 +78,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_FAKESSLIDENTITY_H_
+#endif  // RTC_BASE_FAKE_SSL_IDENTITY_H_
diff --git a/rtc_base/file.h b/rtc_base/file.h
index bc0974a..42428fa 100644
--- a/rtc_base/file.h
+++ b/rtc_base/file.h
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include <string>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/platform_file.h"
 
 namespace rtc {
diff --git a/rtc_base/file_rotating_stream.cc b/rtc_base/file_rotating_stream.cc
index fc87acb..01429b6 100644
--- a/rtc_base/file_rotating_stream.cc
+++ b/rtc_base/file_rotating_stream.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/filerotatingstream.h"
+#include "rtc_base/file_rotating_stream.h"
 
 #include <algorithm>
 #include <cstdio>
@@ -17,7 +17,7 @@
 
 #if defined(WEBRTC_WIN)
 #include <windows.h>
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 #else
 #include <dirent.h>
 #include <sys/stat.h>
diff --git a/rtc_base/file_rotating_stream.h b/rtc_base/file_rotating_stream.h
index 5560f3b..bda1ee1 100644
--- a/rtc_base/file_rotating_stream.h
+++ b/rtc_base/file_rotating_stream.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_FILEROTATINGSTREAM_H_
-#define RTC_BASE_FILEROTATINGSTREAM_H_
+#ifndef RTC_BASE_FILE_ROTATING_STREAM_H_
+#define RTC_BASE_FILE_ROTATING_STREAM_H_
 
 #include <stddef.h>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/stream.h"
 
 namespace rtc {
@@ -178,4 +178,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_FILEROTATINGSTREAM_H_
+#endif  // RTC_BASE_FILE_ROTATING_STREAM_H_
diff --git a/rtc_base/file_rotating_stream_unittest.cc b/rtc_base/file_rotating_stream_unittest.cc
index 63ddc96..214cde9 100644
--- a/rtc_base/file_rotating_stream_unittest.cc
+++ b/rtc_base/file_rotating_stream_unittest.cc
@@ -13,9 +13,9 @@
 #include <memory>
 
 #include "rtc_base/arraysize.h"
-#include "rtc_base/filerotatingstream.h"
+#include "rtc_base/file_rotating_stream.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/file_unittest.cc b/rtc_base/file_unittest.cc
index 151771b..bd3a61b 100644
--- a/rtc_base/file_unittest.cc
+++ b/rtc_base/file_unittest.cc
@@ -13,7 +13,7 @@
 
 #include "rtc_base/file.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 #if defined(WEBRTC_WIN)
 
diff --git a/rtc_base/firewall_socket_server.cc b/rtc_base/firewall_socket_server.cc
index 0552481..ec5a857 100644
--- a/rtc_base/firewall_socket_server.cc
+++ b/rtc_base/firewall_socket_server.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/firewallsocketserver.h"
+#include "rtc_base/firewall_socket_server.h"
 
 #include <errno.h>
 #include <stddef.h>
@@ -16,7 +16,7 @@
 #include <algorithm>
 #include <string>
 
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 
diff --git a/rtc_base/firewall_socket_server.h b/rtc_base/firewall_socket_server.h
index 64a4311..9536bd2 100644
--- a/rtc_base/firewall_socket_server.h
+++ b/rtc_base/firewall_socket_server.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_FIREWALLSOCKETSERVER_H_
-#define RTC_BASE_FIREWALLSOCKETSERVER_H_
+#ifndef RTC_BASE_FIREWALL_SOCKET_SERVER_H_
+#define RTC_BASE_FIREWALL_SOCKET_SERVER_H_
 
 #include <vector>
 
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_server.h"
 
 namespace rtc {
 
@@ -129,4 +129,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_FIREWALLSOCKETSERVER_H_
+#endif  // RTC_BASE_FIREWALL_SOCKET_SERVER_H_
diff --git a/rtc_base/flags.cc b/rtc_base/flags.cc
index bcce0da..6a87eb4 100644
--- a/rtc_base/flags.cc
+++ b/rtc_base/flags.cc
@@ -23,7 +23,7 @@
 #include <shellapi.h> // must come after windows.h
 // clang-format on
 
-#include "rtc_base/stringutils.h"  // For ToUtf8
+#include "rtc_base/string_utils.h"  // For ToUtf8
 #endif
 
 namespace {
diff --git a/rtc_base/flags.h b/rtc_base/flags.h
index a08bfd2..e152e2a 100644
--- a/rtc_base/flags.h
+++ b/rtc_base/flags.h
@@ -25,7 +25,7 @@
 #include "rtc_base/checks.h"
 
 #if defined(WEBRTC_WIN)
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #endif
 
 namespace rtc {
diff --git a/rtc_base/gunit.h b/rtc_base/gunit.h
index 7f23fbb..d499125 100644
--- a/rtc_base/gunit.h
+++ b/rtc_base/gunit.h
@@ -11,7 +11,7 @@
 #ifndef RTC_BASE_GUNIT_H_
 #define RTC_BASE_GUNIT_H_
 
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
diff --git a/rtc_base/http_common.cc b/rtc_base/http_common.cc
index 4640363..0456eea 100644
--- a/rtc_base/http_common.cc
+++ b/rtc_base/http_common.cc
@@ -25,11 +25,11 @@
 #include <vector>
 
 #include "absl/strings/match.h"
-#include "rtc_base/cryptstring.h"  // for CryptString
-#include "rtc_base/httpcommon.h"
+#include "rtc_base/crypt_string.h"  // for CryptString
+#include "rtc_base/http_common.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/third_party/base64/base64.h"  // for Base64
 #include "rtc_base/zero_memory.h"                // for ExplicitZeroMemory
diff --git a/rtc_base/http_common.h b/rtc_base/http_common.h
index fbad280..edf161f 100644
--- a/rtc_base/http_common.h
+++ b/rtc_base/http_common.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_HTTPCOMMON_H_
-#define RTC_BASE_HTTPCOMMON_H_
+#ifndef RTC_BASE_HTTP_COMMON_H_
+#define RTC_BASE_HTTP_COMMON_H_
 
 #include <string>
 
@@ -49,4 +49,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_HTTPCOMMON_H_
+#endif  // RTC_BASE_HTTP_COMMON_H_
diff --git a/rtc_base/ifaddrs_android.cc b/rtc_base/ifaddrs_android.cc
index cc6cdab..94b8669 100644
--- a/rtc_base/ifaddrs_android.cc
+++ b/rtc_base/ifaddrs_android.cc
@@ -9,7 +9,7 @@
  */
 
 #if defined(WEBRTC_ANDROID)
-#include "rtc_base/ifaddrs-android.h"
+#include "rtc_base/ifaddrs_android.h"
 #include <errno.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
diff --git a/rtc_base/ifaddrs_converter.h b/rtc_base/ifaddrs_converter.h
index 35bef5b..bd6957d 100644
--- a/rtc_base/ifaddrs_converter.h
+++ b/rtc_base/ifaddrs_converter.h
@@ -12,12 +12,12 @@
 #define RTC_BASE_IFADDRS_CONVERTER_H_
 
 #if defined(WEBRTC_ANDROID)
-#include "rtc_base/ifaddrs-android.h"
+#include "rtc_base/ifaddrs_android.h"
 #else
 #include <ifaddrs.h>
 #endif  // WEBRTC_ANDROID
 
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 
 namespace rtc {
 
diff --git a/rtc_base/ip_address.cc b/rtc_base/ip_address.cc
index 027a7b2..ff0be13 100644
--- a/rtc_base/ip_address.cc
+++ b/rtc_base/ip_address.cc
@@ -20,10 +20,10 @@
 #include <netdb.h>
 #endif
 
-#include "rtc_base/byteorder.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/byte_order.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/string_utils.h"
 
 #if defined(WEBRTC_WIN)
 #include "rtc_base/win32.h"
diff --git a/rtc_base/ip_address.h b/rtc_base/ip_address.h
index 8189d1f..49dea68 100644
--- a/rtc_base/ip_address.h
+++ b/rtc_base/ip_address.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_IPADDRESS_H_
-#define RTC_BASE_IPADDRESS_H_
+#ifndef RTC_BASE_IP_ADDRESS_H_
+#define RTC_BASE_IP_ADDRESS_H_
 
 #if defined(WEBRTC_POSIX)
 #include <arpa/inet.h>
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <string>
 
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #if defined(WEBRTC_WIN)
 #include "rtc_base/win32.h"
 #endif
@@ -189,4 +189,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_IPADDRESS_H_
+#endif  // RTC_BASE_IP_ADDRESS_H_
diff --git a/rtc_base/ip_address_unittest.cc b/rtc_base/ip_address_unittest.cc
index 6ac1a40..c93244d 100644
--- a/rtc_base/ip_address_unittest.cc
+++ b/rtc_base/ip_address_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 
 #include "test/gtest.h"
 
diff --git a/rtc_base/keep_ref_until_done.h b/rtc_base/keep_ref_until_done.h
index 9ba0e87..feb1e90 100644
--- a/rtc_base/keep_ref_until_done.h
+++ b/rtc_base/keep_ref_until_done.h
@@ -13,7 +13,7 @@
 
 #include "rtc_base/bind.h"
 #include "rtc_base/callback.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace rtc {
diff --git a/rtc_base/key_derivation.h b/rtc_base/key_derivation.h
index d98c667..f35e7ff 100644
--- a/rtc_base/key_derivation.h
+++ b/rtc_base/key_derivation.h
@@ -18,7 +18,7 @@
 #include "absl/types/optional.h"
 #include "api/array_view.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace rtc {
 
diff --git a/rtc_base/log_sinks.cc b/rtc_base/log_sinks.cc
index c01bafb..db12e9f 100644
--- a/rtc_base/log_sinks.cc
+++ b/rtc_base/log_sinks.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/logsinks.h"
+#include "rtc_base/log_sinks.h"
 
 #include <string.h>
 #include <cstdio>
diff --git a/rtc_base/log_sinks.h b/rtc_base/log_sinks.h
index d0867a2..9e35748 100644
--- a/rtc_base/log_sinks.h
+++ b/rtc_base/log_sinks.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_LOGSINKS_H_
-#define RTC_BASE_LOGSINKS_H_
+#ifndef RTC_BASE_LOG_SINKS_H_
+#define RTC_BASE_LOG_SINKS_H_
 
 #include <stddef.h>
 #include <memory>
 #include <string>
 
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/filerotatingstream.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/file_rotating_stream.h"
 #include "rtc_base/logging.h"
 
 namespace rtc {
@@ -69,4 +69,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_LOGSINKS_H_
+#endif  // RTC_BASE_LOG_SINKS_H_
diff --git a/rtc_base/logging.cc b/rtc_base/logging.cc
index f7b0627..74128fb 100644
--- a/rtc_base/logging.cc
+++ b/rtc_base/logging.cc
@@ -35,14 +35,14 @@
 #include <vector>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread_types.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/string_utils.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 namespace {
diff --git a/rtc_base/logging.h b/rtc_base/logging.h
index 6dd2648..b46aa2d 100644
--- a/rtc_base/logging.h
+++ b/rtc_base/logging.h
@@ -52,7 +52,7 @@
 #include <utility>
 
 #include "absl/strings/string_view.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/deprecation.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/system/inline.h"
diff --git a/rtc_base/logging_unittest.cc b/rtc_base/logging_unittest.cc
index a7945f2..bbeac44 100644
--- a/rtc_base/logging_unittest.cc
+++ b/rtc_base/logging_unittest.cc
@@ -18,7 +18,7 @@
 #include "rtc_base/event.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/stream.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/mac_utils.cc b/rtc_base/mac_utils.cc
index 67fb69c..390f183 100644
--- a/rtc_base/mac_utils.cc
+++ b/rtc_base/mac_utils.cc
@@ -15,7 +15,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/macutils.h"
+#include "rtc_base/mac_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/mac_utils.h b/rtc_base/mac_utils.h
index b22e5f9..ae97c3a 100644
--- a/rtc_base/mac_utils.h
+++ b/rtc_base/mac_utils.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_MACUTILS_H_
-#define RTC_BASE_MACUTILS_H_
+#ifndef RTC_BASE_MAC_UTILS_H_
+#define RTC_BASE_MAC_UTILS_H_
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <string>
@@ -19,4 +19,4 @@
 bool ToUtf16(const std::string& str8, CFStringRef* str16);
 }  // namespace rtc
 
-#endif  // RTC_BASE_MACUTILS_H_
+#endif  // RTC_BASE_MAC_UTILS_H_
diff --git a/rtc_base/mdns_responder_interface.h b/rtc_base/mdns_responder_interface.h
index 71938b2..96280a7 100644
--- a/rtc_base/mdns_responder_interface.h
+++ b/rtc_base/mdns_responder_interface.h
@@ -14,7 +14,7 @@
 #include <functional>
 #include <string>
 
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 
 namespace webrtc {
 
diff --git a/rtc_base/message_buffer_reader.h b/rtc_base/message_buffer_reader.h
index baba89e..32b8f33 100644
--- a/rtc_base/message_buffer_reader.h
+++ b/rtc_base/message_buffer_reader.h
@@ -11,7 +11,7 @@
 #ifndef RTC_BASE_MESSAGE_BUFFER_READER_H_
 #define RTC_BASE_MESSAGE_BUFFER_READER_H_
 
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 
 namespace webrtc {
 
diff --git a/rtc_base/message_digest.cc b/rtc_base/message_digest.cc
index 5a0d16a..b1d4a48 100644
--- a/rtc_base/message_digest.cc
+++ b/rtc_base/message_digest.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
 
 #include <string.h>
 #include <cstdint>
 #include <memory>
 
-#include "rtc_base/openssldigest.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/openssl_digest.h"
+#include "rtc_base/string_encode.h"
 
 namespace rtc {
 
diff --git a/rtc_base/message_digest.h b/rtc_base/message_digest.h
index 757f914..bbb22cf 100644
--- a/rtc_base/message_digest.h
+++ b/rtc_base/message_digest.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_MESSAGEDIGEST_H_
-#define RTC_BASE_MESSAGEDIGEST_H_
+#ifndef RTC_BASE_MESSAGE_DIGEST_H_
+#define RTC_BASE_MESSAGE_DIGEST_H_
 
 #include <stddef.h>
 #include <string>
@@ -126,4 +126,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_MESSAGEDIGEST_H_
+#endif  // RTC_BASE_MESSAGE_DIGEST_H_
diff --git a/rtc_base/message_digest_unittest.cc b/rtc_base/message_digest_unittest.cc
index 623fafb..85e9bbd 100644
--- a/rtc_base/message_digest_unittest.cc
+++ b/rtc_base/message_digest_unittest.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/message_handler.cc b/rtc_base/message_handler.cc
index 7376def..0e6c237 100644
--- a/rtc_base/message_handler.cc
+++ b/rtc_base/message_handler.cc
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
 
 namespace rtc {
 
diff --git a/rtc_base/message_handler.h b/rtc_base/message_handler.h
index 67a3103..015255e 100644
--- a/rtc_base/message_handler.h
+++ b/rtc_base/message_handler.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_MESSAGEHANDLER_H_
-#define RTC_BASE_MESSAGEHANDLER_H_
+#ifndef RTC_BASE_MESSAGE_HANDLER_H_
+#define RTC_BASE_MESSAGE_HANDLER_H_
 
 #include <utility>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace rtc {
 
@@ -67,4 +67,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_MESSAGEHANDLER_H_
+#endif  // RTC_BASE_MESSAGE_HANDLER_H_
diff --git a/rtc_base/message_queue.cc b/rtc_base/message_queue.cc
index 204952a..abb01b3 100644
--- a/rtc_base/message_queue.cc
+++ b/rtc_base/message_queue.cc
@@ -11,12 +11,12 @@
 #include <string>
 #include <utility>
 
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_queue.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 
 namespace rtc {
diff --git a/rtc_base/message_queue.h b/rtc_base/message_queue.h
index c1b9b5a..e484561 100644
--- a/rtc_base/message_queue.h
+++ b/rtc_base/message_queue.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_MESSAGEQUEUE_H_
-#define RTC_BASE_MESSAGEQUEUE_H_
+#ifndef RTC_BASE_MESSAGE_QUEUE_H_
+#define RTC_BASE_MESSAGE_QUEUE_H_
 
 #include <string.h>
 
@@ -19,12 +19,12 @@
 #include <queue>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/location.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread_annotations.h"
 
@@ -330,4 +330,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_MESSAGEQUEUE_H_
+#endif  // RTC_BASE_MESSAGE_QUEUE_H_
diff --git a/rtc_base/message_queue_unittest.cc b/rtc_base/message_queue_unittest.cc
index d04d753..657949c 100644
--- a/rtc_base/message_queue_unittest.cc
+++ b/rtc_base/message_queue_unittest.cc
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_queue.h"
 
 #include <functional>
 
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/bind.h"
 #include "rtc_base/event.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 namespace {
diff --git a/rtc_base/nat_server.cc b/rtc_base/nat_server.cc
index b005eca..2b614e8 100644
--- a/rtc_base/nat_server.cc
+++ b/rtc_base/nat_server.cc
@@ -12,9 +12,9 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/natsocketfactory.h"
-#include "rtc_base/socketadapters.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/nat_socket_factory.h"
+#include "rtc_base/socket_adapters.h"
 
 namespace rtc {
 
diff --git a/rtc_base/nat_server.h b/rtc_base/nat_server.h
index d16b537..46f01e9 100644
--- a/rtc_base/nat_server.h
+++ b/rtc_base/nat_server.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_NATSERVER_H_
-#define RTC_BASE_NATSERVER_H_
+#ifndef RTC_BASE_NAT_SERVER_H_
+#define RTC_BASE_NAT_SERVER_H_
 
 #include <map>
 #include <set>
 
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/nattypes.h"
-#include "rtc_base/proxyserver.h"
-#include "rtc_base/socketaddresspair.h"
-#include "rtc_base/socketfactory.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/nat_types.h"
+#include "rtc_base/proxy_server.h"
+#include "rtc_base/socket_address_pair.h"
+#include "rtc_base/socket_factory.h"
 #include "rtc_base/thread.h"
 
 namespace rtc {
@@ -126,4 +126,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_NATSERVER_H_
+#endif  // RTC_BASE_NAT_SERVER_H_
diff --git a/rtc_base/nat_socket_factory.cc b/rtc_base/nat_socket_factory.cc
index a707ce0..6d44651 100644
--- a/rtc_base/nat_socket_factory.cc
+++ b/rtc_base/nat_socket_factory.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/natsocketfactory.h"
+#include "rtc_base/nat_socket_factory.h"
 
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/virtual_socket_server.h"
 
 namespace rtc {
 
diff --git a/rtc_base/nat_socket_factory.h b/rtc_base/nat_socket_factory.h
index ecbd2f8..9b5cb5a 100644
--- a/rtc_base/nat_socket_factory.h
+++ b/rtc_base/nat_socket_factory.h
@@ -8,23 +8,23 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_NATSOCKETFACTORY_H_
-#define RTC_BASE_NATSOCKETFACTORY_H_
+#ifndef RTC_BASE_NAT_SOCKET_FACTORY_H_
+#define RTC_BASE_NAT_SOCKET_FACTORY_H_
 
 #include <stddef.h>
 #include <map>
 #include <memory>
 #include <set>
 
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/nattypes.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/nat_types.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketfactory.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_factory.h"
+#include "rtc_base/socket_server.h"
 
 namespace rtc {
 
@@ -175,4 +175,4 @@
                             SocketAddress* remote_addr);
 }  // namespace rtc
 
-#endif  // RTC_BASE_NATSOCKETFACTORY_H_
+#endif  // RTC_BASE_NAT_SOCKET_FACTORY_H_
diff --git a/rtc_base/nat_types.cc b/rtc_base/nat_types.cc
index a7af57d..50d7de0 100644
--- a/rtc_base/nat_types.cc
+++ b/rtc_base/nat_types.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/nattypes.h"
+#include "rtc_base/nat_types.h"
 
 #include "rtc_base/checks.h"
 
diff --git a/rtc_base/nat_types.h b/rtc_base/nat_types.h
index 1d816ac..60e7fbd 100644
--- a/rtc_base/nat_types.h
+++ b/rtc_base/nat_types.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_NATTYPES_H_
-#define RTC_BASE_NATTYPES_H_
+#ifndef RTC_BASE_NAT_TYPES_H_
+#define RTC_BASE_NAT_TYPES_H_
 
 namespace rtc {
 
@@ -44,4 +44,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_NATTYPES_H_
+#endif  // RTC_BASE_NAT_TYPES_H_
diff --git a/rtc_base/nat_unittest.cc b/rtc_base/nat_unittest.cc
index 731bba6..95504c2 100644
--- a/rtc_base/nat_unittest.cc
+++ b/rtc_base/nat_unittest.cc
@@ -15,26 +15,26 @@
 #include <vector>
 
 #include "absl/memory/memory.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/asynctcpsocket.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/async_tcp_socket.h"
+#include "rtc_base/async_udp_socket.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/natserver.h"
-#include "rtc_base/natsocketfactory.h"
-#include "rtc_base/nattypes.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/nat_server.h"
+#include "rtc_base/nat_socket_factory.h"
+#include "rtc_base/nat_types.h"
+#include "rtc_base/net_helpers.h"
 #include "rtc_base/network.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketfactory.h"
-#include "rtc_base/socketserver.h"
-#include "rtc_base/testclient.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_factory.h"
+#include "rtc_base/socket_server.h"
+#include "rtc_base/test_client.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/net_helper.cc b/rtc_base/net_helper.cc
index e654fe3..7dcb599 100644
--- a/rtc_base/net_helper.cc
+++ b/rtc_base/net_helper.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/nethelper.h"
+#include "rtc_base/net_helper.h"
 
 #include "rtc_base/checks.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 
 namespace cricket {
 
diff --git a/rtc_base/net_helper.h b/rtc_base/net_helper.h
index f956138..e42502b 100644
--- a/rtc_base/net_helper.h
+++ b/rtc_base/net_helper.h
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef RTC_BASE_NETHELPER_H_
-#define RTC_BASE_NETHELPER_H_
+#ifndef RTC_BASE_NET_HELPER_H_
+#define RTC_BASE_NET_HELPER_H_
 
 #include <string>
 
@@ -29,4 +29,4 @@
 
 }  // namespace cricket
 
-#endif  // RTC_BASE_NETHELPER_H_
+#endif  // RTC_BASE_NET_HELPER_H_
diff --git a/rtc_base/net_helpers.cc b/rtc_base/net_helpers.cc
index 1bba3b4..c662f1a 100644
--- a/rtc_base/net_helpers.cc
+++ b/rtc_base/net_helpers.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
 
 #include <memory>
 
@@ -19,14 +19,14 @@
 #endif
 #if defined(WEBRTC_POSIX) && !defined(__native_client__)
 #if defined(WEBRTC_ANDROID)
-#include "rtc_base/ifaddrs-android.h"
+#include "rtc_base/ifaddrs_android.h"
 #else
 #include <ifaddrs.h>
 #endif
 #endif  // defined(WEBRTC_POSIX) && !defined(__native_client__)
 
 #include "rtc_base/logging.h"
-#include "rtc_base/signalthread.h"
+#include "rtc_base/signal_thread.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"  // for signal_with_thread...
 
 namespace rtc {
diff --git a/rtc_base/net_helpers.h b/rtc_base/net_helpers.h
index 138f958..6f75318 100644
--- a/rtc_base/net_helpers.h
+++ b/rtc_base/net_helpers.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_NETHELPERS_H_
-#define RTC_BASE_NETHELPERS_H_
+#ifndef RTC_BASE_NET_HELPERS_H_
+#define RTC_BASE_NET_HELPERS_H_
 
 #if defined(WEBRTC_POSIX)
 #include <sys/socket.h>
@@ -19,10 +19,10 @@
 
 #include <vector>
 
-#include "rtc_base/asyncresolverinterface.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/signalthread.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/async_resolver_interface.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/signal_thread.h"
+#include "rtc_base/socket_address.h"
 
 namespace rtc {
 
@@ -60,4 +60,4 @@
 bool HasIPv6Enabled();
 }  // namespace rtc
 
-#endif  // RTC_BASE_NETHELPERS_H_
+#endif  // RTC_BASE_NET_HELPERS_H_
diff --git a/rtc_base/network.cc b/rtc_base/network.cc
index 5c7b019..c62c3ce 100644
--- a/rtc_base/network.cc
+++ b/rtc_base/network.cc
@@ -36,11 +36,11 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/network_monitor.h"
 #include "rtc_base/socket.h"  // includes something that makes windows happy
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/string_utils.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/thread.h"
 
 namespace rtc {
diff --git a/rtc_base/network.h b/rtc_base/network.h
index 8b1a5fc..b5772a8 100644
--- a/rtc_base/network.h
+++ b/rtc_base/network.h
@@ -19,10 +19,10 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/mdns_responder_interface.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/network_monitor.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 #if defined(WEBRTC_POSIX)
diff --git a/rtc_base/network_monitor.cc b/rtc_base/network_monitor.cc
index 0185eab..4eb5290 100644
--- a/rtc_base/network_monitor.cc
+++ b/rtc_base/network_monitor.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/network_monitor.h"
 
 #include <stdint.h>
 
diff --git a/rtc_base/network_monitor.h b/rtc_base/network_monitor.h
index 1ad7663..ed4464d 100644
--- a/rtc_base/network_monitor.h
+++ b/rtc_base/network_monitor.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_NETWORKMONITOR_H_
-#define RTC_BASE_NETWORKMONITOR_H_
+#ifndef RTC_BASE_NETWORK_MONITOR_H_
+#define RTC_BASE_NETWORK_MONITOR_H_
 
 #include "rtc_base/network_constants.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
@@ -120,4 +120,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_NETWORKMONITOR_H_
+#endif  // RTC_BASE_NETWORK_MONITOR_H_
diff --git a/rtc_base/network_route.h b/rtc_base/network_route.h
index be02731..6a8f183 100644
--- a/rtc_base/network_route.h
+++ b/rtc_base/network_route.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_NETWORKROUTE_H_
-#define RTC_BASE_NETWORKROUTE_H_
+#ifndef RTC_BASE_NETWORK_ROUTE_H_
+#define RTC_BASE_NETWORK_ROUTE_H_
 
 #include <stdint.h>
 
@@ -30,4 +30,4 @@
 };
 }  // namespace rtc
 
-#endif  // RTC_BASE_NETWORKROUTE_H_
+#endif  // RTC_BASE_NETWORK_ROUTE_H_
diff --git a/rtc_base/network_unittest.cc b/rtc_base/network_unittest.cc
index cf1cecc..b1a5da6 100644
--- a/rtc_base/network_unittest.cc
+++ b/rtc_base/network_unittest.cc
@@ -16,8 +16,8 @@
 #include <vector>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/network_monitor.h"
 #if defined(WEBRTC_POSIX)
 #include <net/if.h>
 #include <sys/types.h>
diff --git a/rtc_base/null_socket_server.cc b/rtc_base/null_socket_server.cc
index ec042dd..f446b3d 100644
--- a/rtc_base/null_socket_server.cc
+++ b/rtc_base/null_socket_server.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/nullsocketserver.h"
+#include "rtc_base/null_socket_server.h"
 #include "rtc_base/checks.h"
 
 namespace rtc {
diff --git a/rtc_base/null_socket_server.h b/rtc_base/null_socket_server.h
index 47a7fa6..da22c79 100644
--- a/rtc_base/null_socket_server.h
+++ b/rtc_base/null_socket_server.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_NULLSOCKETSERVER_H_
-#define RTC_BASE_NULLSOCKETSERVER_H_
+#ifndef RTC_BASE_NULL_SOCKET_SERVER_H_
+#define RTC_BASE_NULL_SOCKET_SERVER_H_
 
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/event.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_server.h"
 
 namespace rtc {
 
@@ -35,4 +35,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_NULLSOCKETSERVER_H_
+#endif  // RTC_BASE_NULL_SOCKET_SERVER_H_
diff --git a/rtc_base/null_socket_server_unittest.cc b/rtc_base/null_socket_server_unittest.cc
index 5d4a251..8268911 100644
--- a/rtc_base/null_socket_server_unittest.cc
+++ b/rtc_base/null_socket_server_unittest.cc
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/nullsocketserver.h"
+#include "rtc_base/null_socket_server.h"
 
 #include <stdint.h>
 #include <memory>
 
 #include "rtc_base/gunit.h"
 #include "rtc_base/location.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"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/numerics/math_utils.h b/rtc_base/numerics/math_utils.h
index 5036c8f..8a91958 100644
--- a/rtc_base/numerics/math_utils.h
+++ b/rtc_base/numerics/math_utils.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_NUMERICS_MATHUTILS_H_
-#define RTC_BASE_NUMERICS_MATHUTILS_H_
+#ifndef RTC_BASE_NUMERICS_MATH_UTILS_H_
+#define RTC_BASE_NUMERICS_MATH_UTILS_H_
 
 #include <math.h>
 #include <type_traits>
@@ -36,4 +36,4 @@
   return static_cast<unsigned_type>(x) - static_cast<unsigned_type>(y);
 }
 
-#endif  // RTC_BASE_NUMERICS_MATHUTILS_H_
+#endif  // RTC_BASE_NUMERICS_MATH_UTILS_H_
diff --git a/rtc_base/numerics/moving_max_counter.h b/rtc_base/numerics/moving_max_counter.h
index 6c6286d..ca956e9 100644
--- a/rtc_base/numerics/moving_max_counter.h
+++ b/rtc_base/numerics/moving_max_counter.h
@@ -19,7 +19,7 @@
 
 #include "absl/types/optional.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace rtc {
 
diff --git a/rtc_base/numerics/moving_median_filter.h b/rtc_base/numerics/moving_median_filter.h
index dba3cd2..b4d8741 100644
--- a/rtc_base/numerics/moving_median_filter.h
+++ b/rtc_base/numerics/moving_median_filter.h
@@ -15,7 +15,7 @@
 #include <list>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/numerics/percentile_filter.h"
 
 namespace webrtc {
diff --git a/rtc_base/numerics/percentile_filter_unittest.cc b/rtc_base/numerics/percentile_filter_unittest.cc
index 66121e4..a4cb317 100644
--- a/rtc_base/numerics/percentile_filter_unittest.cc
+++ b/rtc_base/numerics/percentile_filter_unittest.cc
@@ -14,7 +14,7 @@
 #include <cstdint>
 #include <random>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/numerics/percentile_filter.h"
 #include "test/gtest.h"
 
diff --git a/rtc_base/one_time_event.h b/rtc_base/one_time_event.h
index f649f15..c5ccbf6 100644
--- a/rtc_base/one_time_event.h
+++ b/rtc_base/one_time_event.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_ONETIMEEVENT_H_
-#define RTC_BASE_ONETIMEEVENT_H_
+#ifndef RTC_BASE_ONE_TIME_EVENT_H_
+#define RTC_BASE_ONE_TIME_EVENT_H_
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 // Provides a simple way to perform an operation (such as logging) one
@@ -57,4 +57,4 @@
 
 }  // namespace webrtc
 
-#endif  // RTC_BASE_ONETIMEEVENT_H_
+#endif  // RTC_BASE_ONE_TIME_EVENT_H_
diff --git a/rtc_base/one_time_event_unittest.cc b/rtc_base/one_time_event_unittest.cc
index 2334cb5..39fd8f9 100644
--- a/rtc_base/one_time_event_unittest.cc
+++ b/rtc_base/one_time_event_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/onetimeevent.h"
+#include "rtc_base/one_time_event.h"
 
 #include "test/gtest.h"
 
diff --git a/rtc_base/openssl_adapter.cc b/rtc_base/openssl_adapter.cc
index fcfa53b..dd2152e 100644
--- a/rtc_base/openssl_adapter.cc
+++ b/rtc_base/openssl_adapter.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/openssladapter.h"
+#include "rtc_base/openssl_adapter.h"
 
 #include <errno.h>
 
@@ -26,9 +26,9 @@
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/opensslcertificate.h"
-#include "rtc_base/opensslutility.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/openssl_certificate.h"
+#include "rtc_base/openssl_utility.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/thread.h"
 
 #ifndef OPENSSL_IS_BORINGSSL
diff --git a/rtc_base/openssl_adapter.h b/rtc_base/openssl_adapter.h
index 2e3a355..7219671 100644
--- a/rtc_base/openssl_adapter.h
+++ b/rtc_base/openssl_adapter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_OPENSSLADAPTER_H_
-#define RTC_BASE_OPENSSLADAPTER_H_
+#ifndef RTC_BASE_OPENSSL_ADAPTER_H_
+#define RTC_BASE_OPENSSL_ADAPTER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -17,18 +17,18 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/opensslidentity.h"
-#include "rtc_base/opensslsessioncache.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/openssl_identity.h"
+#include "rtc_base/openssl_session_cache.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
 
 namespace rtc {
 
@@ -189,4 +189,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_OPENSSLADAPTER_H_
+#endif  // RTC_BASE_OPENSSL_ADAPTER_H_
diff --git a/rtc_base/openssl_adapter_unittest.cc b/rtc_base/openssl_adapter_unittest.cc
index 4db00e5..2b171e6 100644
--- a/rtc_base/openssl_adapter_unittest.cc
+++ b/rtc_base/openssl_adapter_unittest.cc
@@ -13,9 +13,9 @@
 #include <vector>
 
 #include "absl/memory/memory.h"
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/openssladapter.h"
+#include "rtc_base/openssl_adapter.h"
 #include "test/gmock.h"
 
 namespace rtc {
diff --git a/rtc_base/openssl_certificate.cc b/rtc_base/openssl_certificate.cc
index 4e61b86..c22e5fb 100644
--- a/rtc_base/openssl_certificate.cc
+++ b/rtc_base/openssl_certificate.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/opensslcertificate.h"
+#include "rtc_base/openssl_certificate.h"
 
 #if defined(WEBRTC_WIN)
 // Must be included first before openssl headers.
@@ -24,10 +24,10 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/openssldigest.h"
-#include "rtc_base/opensslidentity.h"
-#include "rtc_base/opensslutility.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/openssl_digest.h"
+#include "rtc_base/openssl_identity.h"
+#include "rtc_base/openssl_utility.h"
 
 namespace rtc {
 namespace {
diff --git a/rtc_base/openssl_certificate.h b/rtc_base/openssl_certificate.h
index 088725c..9b61eee 100644
--- a/rtc_base/openssl_certificate.h
+++ b/rtc_base/openssl_certificate.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_OPENSSLCERTIFICATE_H_
-#define RTC_BASE_OPENSSLCERTIFICATE_H_
+#ifndef RTC_BASE_OPENSSL_CERTIFICATE_H_
+#define RTC_BASE_OPENSSL_CERTIFICATE_H_
 
 #include <openssl/ossl_typ.h>
 
@@ -18,9 +18,9 @@
 #include <string>
 
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
 
 namespace rtc {
 
@@ -75,4 +75,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_OPENSSLCERTIFICATE_H_
+#endif  // RTC_BASE_OPENSSL_CERTIFICATE_H_
diff --git a/rtc_base/openssl_digest.cc b/rtc_base/openssl_digest.cc
index da90b65..1cf5bc0 100644
--- a/rtc_base/openssl_digest.cc
+++ b/rtc_base/openssl_digest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/openssldigest.h"
+#include "rtc_base/openssl_digest.h"
 
 #include "rtc_base/checks.h"  // RTC_DCHECK, RTC_CHECK
 #include "rtc_base/openssl.h"
diff --git a/rtc_base/openssl_digest.h b/rtc_base/openssl_digest.h
index 82dc9a9..00f883c 100644
--- a/rtc_base/openssl_digest.h
+++ b/rtc_base/openssl_digest.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_OPENSSLDIGEST_H_
-#define RTC_BASE_OPENSSLDIGEST_H_
+#ifndef RTC_BASE_OPENSSL_DIGEST_H_
+#define RTC_BASE_OPENSSL_DIGEST_H_
 
 #include <openssl/base.h>
 #include <stddef.h>
 #include <string>
 
-#include "rtc_base/messagedigest.h"
+#include "rtc_base/message_digest.h"
 
 namespace rtc {
 
@@ -46,4 +46,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_OPENSSLDIGEST_H_
+#endif  // RTC_BASE_OPENSSL_DIGEST_H_
diff --git a/rtc_base/openssl_identity.cc b/rtc_base/openssl_identity.cc
index 9850c85..531c971 100644
--- a/rtc_base/openssl_identity.cc
+++ b/rtc_base/openssl_identity.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/opensslidentity.h"
+#include "rtc_base/openssl_identity.h"
 
 #include <memory>
 #include <utility>
@@ -32,7 +32,7 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/openssl.h"
-#include "rtc_base/opensslutility.h"
+#include "rtc_base/openssl_utility.h"
 
 namespace rtc {
 
diff --git a/rtc_base/openssl_identity.h b/rtc_base/openssl_identity.h
index fcf7deb..f0c4fb8 100644
--- a/rtc_base/openssl_identity.h
+++ b/rtc_base/openssl_identity.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_OPENSSLIDENTITY_H_
-#define RTC_BASE_OPENSSLIDENTITY_H_
+#ifndef RTC_BASE_OPENSSL_IDENTITY_H_
+#define RTC_BASE_OPENSSL_IDENTITY_H_
 
 #include <openssl/ossl_typ.h>
 
@@ -18,10 +18,10 @@
 #include <string>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/opensslcertificate.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/openssl_certificate.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
 
 namespace rtc {
 
@@ -98,4 +98,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_OPENSSLIDENTITY_H_
+#endif  // RTC_BASE_OPENSSL_IDENTITY_H_
diff --git a/rtc_base/openssl_key_derivation_hkdf.h b/rtc_base/openssl_key_derivation_hkdf.h
index ebf43cf..7f88252 100644
--- a/rtc_base/openssl_key_derivation_hkdf.h
+++ b/rtc_base/openssl_key_derivation_hkdf.h
@@ -11,7 +11,7 @@
 #ifndef RTC_BASE_OPENSSL_KEY_DERIVATION_HKDF_H_
 #define RTC_BASE_OPENSSL_KEY_DERIVATION_HKDF_H_
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/key_derivation.h"
 
 namespace rtc {
diff --git a/rtc_base/openssl_session_cache.cc b/rtc_base/openssl_session_cache.cc
index 2e37d55..f74dfea 100644
--- a/rtc_base/openssl_session_cache.cc
+++ b/rtc_base/openssl_session_cache.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/opensslsessioncache.h"
+#include "rtc_base/openssl_session_cache.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/openssl.h"
 
diff --git a/rtc_base/openssl_session_cache.h b/rtc_base/openssl_session_cache.h
index c74b7bf..e53e41a 100644
--- a/rtc_base/openssl_session_cache.h
+++ b/rtc_base/openssl_session_cache.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_OPENSSLSESSIONCACHE_H_
-#define RTC_BASE_OPENSSLSESSIONCACHE_H_
+#ifndef RTC_BASE_OPENSSL_SESSION_CACHE_H_
+#define RTC_BASE_OPENSSL_SESSION_CACHE_H_
 
 #include <openssl/ossl_typ.h>
 #include <map>
 #include <string>
 
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ssl_stream_adapter.h"
 
 #ifndef OPENSSL_IS_BORINGSSL
 typedef struct ssl_session_st SSL_SESSION;
@@ -64,4 +64,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_OPENSSLSESSIONCACHE_H_
+#endif  // RTC_BASE_OPENSSL_SESSION_CACHE_H_
diff --git a/rtc_base/openssl_session_cache_unittest.cc b/rtc_base/openssl_session_cache_unittest.cc
index 6489b2b..366fc26 100644
--- a/rtc_base/openssl_session_cache_unittest.cc
+++ b/rtc_base/openssl_session_cache_unittest.cc
@@ -16,7 +16,7 @@
 
 #include "rtc_base/gunit.h"
 #include "rtc_base/openssl.h"
-#include "rtc_base/opensslsessioncache.h"
+#include "rtc_base/openssl_session_cache.h"
 
 namespace rtc {
 
diff --git a/rtc_base/openssl_stream_adapter.cc b/rtc_base/openssl_stream_adapter.cc
index 2682013..0245976 100644
--- a/rtc_base/openssl_stream_adapter.cc
+++ b/rtc_base/openssl_stream_adapter.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/opensslstreamadapter.h"
+#include "rtc_base/openssl_stream_adapter.h"
 
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
@@ -29,13 +29,13 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/openssl.h"
-#include "rtc_base/openssladapter.h"
-#include "rtc_base/openssldigest.h"
-#include "rtc_base/opensslidentity.h"
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/openssl_adapter.h"
+#include "rtc_base/openssl_digest.h"
+#include "rtc_base/openssl_identity.h"
+#include "rtc_base/ssl_certificate.h"
 #include "rtc_base/stream.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace {
 bool g_use_time_callback_for_testing = false;
diff --git a/rtc_base/openssl_stream_adapter.h b/rtc_base/openssl_stream_adapter.h
index e012d17..40d1779 100644
--- a/rtc_base/openssl_stream_adapter.h
+++ b/rtc_base/openssl_stream_adapter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_OPENSSLSTREAMADAPTER_H_
-#define RTC_BASE_OPENSSLSTREAMADAPTER_H_
+#ifndef RTC_BASE_OPENSSL_STREAM_ADAPTER_H_
+#define RTC_BASE_OPENSSL_STREAM_ADAPTER_H_
 
 #include <openssl/ossl_typ.h>
 
@@ -20,10 +20,10 @@
 #include <vector>
 
 #include "rtc_base/buffer.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/opensslidentity.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/openssl_identity.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/stream.h"
 
 namespace rtc {
@@ -223,4 +223,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_OPENSSLSTREAMADAPTER_H_
+#endif  // RTC_BASE_OPENSSL_STREAM_ADAPTER_H_
diff --git a/rtc_base/openssl_utility.cc b/rtc_base/openssl_utility.cc
index a3f3347..9749912 100644
--- a/rtc_base/openssl_utility.cc
+++ b/rtc_base/openssl_utility.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/opensslutility.h"
+#include "rtc_base/openssl_utility.h"
 #if defined(WEBRTC_WIN)
 // Must be included first before openssl headers.
 #include "rtc_base/win32.h"  // NOLINT
@@ -24,9 +24,9 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/opensslcertificate.h"
+#include "rtc_base/openssl_certificate.h"
 #ifndef WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS
-#include "rtc_base/sslroots.h"
+#include "rtc_base/ssl_roots.h"
 #endif  // WEBRTC_EXCLUDE_BUILT_IN_SSL_ROOT_CERTS
 
 namespace rtc {
diff --git a/rtc_base/openssl_utility.h b/rtc_base/openssl_utility.h
index 77ed0b1..a2e49df 100644
--- a/rtc_base/openssl_utility.h
+++ b/rtc_base/openssl_utility.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_OPENSSLUTILITY_H_
-#define RTC_BASE_OPENSSLUTILITY_H_
+#ifndef RTC_BASE_OPENSSL_UTILITY_H_
+#define RTC_BASE_OPENSSL_UTILITY_H_
 
 #include <openssl/ossl_typ.h>
 #include <string>
@@ -37,4 +37,4 @@
 }  // namespace openssl
 }  // namespace rtc
 
-#endif  // RTC_BASE_OPENSSLUTILITY_H_
+#endif  // RTC_BASE_OPENSSL_UTILITY_H_
diff --git a/rtc_base/openssl_utility_unittest.cc b/rtc_base/openssl_utility_unittest.cc
index 2f952ae..9c9b971 100644
--- a/rtc_base/openssl_utility_unittest.cc
+++ b/rtc_base/openssl_utility_unittest.cc
@@ -32,8 +32,8 @@
 #include "rtc_base/gunit.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/openssl.h"
-#include "rtc_base/opensslutility.h"
-#include "rtc_base/sslroots.h"
+#include "rtc_base/openssl_utility.h"
+#include "rtc_base/ssl_roots.h"
 #include "test/gmock.h"
 
 namespace rtc {
diff --git a/rtc_base/physical_socket_server.cc b/rtc_base/physical_socket_server.cc
index 4ad2857..4845a73 100644
--- a/rtc_base/physical_socket_server.cc
+++ b/rtc_base/physical_socket_server.cc
@@ -7,7 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "rtc_base/physicalsocketserver.h"
+#include "rtc_base/physical_socket_server.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 #pragma warning(disable : 4786)
@@ -44,12 +44,12 @@
 #include <map>
 
 #include "rtc_base/arraysize.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/networkmonitor.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/network_monitor.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/time_utils.h"
 
 #if defined(WEBRTC_WIN)
 #define LAST_SYSTEM_ERROR (::GetLastError())
diff --git a/rtc_base/physical_socket_server.h b/rtc_base/physical_socket_server.h
index ee4f936..b2dfb3f 100644
--- a/rtc_base/physical_socket_server.h
+++ b/rtc_base/physical_socket_server.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_PHYSICALSOCKETSERVER_H_
-#define RTC_BASE_PHYSICALSOCKETSERVER_H_
+#ifndef RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
+#define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
 
 #if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX)
 #include <sys/epoll.h>
@@ -20,9 +20,9 @@
 #include <set>
 #include <vector>
 
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/socket_server.h"
 
 #if defined(WEBRTC_POSIX)
 typedef int SOCKET;
@@ -268,4 +268,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_PHYSICALSOCKETSERVER_H_
+#endif  // RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
diff --git a/rtc_base/physical_socket_server_unittest.cc b/rtc_base/physical_socket_server_unittest.cc
index c253cc66..aed8bf3 100644
--- a/rtc_base/physical_socket_server_unittest.cc
+++ b/rtc_base/physical_socket_server_unittest.cc
@@ -13,12 +13,12 @@
 #include <memory>
 
 #include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/networkmonitor.h"
-#include "rtc_base/physicalsocketserver.h"
+#include "rtc_base/network_monitor.h"
+#include "rtc_base/physical_socket_server.h"
 #include "rtc_base/socket_unittest.h"
-#include "rtc_base/testutils.h"
+#include "rtc_base/test_utils.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
 
diff --git a/rtc_base/platform_file.cc b/rtc_base/platform_file.cc
index baefb22..f9317d3 100644
--- a/rtc_base/platform_file.cc
+++ b/rtc_base/platform_file.cc
@@ -13,7 +13,7 @@
 #if defined(WEBRTC_WIN)
 #include <io.h>
 
-#include "rtc_base/stringutils.h"  // For ToUtf16
+#include "rtc_base/string_utils.h"  // For ToUtf16
 #else
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/rtc_base/platform_file_unittest.cc b/rtc_base/platform_file_unittest.cc
index 4e72400..396286a 100644
--- a/rtc_base/platform_file_unittest.cc
+++ b/rtc_base/platform_file_unittest.cc
@@ -10,7 +10,7 @@
 
 #include "rtc_base/platform_file.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/platform_thread.cc b/rtc_base/platform_thread.cc
index ba84b6a..1324069 100644
--- a/rtc_base/platform_thread.cc
+++ b/rtc_base/platform_thread.cc
@@ -17,9 +17,9 @@
 #include <time.h>
 #include <algorithm>
 
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 namespace {
diff --git a/rtc_base/platform_thread.h b/rtc_base/platform_thread.h
index 47c23dc..79ea7c1 100644
--- a/rtc_base/platform_thread.h
+++ b/rtc_base/platform_thread.h
@@ -16,7 +16,7 @@
 #endif
 #include <string>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/platform_thread_types.h"
 #include "rtc_base/thread_checker.h"
 
diff --git a/rtc_base/proxy_info.cc b/rtc_base/proxy_info.cc
index c394487..23d60af 100644
--- a/rtc_base/proxy_info.cc
+++ b/rtc_base/proxy_info.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/proxyinfo.h"
+#include "rtc_base/proxy_info.h"
 
 namespace rtc {
 
diff --git a/rtc_base/proxy_info.h b/rtc_base/proxy_info.h
index 1947669..6fded09 100644
--- a/rtc_base/proxy_info.h
+++ b/rtc_base/proxy_info.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_PROXYINFO_H_
-#define RTC_BASE_PROXYINFO_H_
+#ifndef RTC_BASE_PROXY_INFO_H_
+#define RTC_BASE_PROXY_INFO_H_
 
 #include <string>
-#include "rtc_base/cryptstring.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/crypt_string.h"
+#include "rtc_base/socket_address.h"
 
 namespace rtc {
 
@@ -35,4 +35,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_PROXYINFO_H_
+#endif  // RTC_BASE_PROXY_INFO_H_
diff --git a/rtc_base/proxy_server.cc b/rtc_base/proxy_server.cc
index 638ce0d..3420404 100644
--- a/rtc_base/proxy_server.cc
+++ b/rtc_base/proxy_server.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/proxyserver.h"
+#include "rtc_base/proxy_server.h"
 
 #include <stddef.h>
 #include <algorithm>
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/socketfactory.h"
+#include "rtc_base/socket_factory.h"
 
 namespace rtc {
 
diff --git a/rtc_base/proxy_server.h b/rtc_base/proxy_server.h
index 587a49c..ef4a3c7 100644
--- a/rtc_base/proxy_server.h
+++ b/rtc_base/proxy_server.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_PROXYSERVER_H_
-#define RTC_BASE_PROXYSERVER_H_
+#ifndef RTC_BASE_PROXY_SERVER_H_
+#define RTC_BASE_PROXY_SERVER_H_
 
 #include <list>
 #include <memory>
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/server_socket_adapters.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/stream.h"
 
 namespace rtc {
@@ -101,4 +101,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_PROXYSERVER_H_
+#endif  // RTC_BASE_PROXY_SERVER_H_
diff --git a/rtc_base/proxy_unittest.cc b/rtc_base/proxy_unittest.cc
index 0101893..229891d 100644
--- a/rtc_base/proxy_unittest.cc
+++ b/rtc_base/proxy_unittest.cc
@@ -11,11 +11,11 @@
 #include <memory>
 #include <string>
 #include "rtc_base/gunit.h"
-#include "rtc_base/proxyserver.h"
-#include "rtc_base/socketadapters.h"
-#include "rtc_base/testclient.h"
-#include "rtc_base/testechoserver.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/proxy_server.h"
+#include "rtc_base/socket_adapters.h"
+#include "rtc_base/test_client.h"
+#include "rtc_base/test_echo_server.h"
+#include "rtc_base/virtual_socket_server.h"
 
 using rtc::Socket;
 using rtc::SocketAddress;
diff --git a/rtc_base/random.h b/rtc_base/random.h
index e1c3bb7..31de6e1 100644
--- a/rtc_base/random.h
+++ b/rtc_base/random.h
@@ -15,7 +15,7 @@
 #include <limits>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/rtc_base/random_unittest.cc b/rtc_base/random_unittest.cc
index d05a16b..8f32657 100644
--- a/rtc_base/random_unittest.cc
+++ b/rtc_base/random_unittest.cc
@@ -13,7 +13,7 @@
 #include <limits>
 #include <vector>
 
-#include "rtc_base/numerics/mathutils.h"  // unsigned difference
+#include "rtc_base/numerics/math_utils.h"  // unsigned difference
 #include "rtc_base/random.h"
 #include "test/gtest.h"
 
diff --git a/rtc_base/rate_limiter.h b/rtc_base/rate_limiter.h
index 43ef88d..7eaa946 100644
--- a/rtc_base/rate_limiter.h
+++ b/rtc_base/rate_limiter.h
@@ -14,8 +14,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/rate_statistics.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/rtc_base/rate_tracker.cc b/rtc_base/rate_tracker.cc
index 7c96ca9..771dc6c 100644
--- a/rtc_base/rate_tracker.cc
+++ b/rtc_base/rate_tracker.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/ratetracker.h"
+#include "rtc_base/rate_tracker.h"
 
 #include <algorithm>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/rate_tracker.h b/rtc_base/rate_tracker.h
index ac9b88a..e9be522 100644
--- a/rtc_base/rate_tracker.h
+++ b/rtc_base/rate_tracker.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_RATETRACKER_H_
-#define RTC_BASE_RATETRACKER_H_
+#ifndef RTC_BASE_RATE_TRACKER_H_
+#define RTC_BASE_RATE_TRACKER_H_
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -66,4 +66,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_RATETRACKER_H_
+#endif  // RTC_BASE_RATE_TRACKER_H_
diff --git a/rtc_base/rate_tracker_unittest.cc b/rtc_base/rate_tracker_unittest.cc
index ff74a37..7a2c1ad 100644
--- a/rtc_base/rate_tracker_unittest.cc
+++ b/rtc_base/rate_tracker_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/ratetracker.h"
+#include "rtc_base/rate_tracker.h"
 
 #include "test/gtest.h"
 
diff --git a/rtc_base/ref_count.h b/rtc_base/ref_count.h
index fb0971c..d8d652a 100644
--- a/rtc_base/ref_count.h
+++ b/rtc_base/ref_count.h
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef RTC_BASE_REFCOUNT_H_
-#define RTC_BASE_REFCOUNT_H_
+#ifndef RTC_BASE_REF_COUNT_H_
+#define RTC_BASE_REF_COUNT_H_
 
 namespace rtc {
 
@@ -64,4 +64,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_REFCOUNT_H_
+#endif  // RTC_BASE_REF_COUNT_H_
diff --git a/rtc_base/ref_counted_object.h b/rtc_base/ref_counted_object.h
index 3b21004..ce18379 100644
--- a/rtc_base/ref_counted_object.h
+++ b/rtc_base/ref_counted_object.h
@@ -7,15 +7,15 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef RTC_BASE_REFCOUNTEDOBJECT_H_
-#define RTC_BASE_REFCOUNTEDOBJECT_H_
+#ifndef RTC_BASE_REF_COUNTED_OBJECT_H_
+#define RTC_BASE_REF_COUNTED_OBJECT_H_
 
 #include <type_traits>
 #include <utility>
 
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcounter.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counter.h"
 
 namespace rtc {
 
@@ -61,4 +61,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_REFCOUNTEDOBJECT_H_
+#endif  // RTC_BASE_REF_COUNTED_OBJECT_H_
diff --git a/rtc_base/ref_counted_object_unittest.cc b/rtc_base/ref_counted_object_unittest.cc
index 71ff426..9b475e2 100644
--- a/rtc_base/ref_counted_object_unittest.cc
+++ b/rtc_base/ref_counted_object_unittest.cc
@@ -12,8 +12,8 @@
 #include <string>
 #include <utility>
 
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/gtest.h"
 
diff --git a/rtc_base/ref_counter.h b/rtc_base/ref_counter.h
index 3906529..9b4d5ef 100644
--- a/rtc_base/ref_counter.h
+++ b/rtc_base/ref_counter.h
@@ -7,11 +7,11 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef RTC_BASE_REFCOUNTER_H_
-#define RTC_BASE_REFCOUNTER_H_
+#ifndef RTC_BASE_REF_COUNTER_H_
+#define RTC_BASE_REF_COUNTER_H_
 
-#include "rtc_base/atomicops.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/ref_count.h"
 
 namespace webrtc {
 namespace webrtc_impl {
@@ -49,4 +49,4 @@
 }  // namespace webrtc_impl
 }  // namespace webrtc
 
-#endif  // RTC_BASE_REFCOUNTER_H_
+#endif  // RTC_BASE_REF_COUNTER_H_
diff --git a/rtc_base/rolling_accumulator.h b/rtc_base/rolling_accumulator.h
index 9ad8159..dacceff 100644
--- a/rtc_base/rolling_accumulator.h
+++ b/rtc_base/rolling_accumulator.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_ROLLINGACCUMULATOR_H_
-#define RTC_BASE_ROLLINGACCUMULATOR_H_
+#ifndef RTC_BASE_ROLLING_ACCUMULATOR_H_
+#define RTC_BASE_ROLLING_ACCUMULATOR_H_
 
 #include <stddef.h>
 #include <algorithm>
 #include <vector>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace rtc {
 
@@ -164,4 +164,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_ROLLINGACCUMULATOR_H_
+#endif  // RTC_BASE_ROLLING_ACCUMULATOR_H_
diff --git a/rtc_base/rolling_accumulator_unittest.cc b/rtc_base/rolling_accumulator_unittest.cc
index 38716f2..7d5e70d 100644
--- a/rtc_base/rolling_accumulator_unittest.cc
+++ b/rtc_base/rolling_accumulator_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/rollingaccumulator.h"
+#include "rtc_base/rolling_accumulator.h"
 
 #include "test/gtest.h"
 
diff --git a/rtc_base/rtc_certificate.cc b/rtc_base/rtc_certificate.cc
index 875068f..46f6c31 100644
--- a/rtc_base/rtc_certificate.cc
+++ b/rtc_base/rtc_certificate.cc
@@ -10,13 +10,13 @@
 
 #include <memory>
 
-#include "rtc_base/rtccertificate.h"
+#include "rtc_base/rtc_certificate.h"
 
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/rtc_certificate.h b/rtc_base/rtc_certificate.h
index 561ea0f..a826af4 100644
--- a/rtc_base/rtc_certificate.h
+++ b/rtc_base/rtc_certificate.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_RTCCERTIFICATE_H_
-#define RTC_BASE_RTCCERTIFICATE_H_
+#ifndef RTC_BASE_RTC_CERTIFICATE_H_
+#define RTC_BASE_RTC_CERTIFICATE_H_
 
 #include <stdint.h>
 #include <memory>
 #include <string>
 
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace rtc {
@@ -90,4 +90,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_RTCCERTIFICATE_H_
+#endif  // RTC_BASE_RTC_CERTIFICATE_H_
diff --git a/rtc_base/rtc_certificate_generator.cc b/rtc_base/rtc_certificate_generator.cc
index 114b35c..08cd19946 100644
--- a/rtc_base/rtc_certificate_generator.cc
+++ b/rtc_base/rtc_certificate_generator.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/rtc_certificate_generator.h"
 
 #include <time.h>
 #include <algorithm>
@@ -17,10 +17,10 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/ssl_identity.h"
 
 namespace rtc {
 
diff --git a/rtc_base/rtc_certificate_generator.h b/rtc_base/rtc_certificate_generator.h
index fed075e..75688dd 100644
--- a/rtc_base/rtc_certificate_generator.h
+++ b/rtc_base/rtc_certificate_generator.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_RTCCERTIFICATEGENERATOR_H_
-#define RTC_BASE_RTCCERTIFICATEGENERATOR_H_
+#ifndef RTC_BASE_RTC_CERTIFICATE_GENERATOR_H_
+#define RTC_BASE_RTC_CERTIFICATE_GENERATOR_H_
 
 #include <stdint.h>
 
 #include "absl/types/optional.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/rtccertificate.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/rtc_certificate.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/ssl_identity.h"
 #include "rtc_base/thread.h"
 
 namespace rtc {
@@ -84,4 +84,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_RTCCERTIFICATEGENERATOR_H_
+#endif  // RTC_BASE_RTC_CERTIFICATE_GENERATOR_H_
diff --git a/rtc_base/rtc_certificate_generator_unittest.cc b/rtc_base/rtc_certificate_generator_unittest.cc
index e3c820b..69c8597 100644
--- a/rtc_base/rtc_certificate_generator_unittest.cc
+++ b/rtc_base/rtc_certificate_generator_unittest.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/rtc_certificate_generator.h"
 
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
 
diff --git a/rtc_base/rtc_certificate_unittest.cc b/rtc_base/rtc_certificate_unittest.cc
index f5a777c..ab242bb 100644
--- a/rtc_base/rtc_certificate_unittest.cc
+++ b/rtc_base/rtc_certificate_unittest.cc
@@ -14,9 +14,9 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/sequenced_task_checker.h b/rtc_base/sequenced_task_checker.h
index eb15198..e5443af 100644
--- a/rtc_base/sequenced_task_checker.h
+++ b/rtc_base/sequenced_task_checker.h
@@ -17,7 +17,7 @@
 #define ENABLE_SEQUENCED_TASK_CHECKER RTC_DCHECK_IS_ON
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/sequenced_task_checker_impl.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/rtc_base/sequenced_task_checker_impl.h b/rtc_base/sequenced_task_checker_impl.h
index 293b1ac..a850b94 100644
--- a/rtc_base/sequenced_task_checker_impl.h
+++ b/rtc_base/sequenced_task_checker_impl.h
@@ -11,7 +11,7 @@
 #ifndef RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_
 #define RTC_BASE_SEQUENCED_TASK_CHECKER_IMPL_H_
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_checker.h"
 
 namespace rtc {
diff --git a/rtc_base/sequenced_task_checker_unittest.cc b/rtc_base/sequenced_task_checker_unittest.cc
index 02918cd..b3df2fa 100644
--- a/rtc_base/sequenced_task_checker_unittest.cc
+++ b/rtc_base/sequenced_task_checker_unittest.cc
@@ -14,7 +14,7 @@
 #include <utility>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/event.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/task_queue.h"
diff --git a/rtc_base/server_socket_adapters.cc b/rtc_base/server_socket_adapters.cc
index 64f9bf0..887ca87 100644
--- a/rtc_base/server_socket_adapters.cc
+++ b/rtc_base/server_socket_adapters.cc
@@ -10,7 +10,7 @@
 
 #include <string>
 
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/server_socket_adapters.h"
 
 namespace rtc {
diff --git a/rtc_base/server_socket_adapters.h b/rtc_base/server_socket_adapters.h
index e741ba8..a534eea 100644
--- a/rtc_base/server_socket_adapters.h
+++ b/rtc_base/server_socket_adapters.h
@@ -11,7 +11,7 @@
 #ifndef RTC_BASE_SERVER_SOCKET_ADAPTERS_H_
 #define RTC_BASE_SERVER_SOCKET_ADAPTERS_H_
 
-#include "rtc_base/socketadapters.h"
+#include "rtc_base/socket_adapters.h"
 
 namespace rtc {
 
diff --git a/rtc_base/signal_thread.cc b/rtc_base/signal_thread.cc
index 5dd9387..84613db 100644
--- a/rtc_base/signal_thread.cc
+++ b/rtc_base/signal_thread.cc
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/signalthread.h"
+#include "rtc_base/signal_thread.h"
 
 #include <memory>
 
 #include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/socket_server.h"
 
 namespace rtc {
 
diff --git a/rtc_base/signal_thread.h b/rtc_base/signal_thread.h
index 9208e2c..9a20ad2 100644
--- a/rtc_base/signal_thread.h
+++ b/rtc_base/signal_thread.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SIGNALTHREAD_H_
-#define RTC_BASE_SIGNALTHREAD_H_
+#ifndef RTC_BASE_SIGNAL_THREAD_H_
+#define RTC_BASE_SIGNAL_THREAD_H_
 
 #include <string>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_annotations.h"
@@ -155,4 +155,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SIGNALTHREAD_H_
+#endif  // RTC_BASE_SIGNAL_THREAD_H_
diff --git a/rtc_base/signal_thread_unittest.cc b/rtc_base/signal_thread_unittest.cc
index eeae030..2bc0dda 100644
--- a/rtc_base/signal_thread_unittest.cc
+++ b/rtc_base/signal_thread_unittest.cc
@@ -10,10 +10,10 @@
 
 #include <memory>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/signalthread.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/signal_thread.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
 
diff --git a/rtc_base/sigslot_repeater.h b/rtc_base/sigslot_repeater.h
index 724e624..f562c5a 100644
--- a/rtc_base/sigslot_repeater.h
+++ b/rtc_base/sigslot_repeater.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SIGSLOTREPEATER_H__
-#define RTC_BASE_SIGSLOTREPEATER_H__
+#ifndef RTC_BASE_SIGSLOT_REPEATER_H__
+#define RTC_BASE_SIGSLOT_REPEATER_H__
 
 // repeaters are both signals and slots, which are designed as intermediate
 // pass-throughs for signals and slots which don't know about each other (for
@@ -53,4 +53,4 @@
 
 }  // namespace sigslot
 
-#endif  // RTC_BASE_SIGSLOTREPEATER_H__
+#endif  // RTC_BASE_SIGSLOT_REPEATER_H__
diff --git a/rtc_base/sigslot_tester.h b/rtc_base/sigslot_tester.h
index 73f4365..58be511 100644
--- a/rtc_base/sigslot_tester.h
+++ b/rtc_base/sigslot_tester.h
@@ -12,8 +12,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SIGSLOTTESTER_H_
-#define RTC_BASE_SIGSLOTTESTER_H_
+#ifndef RTC_BASE_SIGSLOT_TESTER_H_
+#define RTC_BASE_SIGSLOT_TESTER_H_
 
 // To generate sigslottester.h from sigslottester.h.pump, execute:
 // /home/build/google3/third_party/gtest/scripts/pump.py sigslottester.h.pump
@@ -38,7 +38,7 @@
 //   EXPECT_EQ("hello", capture);
 //   /* See unit-tests for more examples */
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace rtc {
@@ -237,4 +237,4 @@
 };
 }  // namespace rtc
 
-#endif  // RTC_BASE_SIGSLOTTESTER_H_
+#endif  // RTC_BASE_SIGSLOT_TESTER_H_
diff --git a/rtc_base/sigslot_tester_unittest.cc b/rtc_base/sigslot_tester_unittest.cc
index b8d5735..6c5b12e 100644
--- a/rtc_base/sigslot_tester_unittest.cc
+++ b/rtc_base/sigslot_tester_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/sigslottester.h"
+#include "rtc_base/sigslot_tester.h"
 
 #include <string>
 
diff --git a/rtc_base/sigslot_unittest.cc b/rtc_base/sigslot_unittest.cc
index d5d8e00..8edab7c 100644
--- a/rtc_base/sigslot_unittest.cc
+++ b/rtc_base/sigslot_unittest.cc
@@ -10,7 +10,7 @@
 
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
-#include "rtc_base/sigslotrepeater.h"
+#include "rtc_base/sigslot_repeater.h"
 #include "test/gtest.h"
 
 // This function, when passed a has_slots or signalx, will break the build if
diff --git a/rtc_base/sigslottester.h.pump b/rtc_base/sigslottester.h.pump
index 0c7c693..0a1f411 100755
--- a/rtc_base/sigslottester.h.pump
+++ b/rtc_base/sigslottester.h.pump
@@ -35,7 +35,7 @@
 //   EXPECT_EQ("hello", capture);
 //   /* See unit-tests for more examples */
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace rtc {
diff --git a/rtc_base/socket.h b/rtc_base/socket.h
index 84a0e84..a2b65d1 100644
--- a/rtc_base/socket.h
+++ b/rtc_base/socket.h
@@ -25,8 +25,8 @@
 #include "rtc_base/win32.h"
 #endif
 
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/socket_address.h"
 
 // Rather than converting errors into a private namespace,
 // Reuse the POSIX socket api errors. Note this depends on
diff --git a/rtc_base/socket_adapters.cc b/rtc_base/socket_adapters.cc
index 3fe88d5..2bcdcd8 100644
--- a/rtc_base/socket_adapters.cc
+++ b/rtc_base/socket_adapters.cc
@@ -31,11 +31,11 @@
 
 #include "absl/strings/match.h"
 #include "rtc_base/buffer.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/httpcommon.h"
+#include "rtc_base/http_common.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/socketadapters.h"
+#include "rtc_base/socket_adapters.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/zero_memory.h"
 
diff --git a/rtc_base/socket_adapters.h b/rtc_base/socket_adapters.h
index ca55909..99c9109 100644
--- a/rtc_base/socket_adapters.h
+++ b/rtc_base/socket_adapters.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SOCKETADAPTERS_H_
-#define RTC_BASE_SOCKETADAPTERS_H_
+#ifndef RTC_BASE_SOCKET_ADAPTERS_H_
+#define RTC_BASE_SOCKET_ADAPTERS_H_
 
 #include <string>
 
 #include "api/array_view.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/cryptstring.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/crypt_string.h"
 
 namespace rtc {
 
@@ -167,4 +167,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SOCKETADAPTERS_H_
+#endif  // RTC_BASE_SOCKET_ADAPTERS_H_
diff --git a/rtc_base/socket_address.cc b/rtc_base/socket_address.cc
index c91846d..3b22a05 100644
--- a/rtc_base/socket_address.cc
+++ b/rtc_base/socket_address.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/numerics/safe_conversions.h"
 
 #if defined(WEBRTC_POSIX)
@@ -26,10 +26,10 @@
 #include <unistd.h>
 #endif
 
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
 #include "rtc_base/strings/string_builder.h"
 
 #if defined(WEBRTC_WIN)
diff --git a/rtc_base/socket_address.h b/rtc_base/socket_address.h
index b1a52b9..342f5de 100644
--- a/rtc_base/socket_address.h
+++ b/rtc_base/socket_address.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SOCKETADDRESS_H_
-#define RTC_BASE_SOCKETADDRESS_H_
+#ifndef RTC_BASE_SOCKET_ADDRESS_H_
+#define RTC_BASE_SOCKET_ADDRESS_H_
 
 #include <string>
 #ifdef UNIT_TEST
 #include <ostream>  // no-presubmit-check TODO(webrtc:8982)
 #endif              // UNIT_TEST
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 
 #undef SetPort
 
@@ -199,4 +199,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SOCKETADDRESS_H_
+#endif  // RTC_BASE_SOCKET_ADDRESS_H_
diff --git a/rtc_base/socket_address_pair.cc b/rtc_base/socket_address_pair.cc
index 914ffd9..54f70ff 100644
--- a/rtc_base/socket_address_pair.cc
+++ b/rtc_base/socket_address_pair.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/socketaddresspair.h"
+#include "rtc_base/socket_address_pair.h"
 
 namespace rtc {
 
diff --git a/rtc_base/socket_address_pair.h b/rtc_base/socket_address_pair.h
index 6691386..f315e64 100644
--- a/rtc_base/socket_address_pair.h
+++ b/rtc_base/socket_address_pair.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SOCKETADDRESSPAIR_H_
-#define RTC_BASE_SOCKETADDRESSPAIR_H_
+#ifndef RTC_BASE_SOCKET_ADDRESS_PAIR_H_
+#define RTC_BASE_SOCKET_ADDRESS_PAIR_H_
 
 #include <stddef.h>
 
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 
 namespace rtc {
 
@@ -40,4 +40,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SOCKETADDRESSPAIR_H_
+#endif  // RTC_BASE_SOCKET_ADDRESS_PAIR_H_
diff --git a/rtc_base/socket_address_unittest.cc b/rtc_base/socket_address_unittest.cc
index d2420fc..14da8cb 100644
--- a/rtc_base/socket_address_unittest.cc
+++ b/rtc_base/socket_address_unittest.cc
@@ -14,8 +14,8 @@
 
 #include <string.h>
 
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/socket_address.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/socket_factory.h b/rtc_base/socket_factory.h
index 5a5cd04..7356745 100644
--- a/rtc_base/socket_factory.h
+++ b/rtc_base/socket_factory.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SOCKETFACTORY_H_
-#define RTC_BASE_SOCKETFACTORY_H_
+#ifndef RTC_BASE_SOCKET_FACTORY_H_
+#define RTC_BASE_SOCKET_FACTORY_H_
 
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/socket.h"
 
 namespace rtc {
@@ -30,4 +30,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SOCKETFACTORY_H_
+#endif  // RTC_BASE_SOCKET_FACTORY_H_
diff --git a/rtc_base/socket_server.h b/rtc_base/socket_server.h
index e29884e..348d099 100644
--- a/rtc_base/socket_server.h
+++ b/rtc_base/socket_server.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SOCKETSERVER_H_
-#define RTC_BASE_SOCKETSERVER_H_
+#ifndef RTC_BASE_SOCKET_SERVER_H_
+#define RTC_BASE_SOCKET_SERVER_H_
 
 #include <memory>
-#include "rtc_base/socketfactory.h"
+#include "rtc_base/socket_factory.h"
 
 namespace rtc {
 
@@ -59,4 +59,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SOCKETSERVER_H_
+#endif  // RTC_BASE_SOCKET_SERVER_H_
diff --git a/rtc_base/socket_stream.cc b/rtc_base/socket_stream.cc
index 8978404..e93d6aa 100644
--- a/rtc_base/socket_stream.cc
+++ b/rtc_base/socket_stream.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/socketstream.h"
+#include "rtc_base/socket_stream.h"
 
 #include "rtc_base/checks.h"
 #include "rtc_base/socket.h"
diff --git a/rtc_base/socket_stream.h b/rtc_base/socket_stream.h
index 6047fcd..f9875fe 100644
--- a/rtc_base/socket_stream.h
+++ b/rtc_base/socket_stream.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SOCKETSTREAM_H_
-#define RTC_BASE_SOCKETSTREAM_H_
+#ifndef RTC_BASE_SOCKET_STREAM_H_
+#define RTC_BASE_SOCKET_STREAM_H_
 
 #include <stddef.h>
 
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/stream.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
@@ -61,4 +61,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SOCKETSTREAM_H_
+#endif  // RTC_BASE_SOCKET_STREAM_H_
diff --git a/rtc_base/socket_unittest.cc b/rtc_base/socket_unittest.cc
index 79259a5..3166ec7 100644
--- a/rtc_base/socket_unittest.cc
+++ b/rtc_base/socket_unittest.cc
@@ -15,25 +15,25 @@
 
 #include "absl/memory/memory.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/async_udp_socket.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/net_helpers.h"
 #include "rtc_base/socket.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/socket_unittest.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/socketserver.h"
-#include "rtc_base/testclient.h"
-#include "rtc_base/testutils.h"
+#include "rtc_base/test_client.h"
+#include "rtc_base/test_utils.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/ssl_adapter.cc b/rtc_base/ssl_adapter.cc
index e091f00..9d414ea 100644
--- a/rtc_base/ssl_adapter.cc
+++ b/rtc_base/ssl_adapter.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
 
-#include "rtc_base/openssladapter.h"
+#include "rtc_base/openssl_adapter.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/rtc_base/ssl_adapter.h b/rtc_base/ssl_adapter.h
index 7ebedca..240899f 100644
--- a/rtc_base/ssl_adapter.h
+++ b/rtc_base/ssl_adapter.h
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SSLADAPTER_H_
-#define RTC_BASE_SSLADAPTER_H_
+#ifndef RTC_BASE_SSL_ADAPTER_H_
+#define RTC_BASE_SSL_ADAPTER_H_
 
 #include <string>
 #include <vector>
 
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
 
 namespace rtc {
 
@@ -103,4 +103,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SSLADAPTER_H_
+#endif  // RTC_BASE_SSL_ADAPTER_H_
diff --git a/rtc_base/ssl_adapter_unittest.cc b/rtc_base/ssl_adapter_unittest.cc
index c84c668..9774c0a 100644
--- a/rtc_base/ssl_adapter_unittest.cc
+++ b/rtc_base/ssl_adapter_unittest.cc
@@ -14,15 +14,15 @@
 
 #include "absl/memory/memory.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/socketstream.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/socket_stream.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/stream.h"
-#include "rtc_base/stringencode.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gmock.h"
 
 using ::testing::_;
diff --git a/rtc_base/ssl_certificate.cc b/rtc_base/ssl_certificate.cc
index 934848f..8f6cfa2 100644
--- a/rtc_base/ssl_certificate.cc
+++ b/rtc_base/ssl_certificate.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/ssl_certificate.h"
 
 #include <algorithm>
 #include <string>
@@ -16,8 +16,8 @@
 
 #include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/opensslcertificate.h"
-#include "rtc_base/sslfingerprint.h"
+#include "rtc_base/openssl_certificate.h"
+#include "rtc_base/ssl_fingerprint.h"
 #include "rtc_base/third_party/base64/base64.h"
 
 namespace rtc {
diff --git a/rtc_base/ssl_certificate.h b/rtc_base/ssl_certificate.h
index eb81c20..fad1404 100644
--- a/rtc_base/ssl_certificate.h
+++ b/rtc_base/ssl_certificate.h
@@ -12,8 +12,8 @@
 // for TLS TURN connections and the SSLStreamAdapter for DTLS Peer to Peer
 // Connections for SRTP Key negotiation and SCTP encryption.
 
-#ifndef RTC_BASE_SSLCERTIFICATE_H_
-#define RTC_BASE_SSLCERTIFICATE_H_
+#ifndef RTC_BASE_SSL_CERTIFICATE_H_
+#define RTC_BASE_SSL_CERTIFICATE_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace rtc {
 
@@ -134,4 +134,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SSLCERTIFICATE_H_
+#endif  // RTC_BASE_SSL_CERTIFICATE_H_
diff --git a/rtc_base/ssl_fingerprint.cc b/rtc_base/ssl_fingerprint.cc
index b296d33..77b6149 100644
--- a/rtc_base/ssl_fingerprint.cc
+++ b/rtc_base/ssl_fingerprint.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/sslfingerprint.h"
+#include "rtc_base/ssl_fingerprint.h"
 
 #include <ctype.h>
 #include <algorithm>
@@ -17,11 +17,11 @@
 
 #include "absl/memory/memory.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/string_encode.h"
 
 namespace rtc {
 
diff --git a/rtc_base/ssl_fingerprint.h b/rtc_base/ssl_fingerprint.h
index ea10ede..f4037f7 100644
--- a/rtc_base/ssl_fingerprint.h
+++ b/rtc_base/ssl_fingerprint.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SSLFINGERPRINT_H_
-#define RTC_BASE_SSLFINGERPRINT_H_
+#ifndef RTC_BASE_SSL_FINGERPRINT_H_
+#define RTC_BASE_SSL_FINGERPRINT_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string>
 
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 
 namespace rtc {
 
@@ -70,4 +70,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SSLFINGERPRINT_H_
+#endif  // RTC_BASE_SSL_FINGERPRINT_H_
diff --git a/rtc_base/ssl_identity.cc b/rtc_base/ssl_identity.cc
index 41eb35d..63818c1 100644
--- a/rtc_base/ssl_identity.cc
+++ b/rtc_base/ssl_identity.cc
@@ -9,18 +9,18 @@
  */
 
 // Handling of certificates and keypairs for SSLStreamAdapter's peer mode.
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/ssl_identity.h"
 
 #include <string.h>
 #include <time.h>
 #include <string>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/opensslidentity.h"
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/openssl_identity.h"
+#include "rtc_base/ssl_certificate.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/third_party/base64/base64.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/ssl_identity.h b/rtc_base/ssl_identity.h
index 39feeab..c013a89 100644
--- a/rtc_base/ssl_identity.h
+++ b/rtc_base/ssl_identity.h
@@ -10,8 +10,8 @@
 
 // Handling of certificates and keypairs for SSLStreamAdapter's peer mode.
 
-#ifndef RTC_BASE_SSLIDENTITY_H_
-#define RTC_BASE_SSLIDENTITY_H_
+#ifndef RTC_BASE_SSL_IDENTITY_H_
+#define RTC_BASE_SSL_IDENTITY_H_
 
 #include <stdint.h>
 #include <ctime>
@@ -164,4 +164,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SSLIDENTITY_H_
+#endif  // RTC_BASE_SSL_IDENTITY_H_
diff --git a/rtc_base/ssl_identity_unittest.cc b/rtc_base/ssl_identity_unittest.cc
index d2ec157..f01f37b 100644
--- a/rtc_base/ssl_identity_unittest.cc
+++ b/rtc_base/ssl_identity_unittest.cc
@@ -14,13 +14,13 @@
 #include <vector>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/fakesslidentity.h"
+#include "rtc_base/fake_ssl_identity.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/sslfingerprint.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/ssl_fingerprint.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/string_utils.h"
 #include "test/gtest.h"
 
 using rtc::SSLIdentity;
diff --git a/rtc_base/ssl_roots.h b/rtc_base/ssl_roots.h
index 0dbd19b..69f6e39 100644
--- a/rtc_base/ssl_roots.h
+++ b/rtc_base/ssl_roots.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SSLROOTS_H_
-#define RTC_BASE_SSLROOTS_H_
+#ifndef RTC_BASE_SSL_ROOTS_H_
+#define RTC_BASE_SSL_ROOTS_H_
 
 // This file is the root certificates in C form that are needed to connect to
 // Google.
@@ -4283,4 +4283,4 @@
 
 // clang-format on
 
-#endif  // RTC_BASE_SSLROOTS_H_
+#endif  // RTC_BASE_SSL_ROOTS_H_
diff --git a/rtc_base/ssl_stream_adapter.cc b/rtc_base/ssl_stream_adapter.cc
index 9c33a9c..372c37f 100644
--- a/rtc_base/ssl_stream_adapter.cc
+++ b/rtc_base/ssl_stream_adapter.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
 
-#include "rtc_base/opensslstreamadapter.h"
+#include "rtc_base/openssl_stream_adapter.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/rtc_base/ssl_stream_adapter.h b/rtc_base/ssl_stream_adapter.h
index 3fff6bc..04d0fc5 100644
--- a/rtc_base/ssl_stream_adapter.h
+++ b/rtc_base/ssl_stream_adapter.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_SSLSTREAMADAPTER_H_
-#define RTC_BASE_SSLSTREAMADAPTER_H_
+#ifndef RTC_BASE_SSL_STREAM_ADAPTER_H_
+#define RTC_BASE_SSL_STREAM_ADAPTER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -17,8 +17,8 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/sslcertificate.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/ssl_certificate.h"
+#include "rtc_base/ssl_identity.h"
 #include "rtc_base/stream.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
@@ -263,4 +263,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_SSLSTREAMADAPTER_H_
+#endif  // RTC_BASE_SSL_STREAM_ADAPTER_H_
diff --git a/rtc_base/ssl_stream_adapter_unittest.cc b/rtc_base/ssl_stream_adapter_unittest.cc
index 6fbb1d7..e866266 100644
--- a/rtc_base/ssl_stream_adapter_unittest.cc
+++ b/rtc_base/ssl_stream_adapter_unittest.cc
@@ -13,15 +13,15 @@
 #include <set>
 #include <string>
 
-#include "rtc_base/bufferqueue.h"
+#include "rtc_base/buffer_queue.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/memory_stream.h"
-#include "rtc_base/messagedigest.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslidentity.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/message_digest.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_identity.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "rtc_base/stream.h"
 
 using ::testing::WithParamInterface;
diff --git a/rtc_base/stream.cc b/rtc_base/stream.cc
index 0541bf6..083df40 100644
--- a/rtc_base/stream.cc
+++ b/rtc_base/stream.cc
@@ -14,7 +14,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/message_queue.h"
 #include "rtc_base/stream.h"
 #include "rtc_base/thread.h"
 
@@ -22,7 +22,7 @@
 #include <windows.h>
 
 #define fileno _fileno
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 #endif
 
 namespace rtc {
diff --git a/rtc_base/stream.h b/rtc_base/stream.h
index f643114..718c12e 100644
--- a/rtc_base/stream.h
+++ b/rtc_base/stream.h
@@ -16,10 +16,10 @@
 #include <memory>
 
 #include "rtc_base/buffer.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/messagehandler.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/message_handler.h"
+#include "rtc_base/message_queue.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace rtc {
diff --git a/rtc_base/string_encode.cc b/rtc_base/string_encode.cc
index fc4e3bc..45ea586 100644
--- a/rtc_base/string_encode.cc
+++ b/rtc_base/string_encode.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 
 #include <cstdio>
 
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/string_encode.h b/rtc_base/string_encode.h
index 09bf77f..d3338d9 100644
--- a/rtc_base/string_encode.h
+++ b/rtc_base/string_encode.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_STRINGENCODE_H_
-#define RTC_BASE_STRINGENCODE_H_
+#ifndef RTC_BASE_STRING_ENCODE_H_
+#define RTC_BASE_STRING_ENCODE_H_
 
 #include <stddef.h>
 #include <string>
@@ -197,4 +197,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_STRINGENCODE_H__
+#endif  // RTC_BASE_STRING_ENCODE_H__
diff --git a/rtc_base/string_encode_unittest.cc b/rtc_base/string_encode_unittest.cc
index ab871a5..cc72e43 100644
--- a/rtc_base/string_encode_unittest.cc
+++ b/rtc_base/string_encode_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 
 #include <string.h>
 #include <sstream>  // no-presubmit-check TODO(webrtc:8982)
diff --git a/rtc_base/string_utils.cc b/rtc_base/string_utils.cc
index 57ca408..97bf481 100644
--- a/rtc_base/string_utils.cc
+++ b/rtc_base/string_utils.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/string_utils.h b/rtc_base/string_utils.h
index 2a53e69..b4ce209 100644
--- a/rtc_base/string_utils.h
+++ b/rtc_base/string_utils.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_STRINGUTILS_H_
-#define RTC_BASE_STRINGUTILS_H_
+#ifndef RTC_BASE_STRING_UTILS_H_
+#define RTC_BASE_STRING_UTILS_H_
 
 #include <ctype.h>
 #include <stdarg.h>
@@ -110,4 +110,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_STRINGUTILS_H_
+#endif  // RTC_BASE_STRING_UTILS_H_
diff --git a/rtc_base/string_utils_unittest.cc b/rtc_base/string_utils_unittest.cc
index a07d8bb..b4396f1 100644
--- a/rtc_base/string_utils_unittest.cc
+++ b/rtc_base/string_utils_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 
 #include "test/gtest.h"
 
diff --git a/rtc_base/strings/json.cc b/rtc_base/strings/json.cc
index efcb97a..8a544a0 100644
--- a/rtc_base/strings/json.cc
+++ b/rtc_base/strings/json.cc
@@ -14,7 +14,7 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 
 namespace rtc {
 
diff --git a/rtc_base/strings/string_builder.h b/rtc_base/strings/string_builder.h
index 27001d1..7c45ac4 100644
--- a/rtc_base/strings/string_builder.h
+++ b/rtc_base/strings/string_builder.h
@@ -17,8 +17,8 @@
 
 #include "absl/strings/string_view.h"
 #include "api/array_view.h"
-#include "rtc_base/stringencode.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/string_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/swap_queue.h b/rtc_base/swap_queue.h
index 53d4219..c3246db 100644
--- a/rtc_base/swap_queue.h
+++ b/rtc_base/swap_queue.h
@@ -16,8 +16,8 @@
 #include <vector>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/system/unused.h"
 #include "rtc_base/thread_annotations.h"
 
diff --git a/rtc_base/system/file_wrapper.h b/rtc_base/system/file_wrapper.h
index 0bb86a3..f2ed51a 100644
--- a/rtc_base/system/file_wrapper.h
+++ b/rtc_base/system/file_wrapper.h
@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 // Implementation that can read (exclusive) or write from/to a file.
 
diff --git a/rtc_base/task_queue.h b/rtc_base/task_queue.h
index fa84625..0f2d219 100644
--- a/rtc_base/task_queue.h
+++ b/rtc_base/task_queue.h
@@ -17,7 +17,7 @@
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/system/rtc_export.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/rtc_base/task_queue_for_test.h b/rtc_base/task_queue_for_test.h
index 5cd4e83..dd27f64 100644
--- a/rtc_base/task_queue_for_test.h
+++ b/rtc_base/task_queue_for_test.h
@@ -12,7 +12,7 @@
 #define RTC_BASE_TASK_QUEUE_FOR_TEST_H_
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/event.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/rtc_base/task_queue_gcd.cc b/rtc_base/task_queue_gcd.cc
index f2f3412..405edab 100644
--- a/rtc_base/task_queue_gcd.cc
+++ b/rtc_base/task_queue_gcd.cc
@@ -20,8 +20,8 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/task_queue_posix.h"
 
 namespace rtc {
diff --git a/rtc_base/task_queue_libevent.cc b/rtc_base/task_queue_libevent.cc
index d30c82d..ab97b0c 100644
--- a/rtc_base/task_queue_libevent.cc
+++ b/rtc_base/task_queue_libevent.cc
@@ -24,18 +24,18 @@
 
 #include "base/third_party/libevent/event.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/platform_thread_types.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/system/unused.h"
 #include "rtc_base/task_queue_posix.h"
 #include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 using internal::GetQueuePtrTls;
diff --git a/rtc_base/task_queue_stdlib.cc b/rtc_base/task_queue_stdlib.cc
index 0fb0ed2..2b9d5a2 100644
--- a/rtc_base/task_queue_stdlib.cc
+++ b/rtc_base/task_queue_stdlib.cc
@@ -19,14 +19,14 @@
 #include <utility>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 namespace {
diff --git a/rtc_base/task_queue_unittest.cc b/rtc_base/task_queue_unittest.cc
index a76c09e..d4ef105 100644
--- a/rtc_base/task_queue_unittest.cc
+++ b/rtc_base/task_queue_unittest.cc
@@ -25,7 +25,7 @@
 #include "rtc_base/event.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/task_queue_for_test.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "test/gtest.h"
 
 using rtc::test::TaskQueueForTest;
diff --git a/rtc_base/task_queue_win.cc b/rtc_base/task_queue_win.cc
index 565cc9b..b73aa95 100644
--- a/rtc_base/task_queue_win.cc
+++ b/rtc_base/task_queue_win.cc
@@ -29,14 +29,14 @@
 
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 namespace {
diff --git a/rtc_base/test_base64.h b/rtc_base/test_base64.h
index 5dc94b6..51d8c58 100644
--- a/rtc_base/test_base64.h
+++ b/rtc_base/test_base64.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_TESTBASE64_H_
-#define RTC_BASE_TESTBASE64_H_
+#ifndef RTC_BASE_TEST_BASE64_H_
+#define RTC_BASE_TEST_BASE64_H_
 
 /* This file was generated by googleclient/talk/binary2header.sh */
 
@@ -2108,4 +2108,4 @@
     0xba, 0x5b, 0xfe, 0x97, 0xfa, 0x4b, 0xfc, 0xba, 0x7f, 0xb1, 0xc7, 0xab,
     0x1e, 0x8f, 0xff, 0xd9};
 
-#endif  // RTC_BASE_TESTBASE64_H_
+#endif  // RTC_BASE_TEST_BASE64_H_
diff --git a/rtc_base/test_certificate_verifier.h b/rtc_base/test_certificate_verifier.h
index 8ad6e4d..9775615 100644
--- a/rtc_base/test_certificate_verifier.h
+++ b/rtc_base/test_certificate_verifier.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_TESTCERTIFICATEVERIFIER_H_
-#define RTC_BASE_TESTCERTIFICATEVERIFIER_H_
+#ifndef RTC_BASE_TEST_CERTIFICATE_VERIFIER_H_
+#define RTC_BASE_TEST_CERTIFICATE_VERIFIER_H_
 
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/ssl_certificate.h"
 
 namespace rtc {
 
@@ -31,4 +31,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_TESTCERTIFICATEVERIFIER_H_
+#endif  // RTC_BASE_TEST_CERTIFICATE_VERIFIER_H_
diff --git a/rtc_base/test_client.cc b/rtc_base/test_client.cc
index 00363ba..274b6ca 100644
--- a/rtc_base/test_client.cc
+++ b/rtc_base/test_client.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/testclient.h"
+#include "rtc_base/test_client.h"
 
 #include <string.h>
 #include <utility>
@@ -16,7 +16,7 @@
 #include "absl/memory/memory.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/test_client.h b/rtc_base/test_client.h
index 16fb6ba..fb8a2f9 100644
--- a/rtc_base/test_client.h
+++ b/rtc_base/test_client.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_TESTCLIENT_H_
-#define RTC_BASE_TESTCLIENT_H_
+#ifndef RTC_BASE_TEST_CLIENT_H_
+#define RTC_BASE_TEST_CLIENT_H_
 
 #include <memory>
 #include <vector>
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/fake_clock.h"
 
 namespace rtc {
 
@@ -113,4 +113,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_TESTCLIENT_H_
+#endif  // RTC_BASE_TEST_CLIENT_H_
diff --git a/rtc_base/test_client_unittest.cc b/rtc_base/test_client_unittest.cc
index d45a5a3..382aaaf 100644
--- a/rtc_base/test_client_unittest.cc
+++ b/rtc_base/test_client_unittest.cc
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/testclient.h"
+#include "rtc_base/test_client.h"
 
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/asynctcpsocket.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/async_tcp_socket.h"
+#include "rtc_base/async_udp_socket.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nethelpers.h"
-#include "rtc_base/socketserver.h"
-#include "rtc_base/testechoserver.h"
+#include "rtc_base/net_helpers.h"
+#include "rtc_base/socket_server.h"
+#include "rtc_base/test_echo_server.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
 
diff --git a/rtc_base/test_echo_server.cc b/rtc_base/test_echo_server.cc
index 1e1fb59..d2e11d6 100644
--- a/rtc_base/test_echo_server.cc
+++ b/rtc_base/test_echo_server.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/testechoserver.h"
+#include "rtc_base/test_echo_server.h"
 
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_server.h"
 
 namespace rtc {
 
diff --git a/rtc_base/test_echo_server.h b/rtc_base/test_echo_server.h
index f1342fd..4710560 100644
--- a/rtc_base/test_echo_server.h
+++ b/rtc_base/test_echo_server.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_TESTECHOSERVER_H_
-#define RTC_BASE_TESTECHOSERVER_H_
+#ifndef RTC_BASE_TEST_ECHO_SERVER_H_
+#define RTC_BASE_TEST_ECHO_SERVER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -17,11 +17,11 @@
 #include <list>
 #include <memory>
 
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/asynctcpsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/async_tcp_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
 
@@ -69,4 +69,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_TESTECHOSERVER_H_
+#endif  // RTC_BASE_TEST_ECHO_SERVER_H_
diff --git a/rtc_base/test_utils.cc b/rtc_base/test_utils.cc
index f3292fd..ecf2cfa 100644
--- a/rtc_base/test_utils.cc
+++ b/rtc_base/test_utils.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/testutils.h"
+#include "rtc_base/test_utils.h"
 
 namespace webrtc {
 namespace testing {
diff --git a/rtc_base/test_utils.h b/rtc_base/test_utils.h
index 7ec0c12..4746e96 100644
--- a/rtc_base/test_utils.h
+++ b/rtc_base/test_utils.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_TESTUTILS_H_
-#define RTC_BASE_TESTUTILS_H_
+#ifndef RTC_BASE_TEST_UTILS_H_
+#define RTC_BASE_TEST_UTILS_H_
 
 // Utilities for testing rtc infrastructure in unittests
 
 #include <map>
 #include <utility>
 
-#include "rtc_base/asyncsocket.h"
+#include "rtc_base/async_socket.h"
 #include "rtc_base/stream.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 
@@ -137,4 +137,4 @@
 }  // namespace testing
 }  // namespace webrtc
 
-#endif  // RTC_BASE_TESTUTILS_H_
+#endif  // RTC_BASE_TEST_UTILS_H_
diff --git a/rtc_base/thread.cc b/rtc_base/thread.cc
index 4dd5fd2..936871c 100644
--- a/rtc_base/thread.cc
+++ b/rtc_base/thread.cc
@@ -28,10 +28,10 @@
 #include <utility>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 
 #if defined(WEBRTC_MAC)
diff --git a/rtc_base/thread.h b/rtc_base/thread.h
index 039192c..e2d37a0 100644
--- a/rtc_base/thread.h
+++ b/rtc_base/thread.h
@@ -20,12 +20,12 @@
 #if defined(WEBRTC_POSIX)
 #include <pthread.h>
 #endif
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/location.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/platform_thread_types.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/thread_annotations.h"
 
 #if defined(WEBRTC_WIN)
diff --git a/rtc_base/thread_checker.h b/rtc_base/thread_checker.h
index ad04508..baff897 100644
--- a/rtc_base/thread_checker.h
+++ b/rtc_base/thread_checker.h
@@ -20,7 +20,7 @@
 #define RTC_ENABLE_THREAD_CHECKER RTC_DCHECK_IS_ON
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker_impl.h"
 
diff --git a/rtc_base/thread_checker_impl.h b/rtc_base/thread_checker_impl.h
index c82fe1d..c39e10f 100644
--- a/rtc_base/thread_checker_impl.h
+++ b/rtc_base/thread_checker_impl.h
@@ -13,7 +13,7 @@
 #ifndef RTC_BASE_THREAD_CHECKER_IMPL_H_
 #define RTC_BASE_THREAD_CHECKER_IMPL_H_
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/platform_thread_types.h"
 
 namespace rtc {
diff --git a/rtc_base/thread_checker_unittest.cc b/rtc_base/thread_checker_unittest.cc
index 52397a9..a40196f 100644
--- a/rtc_base/thread_checker_unittest.cc
+++ b/rtc_base/thread_checker_unittest.cc
@@ -14,9 +14,9 @@
 #include <utility>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_checker.h"
diff --git a/rtc_base/thread_unittest.cc b/rtc_base/thread_unittest.cc
index 68930f8..d87c332 100644
--- a/rtc_base/thread_unittest.cc
+++ b/rtc_base/thread_unittest.cc
@@ -10,13 +10,13 @@
 
 #include <memory>
 
-#include "rtc_base/asyncinvoker.h"
-#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/async_invoker.h"
+#include "rtc_base/async_udp_socket.h"
 #include "rtc_base/event.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/nullsocketserver.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/null_socket_server.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
 
diff --git a/rtc_base/time_utils.cc b/rtc_base/time_utils.cc
index 0f79a87..53f8b36 100644
--- a/rtc_base/time_utils.cc
+++ b/rtc_base/time_utils.cc
@@ -29,7 +29,7 @@
 #endif
 
 #include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/time_utils.h b/rtc_base/time_utils.h
index c6ddd73..d1d8b05 100644
--- a/rtc_base/time_utils.h
+++ b/rtc_base/time_utils.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_TIMEUTILS_H_
-#define RTC_BASE_TIMEUTILS_H_
+#ifndef RTC_BASE_TIME_UTILS_H_
+#define RTC_BASE_TIME_UTILS_H_
 
 #include <stdint.h>
 #include <time.h>
@@ -165,4 +165,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_TIMEUTILS_H_
+#endif  // RTC_BASE_TIME_UTILS_H_
diff --git a/rtc_base/time_utils_unittest.cc b/rtc_base/time_utils_unittest.cc
index a2e9a3f..b4cefb7 100644
--- a/rtc_base/time_utils_unittest.cc
+++ b/rtc_base/time_utils_unittest.cc
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 #include <memory>
 
 #include "api/units/time_delta.h"
 #include "rtc_base/event.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/location.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
 
diff --git a/rtc_base/timestamp_aligner.cc b/rtc_base/timestamp_aligner.cc
index f2da101..3d92dd8 100644
--- a/rtc_base/timestamp_aligner.cc
+++ b/rtc_base/timestamp_aligner.cc
@@ -13,8 +13,8 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timestampaligner.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/timestamp_aligner.h"
 
 namespace rtc {
 
diff --git a/rtc_base/timestamp_aligner.h b/rtc_base/timestamp_aligner.h
index 6fa8d69..2146880 100644
--- a/rtc_base/timestamp_aligner.h
+++ b/rtc_base/timestamp_aligner.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_TIMESTAMPALIGNER_H_
-#define RTC_BASE_TIMESTAMPALIGNER_H_
+#ifndef RTC_BASE_TIMESTAMP_ALIGNER_H_
+#define RTC_BASE_TIMESTAMP_ALIGNER_H_
 
 #include <stdint.h>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace rtc {
 
@@ -71,4 +71,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_TIMESTAMPALIGNER_H_
+#endif  // RTC_BASE_TIMESTAMP_ALIGNER_H_
diff --git a/rtc_base/timestamp_aligner_unittest.cc b/rtc_base/timestamp_aligner_unittest.cc
index b57f480..f92cd96 100644
--- a/rtc_base/timestamp_aligner_unittest.cc
+++ b/rtc_base/timestamp_aligner_unittest.cc
@@ -13,8 +13,8 @@
 #include <limits>
 
 #include "rtc_base/random.h"
-#include "rtc_base/timestampaligner.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/timestamp_aligner.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/unittest_main.cc b/rtc_base/unittest_main.cc
index 981f680..def0104 100644
--- a/rtc_base/unittest_main.cc
+++ b/rtc_base/unittest_main.cc
@@ -16,15 +16,15 @@
 
 #include "rtc_base/flags.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/ssladapter.h"
-#include "rtc_base/sslstreamadapter.h"
+#include "rtc_base/ssl_adapter.h"
+#include "rtc_base/ssl_stream_adapter.h"
 #include "system_wrappers/include/field_trial.h"
 #include "system_wrappers/include/metrics.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
 
 #if defined(WEBRTC_WIN)
-#include "rtc_base/win32socketinit.h"
+#include "rtc_base/win32_socket_init.h"
 #endif
 
 #if defined(WEBRTC_IOS)
diff --git a/rtc_base/virtual_socket_server.cc b/rtc_base/virtual_socket_server.cc
index 7969411..3255124 100644
--- a/rtc_base/virtual_socket_server.cc
+++ b/rtc_base/virtual_socket_server.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/virtual_socket_server.h"
 
 #include <errno.h>
 #include <math.h>
@@ -19,12 +19,12 @@
 #include <vector>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/physicalsocketserver.h"
-#include "rtc_base/socketaddresspair.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/socket_address_pair.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace rtc {
 #if defined(WEBRTC_WIN)
diff --git a/rtc_base/virtual_socket_server.h b/rtc_base/virtual_socket_server.h
index 4fa7d77..610c0fb 100644
--- a/rtc_base/virtual_socket_server.h
+++ b/rtc_base/virtual_socket_server.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_VIRTUALSOCKETSERVER_H_
-#define RTC_BASE_VIRTUALSOCKETSERVER_H_
+#ifndef RTC_BASE_VIRTUAL_SOCKET_SERVER_H_
+#define RTC_BASE_VIRTUAL_SOCKET_SERVER_H_
 
 #include <deque>
 #include <map>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/event.h"
-#include "rtc_base/fakeclock.h"
-#include "rtc_base/messagequeue.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/fake_clock.h"
+#include "rtc_base/message_queue.h"
+#include "rtc_base/socket_server.h"
 
 namespace rtc {
 
@@ -409,4 +409,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_VIRTUALSOCKETSERVER_H_
+#endif  // RTC_BASE_VIRTUAL_SOCKET_SERVER_H_
diff --git a/rtc_base/virtual_socket_unittest.cc b/rtc_base/virtual_socket_unittest.cc
index 77f0367..ac0af08 100644
--- a/rtc_base/virtual_socket_unittest.cc
+++ b/rtc_base/virtual_socket_unittest.cc
@@ -23,24 +23,24 @@
 
 #include "absl/memory/memory.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/asyncudpsocket.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.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/socket.h"
-#include "rtc_base/socketaddress.h"
-#include "rtc_base/testclient.h"
-#include "rtc_base/testutils.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/test_client.h"
+#include "rtc_base/test_utils.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
-#include "rtc_base/virtualsocketserver.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/virtual_socket_server.h"
 #include "test/gtest.h"
 
 namespace rtc {
diff --git a/rtc_base/weak_ptr.h b/rtc_base/weak_ptr.h
index 8acfab0..daeb671 100644
--- a/rtc_base/weak_ptr.h
+++ b/rtc_base/weak_ptr.h
@@ -15,8 +15,8 @@
 
 #include <utility>
 
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/sequenced_task_checker.h"
 
diff --git a/rtc_base/win/windows_version.cc b/rtc_base/win/windows_version.cc
index 65ef4fd..72aa5c6 100644
--- a/rtc_base/win/windows_version.cc
+++ b/rtc_base/win/windows_version.cc
@@ -14,7 +14,7 @@
 #include <memory>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 
 #if !defined(__clang__) && _MSC_FULL_VER < 191125507
 #error VS 2017 Update 3.2 or higher is required
diff --git a/rtc_base/win/windows_version.h b/rtc_base/win/windows_version.h
index 39d333e..fa0a767 100644
--- a/rtc_base/win/windows_version.h
+++ b/rtc_base/win/windows_version.h
@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <string>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 typedef void* HANDLE;
 
diff --git a/rtc_base/win32.cc b/rtc_base/win32.cc
index 480d97b..b5a2611 100644
--- a/rtc_base/win32.cc
+++ b/rtc_base/win32.cc
@@ -15,10 +15,10 @@
 #include <algorithm>
 
 #include "rtc_base/arraysize.h"
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/win32_socket_init.h b/rtc_base/win32_socket_init.h
index 7f9bdcc..4a90e14 100644
--- a/rtc_base/win32_socket_init.h
+++ b/rtc_base/win32_socket_init.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_WIN32SOCKETINIT_H_
-#define RTC_BASE_WIN32SOCKETINIT_H_
+#ifndef RTC_BASE_WIN32_SOCKET_INIT_H_
+#define RTC_BASE_WIN32_SOCKET_INIT_H_
 
 #ifndef WEBRTC_WIN
 #error "Only #include this header in Windows builds"
@@ -38,4 +38,4 @@
 
 }  // namespace rtc
 
-#endif  // RTC_BASE_WIN32SOCKETINIT_H_
+#endif  // RTC_BASE_WIN32_SOCKET_INIT_H_
diff --git a/rtc_base/win32_socket_server.cc b/rtc_base/win32_socket_server.cc
index 230f3ed..389b76b 100644
--- a/rtc_base/win32_socket_server.cc
+++ b/rtc_base/win32_socket_server.cc
@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/win32socketserver.h"
+#include "rtc_base/win32_socket_server.h"
 
 #include <ws2tcpip.h>  // NOLINT
 #include <algorithm>
 
-#include "rtc_base/byteorder.h"
+#include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"  // For Time, TimeSince
-#include "rtc_base/win32window.h"
+#include "rtc_base/time_utils.h"  // For Time, TimeSince
+#include "rtc_base/win32_window.h"
 
 namespace rtc {
 
diff --git a/rtc_base/win32_socket_server.h b/rtc_base/win32_socket_server.h
index 0b11d64..37515d9 100644
--- a/rtc_base/win32_socket_server.h
+++ b/rtc_base/win32_socket_server.h
@@ -8,18 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_WIN32SOCKETSERVER_H_
-#define RTC_BASE_WIN32SOCKETSERVER_H_
+#ifndef RTC_BASE_WIN32_SOCKET_SERVER_H_
+#define RTC_BASE_WIN32_SOCKET_SERVER_H_
 
 #if defined(WEBRTC_WIN)
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/criticalsection.h"
-#include "rtc_base/messagequeue.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/critical_section.h"
+#include "rtc_base/message_queue.h"
 #include "rtc_base/socket.h"
-#include "rtc_base/socketfactory.h"
-#include "rtc_base/socketserver.h"
+#include "rtc_base/socket_factory.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/win32window.h"
+#include "rtc_base/win32_window.h"
 
 namespace rtc {
 
@@ -151,4 +151,4 @@
 
 #endif  // WEBRTC_WIN
 
-#endif  // RTC_BASE_WIN32SOCKETSERVER_H_
+#endif  // RTC_BASE_WIN32_SOCKET_SERVER_H_
diff --git a/rtc_base/win32_socket_server_unittest.cc b/rtc_base/win32_socket_server_unittest.cc
index 60295f1..d8484d1 100644
--- a/rtc_base/win32_socket_server_unittest.cc
+++ b/rtc_base/win32_socket_server_unittest.cc
@@ -7,7 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "rtc_base/win32socketserver.h"
+#include "rtc_base/win32_socket_server.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/socket_unittest.h"
 #include "rtc_base/thread.h"
diff --git a/rtc_base/win32_unittest.cc b/rtc_base/win32_unittest.cc
index 5691be4..913aa01 100644
--- a/rtc_base/win32_unittest.cc
+++ b/rtc_base/win32_unittest.cc
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "rtc_base/gunit.h"
-#include "rtc_base/nethelpers.h"
+#include "rtc_base/net_helpers.h"
 #include "rtc_base/win32.h"
 
 #if !defined(WEBRTC_WIN)
diff --git a/rtc_base/win32_window.cc b/rtc_base/win32_window.cc
index 4290894..fc7b4c3 100644
--- a/rtc_base/win32_window.cc
+++ b/rtc_base/win32_window.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/win32window.h"
+#include "rtc_base/win32_window.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 
diff --git a/rtc_base/win32_window.h b/rtc_base/win32_window.h
index e96aa35..5256a85 100644
--- a/rtc_base/win32_window.h
+++ b/rtc_base/win32_window.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_BASE_WIN32WINDOW_H_
-#define RTC_BASE_WIN32WINDOW_H_
+#ifndef RTC_BASE_WIN32_WINDOW_H_
+#define RTC_BASE_WIN32_WINDOW_H_
 
 #if defined(WEBRTC_WIN)
 
@@ -67,4 +67,4 @@
 
 #endif  // WEBRTC_WIN
 
-#endif  // RTC_BASE_WIN32WINDOW_H_
+#endif  // RTC_BASE_WIN32_WINDOW_H_
diff --git a/rtc_base/win32_window_unittest.cc b/rtc_base/win32_window_unittest.cc
index c659349..62430bb 100644
--- a/rtc_base/win32_window_unittest.cc
+++ b/rtc_base/win32_window_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/win32window.h"
+#include "rtc_base/win32_window.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
 
diff --git a/rtc_tools/event_log_visualizer/main.cc b/rtc_tools/event_log_visualizer/main.cc
index 8c92be5..651627e 100644
--- a/rtc_tools/event_log_visualizer/main.cc
+++ b/rtc_tools/event_log_visualizer/main.cc
@@ -28,7 +28,7 @@
 #include "rtc_tools/event_log_visualizer/plot_python.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/field_trial.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 WEBRTC_DEFINE_string(
     plot_profile,
diff --git a/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc b/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc
index 093a941..2c736d1 100644
--- a/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc
+++ b/rtc_tools/frame_analyzer/reference_less_video_analysis_unittest.cc
@@ -13,7 +13,7 @@
 #include "rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h"
 #include "rtc_tools/video_file_reader.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 class ReferenceLessVideoAnalysisTest : public ::testing::Test {
  public:
diff --git a/rtc_tools/frame_analyzer/video_color_aligner.cc b/rtc_tools/frame_analyzer/video_color_aligner.cc
index e99f6e7..da72341 100644
--- a/rtc_tools/frame_analyzer/video_color_aligner.cc
+++ b/rtc_tools/frame_analyzer/video_color_aligner.cc
@@ -19,7 +19,7 @@
 #include "api/array_view.h"
 #include "api/video/i420_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_tools/frame_analyzer/linear_least_squares.h"
 #include "third_party/libyuv/include/libyuv/planar_functions.h"
 #include "third_party/libyuv/include/libyuv/scale.h"
diff --git a/rtc_tools/frame_analyzer/video_color_aligner_unittest.cc b/rtc_tools/frame_analyzer/video_color_aligner_unittest.cc
index 9e07cf0..980898b 100644
--- a/rtc_tools/frame_analyzer/video_color_aligner_unittest.cc
+++ b/rtc_tools/frame_analyzer/video_color_aligner_unittest.cc
@@ -16,7 +16,7 @@
 #include "rtc_tools/frame_analyzer/video_quality_analysis.h"
 #include "rtc_tools/video_file_reader.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/rtc_tools/frame_analyzer/video_geometry_aligner.cc b/rtc_tools/frame_analyzer/video_geometry_aligner.cc
index d3cbc05..db397bc 100644
--- a/rtc_tools/frame_analyzer/video_geometry_aligner.cc
+++ b/rtc_tools/frame_analyzer/video_geometry_aligner.cc
@@ -14,7 +14,7 @@
 
 #include "api/video/i420_buffer.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_tools/frame_analyzer/video_quality_analysis.h"
 #include "third_party/libyuv/include/libyuv/scale.h"
 
diff --git a/rtc_tools/frame_analyzer/video_geometry_aligner_unittest.cc b/rtc_tools/frame_analyzer/video_geometry_aligner_unittest.cc
index 1ffe515f..6b0904a 100644
--- a/rtc_tools/frame_analyzer/video_geometry_aligner_unittest.cc
+++ b/rtc_tools/frame_analyzer/video_geometry_aligner_unittest.cc
@@ -16,7 +16,7 @@
 #include "rtc_tools/frame_analyzer/video_quality_analysis.h"
 #include "rtc_tools/video_file_reader.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc b/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc
index 970bfa8..4cd4bfa 100644
--- a/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc
+++ b/rtc_tools/frame_analyzer/video_quality_analysis_unittest.cc
@@ -18,7 +18,7 @@
 
 #include "rtc_tools/frame_analyzer/video_quality_analysis.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/rtc_tools/frame_analyzer/video_temporal_aligner.cc b/rtc_tools/frame_analyzer/video_temporal_aligner.cc
index ec227c5..d03ec61 100644
--- a/rtc_tools/frame_analyzer/video_temporal_aligner.cc
+++ b/rtc_tools/frame_analyzer/video_temporal_aligner.cc
@@ -20,7 +20,7 @@
 
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame_buffer.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_tools/frame_analyzer/video_quality_analysis.h"
 
 namespace webrtc {
diff --git a/rtc_tools/frame_analyzer/video_temporal_aligner_unittest.cc b/rtc_tools/frame_analyzer/video_temporal_aligner_unittest.cc
index 5db9928..9519a74 100644
--- a/rtc_tools/frame_analyzer/video_temporal_aligner_unittest.cc
+++ b/rtc_tools/frame_analyzer/video_temporal_aligner_unittest.cc
@@ -15,7 +15,7 @@
 #include "rtc_tools/frame_analyzer/video_quality_analysis.h"
 #include "rtc_tools/video_file_reader.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/rtc_tools/frame_editing/frame_editing_unittest.cc b/rtc_tools/frame_editing/frame_editing_unittest.cc
index c9065e1..a55a4e5 100644
--- a/rtc_tools/frame_editing/frame_editing_unittest.cc
+++ b/rtc_tools/frame_editing/frame_editing_unittest.cc
@@ -18,7 +18,7 @@
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "rtc_tools/frame_editing/frame_editing_lib.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/rtc_tools/network_tester/config_reader.h b/rtc_tools/network_tester/config_reader.h
index deee245..69105f1 100644
--- a/rtc_tools/network_tester/config_reader.h
+++ b/rtc_tools/network_tester/config_reader.h
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "absl/types/optional.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 #include "rtc_base/ignore_wundef.h"
 
diff --git a/rtc_tools/network_tester/network_tester_unittest.cc b/rtc_tools/network_tester/network_tester_unittest.cc
index 74c4855..156e8bb 100644
--- a/rtc_tools/network_tester/network_tester_unittest.cc
+++ b/rtc_tools/network_tester/network_tester_unittest.cc
@@ -15,7 +15,7 @@
 #include "rtc_base/gunit.h"
 #include "rtc_tools/network_tester/test_controller.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/rtc_tools/network_tester/packet_logger.h b/rtc_tools/network_tester/packet_logger.h
index 6659d6c..109ee4c 100644
--- a/rtc_tools/network_tester/packet_logger.h
+++ b/rtc_tools/network_tester/packet_logger.h
@@ -14,7 +14,7 @@
 #include <fstream>
 #include <string>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/ignore_wundef.h"
 
 #ifdef WEBRTC_NETWORK_TESTER_PROTO
diff --git a/rtc_tools/network_tester/packet_sender.cc b/rtc_tools/network_tester/packet_sender.cc
index 4ad2375..62b93e3 100644
--- a/rtc_tools/network_tester/packet_sender.cc
+++ b/rtc_tools/network_tester/packet_sender.cc
@@ -16,7 +16,7 @@
 #include <utility>
 
 #include "absl/types/optional.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_tools/network_tester/config_reader.h"
 #include "rtc_tools/network_tester/test_controller.h"
 
diff --git a/rtc_tools/network_tester/packet_sender.h b/rtc_tools/network_tester/packet_sender.h
index da3eb29..886a6f5 100644
--- a/rtc_tools/network_tester/packet_sender.h
+++ b/rtc_tools/network_tester/packet_sender.h
@@ -14,7 +14,7 @@
 #include <memory>
 #include <string>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/ignore_wundef.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/task_queue.h"
diff --git a/rtc_tools/network_tester/test_controller.cc b/rtc_tools/network_tester/test_controller.cc
index 9e80294..87fb4c0 100644
--- a/rtc_tools/network_tester/test_controller.cc
+++ b/rtc_tools/network_tester/test_controller.cc
@@ -14,7 +14,7 @@
 
 #include "absl/types/optional.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/rtc_tools/network_tester/test_controller.h b/rtc_tools/network_tester/test_controller.h
index f411c9b..bde3b04 100644
--- a/rtc_tools/network_tester/test_controller.h
+++ b/rtc_tools/network_tester/test_controller.h
@@ -18,13 +18,13 @@
 #include <string>
 
 #include "absl/types/optional.h"
-#include "p2p/base/basicpacketsocketfactory.h"
-#include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/ignore_wundef.h"
 #include "rtc_base/sequenced_task_checker.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
diff --git a/rtc_tools/sanitizers_unittest.cc b/rtc_tools/sanitizers_unittest.cc
index 077cf7e..adee3a2 100644
--- a/rtc_tools/sanitizers_unittest.cc
+++ b/rtc_tools/sanitizers_unittest.cc
@@ -14,7 +14,7 @@
 
 #include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/nullsocketserver.h"
+#include "rtc_base/null_socket_server.h"
 #include "rtc_base/thread.h"
 #include "test/gtest.h"
 
diff --git a/rtc_tools/simple_command_line_parser.h b/rtc_tools/simple_command_line_parser.h
index 0acaf9e..b30ce72 100644
--- a/rtc_tools/simple_command_line_parser.h
+++ b/rtc_tools/simple_command_line_parser.h
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/gtest_prod_util.h"
 
 // This is a very basic command line parsing class. We pass the command line
diff --git a/rtc_tools/video_file_reader.cc b/rtc_tools/video_file_reader.cc
index b98e386..5733151 100644
--- a/rtc_tools/video_file_reader.cc
+++ b/rtc_tools/video_file_reader.cc
@@ -19,9 +19,9 @@
 #include "api/video/i420_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/string_to_number.h"
-#include "rtc_base/stringencode.h"
 
 namespace webrtc {
 namespace test {
diff --git a/rtc_tools/video_file_reader.h b/rtc_tools/video_file_reader.h
index 92a724a..a0315e3 100644
--- a/rtc_tools/video_file_reader.h
+++ b/rtc_tools/video_file_reader.h
@@ -16,7 +16,7 @@
 #include <string>
 
 #include "api/video/video_frame_buffer.h"
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/rtc_tools/video_file_reader_unittest.cc b/rtc_tools/video_file_reader_unittest.cc
index 9353727..c0258d1 100644
--- a/rtc_tools/video_file_reader_unittest.cc
+++ b/rtc_tools/video_file_reader_unittest.cc
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/rtc_tools/video_file_writer_unittest.cc b/rtc_tools/video_file_writer_unittest.cc
index 4c4b1a5..9a74b5f 100644
--- a/rtc_tools/video_file_writer_unittest.cc
+++ b/rtc_tools/video_file_writer_unittest.cc
@@ -16,7 +16,7 @@
 #include "rtc_tools/video_file_reader.h"
 #include "rtc_tools/video_file_writer.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 03d3d0e..ed0bdc4 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -127,7 +127,7 @@
   rtc_static_library("libjingle_peerconnection_metrics_default_jni") {
     visibility = [ "*" ]
     sources = [
-      "src/jni/androidmetrics.cc",
+      "src/jni/android_metrics.cc",
     ]
     deps = [
       ":base_jni",
@@ -535,11 +535,11 @@
   rtc_source_set("base_jni") {
     visibility = [ "*" ]
     sources = [
-      "src/jni/androidhistogram.cc",
-      "src/jni/androidnetworkmonitor.cc",
-      "src/jni/androidnetworkmonitor.h",
+      "src/jni/android_histogram.cc",
+      "src/jni/android_network_monitor.cc",
+      "src/jni/android_network_monitor.h",
       "src/jni/class_loader.h",
-      "src/jni/classreferenceholder.h",
+      "src/jni/class_reference_holder.h",
       "src/jni/jni_common.cc",
       "src/jni/jni_helpers.cc",
       "src/jni/jni_helpers.h",
@@ -581,8 +581,8 @@
 
   rtc_static_library("builtin_audio_codecs_jni") {
     sources = [
-      "src/jni/builtinaudiodecoderfactoryfactory.cc",
-      "src/jni/builtinaudioencoderfactoryfactory.cc",
+      "src/jni/builtin_audio_decoder_factory_factory.cc",
+      "src/jni/builtin_audio_encoder_factory_factory.cc",
     ]
 
     deps = [
@@ -600,9 +600,9 @@
     visibility = [ "*" ]
     allow_poison = [ "software_video_codecs" ]
     sources = [
-      "src/jni/androidmediacodeccommon.h",
-      "src/jni/androidmediadecoder.cc",
-      "src/jni/androidmediaencoder.cc",
+      "src/jni/android_media_codec_common.h",
+      "src/jni/android_media_decoder.cc",
+      "src/jni/android_media_encoder.cc",
     ]
     deps = [
       ":base_jni",
@@ -630,38 +630,38 @@
 
   rtc_static_library("video_jni") {
     sources = [
-      "src/jni/androidvideotracksource.cc",
-      "src/jni/androidvideotracksource.h",
-      "src/jni/encodedimage.cc",
-      "src/jni/encodedimage.h",
-      "src/jni/h264utils.cc",
-      "src/jni/javai420buffer.cc",
+      "src/jni/android_video_track_source.cc",
+      "src/jni/android_video_track_source.h",
+      "src/jni/encoded_image.cc",
+      "src/jni/encoded_image.h",
+      "src/jni/h264_utils.cc",
+      "src/jni/java_i420_buffer.cc",
       "src/jni/jni_generator_helper.h",
-      "src/jni/nativecapturerobserver.cc",
-      "src/jni/nativecapturerobserver.h",
-      "src/jni/nv12buffer.cc",
-      "src/jni/nv21buffer.cc",
+      "src/jni/native_capturer_observer.cc",
+      "src/jni/native_capturer_observer.h",
+      "src/jni/nv12_buffer.cc",
+      "src/jni/nv21_buffer.cc",
       "src/jni/pc/video.cc",
-      "src/jni/timestampaligner.cc",
-      "src/jni/videocodecinfo.cc",
-      "src/jni/videocodecinfo.h",
-      "src/jni/videocodecstatus.cc",
-      "src/jni/videocodecstatus.h",
-      "src/jni/videodecoderfactorywrapper.cc",
-      "src/jni/videodecoderfactorywrapper.h",
-      "src/jni/videodecoderfallback.cc",
-      "src/jni/videodecoderwrapper.cc",
-      "src/jni/videodecoderwrapper.h",
-      "src/jni/videoencoderfactorywrapper.cc",
-      "src/jni/videoencoderfactorywrapper.h",
-      "src/jni/videoencoderfallback.cc",
-      "src/jni/videoencoderwrapper.cc",
-      "src/jni/videoencoderwrapper.h",
-      "src/jni/videosink.cc",
-      "src/jni/videosink.h",
-      "src/jni/videosource.cc",
-      "src/jni/videotrack.cc",
-      "src/jni/yuvhelper.cc",
+      "src/jni/timestamp_aligner.cc",
+      "src/jni/video_codec_info.cc",
+      "src/jni/video_codec_info.h",
+      "src/jni/video_codec_status.cc",
+      "src/jni/video_codec_status.h",
+      "src/jni/video_decoder_factory_wrapper.cc",
+      "src/jni/video_decoder_factory_wrapper.h",
+      "src/jni/video_decoder_fallback.cc",
+      "src/jni/video_decoder_wrapper.cc",
+      "src/jni/video_decoder_wrapper.h",
+      "src/jni/video_encoder_factory_wrapper.cc",
+      "src/jni/video_encoder_factory_wrapper.h",
+      "src/jni/video_encoder_fallback.cc",
+      "src/jni/video_encoder_wrapper.cc",
+      "src/jni/video_encoder_wrapper.h",
+      "src/jni/video_sink.cc",
+      "src/jni/video_sink.h",
+      "src/jni/video_source.cc",
+      "src/jni/video_track.cc",
+      "src/jni/yuv_helper.cc",
     ]
 
     deps = [
@@ -694,52 +694,52 @@
     visibility = [ "*" ]
 
     sources = [
-      "src/jni/androidnetworkmonitor_jni.h",
-      "src/jni/pc/androidnetworkmonitor.h",
-      "src/jni/pc/audiotrack.cc",
-      "src/jni/pc/callsessionfilerotatinglogsink.cc",
-      "src/jni/pc/cryptooptions.cc",
-      "src/jni/pc/cryptooptions.h",
-      "src/jni/pc/datachannel.cc",
-      "src/jni/pc/datachannel.h",
-      "src/jni/pc/dtmfsender.cc",
-      "src/jni/pc/icecandidate.cc",
-      "src/jni/pc/icecandidate.h",
-      "src/jni/pc/mediaconstraints.cc",
-      "src/jni/pc/mediaconstraints.h",
-      "src/jni/pc/mediasource.cc",
-      "src/jni/pc/mediastream.cc",
-      "src/jni/pc/mediastream.h",
-      "src/jni/pc/mediastreamtrack.cc",
-      "src/jni/pc/mediastreamtrack.h",
-      "src/jni/pc/ownedfactoryandthreads.cc",
-      "src/jni/pc/ownedfactoryandthreads.h",
-      "src/jni/pc/peerconnection.cc",
-      "src/jni/pc/peerconnection.h",
-      "src/jni/pc/peerconnectionfactory.cc",
-      "src/jni/pc/peerconnectionfactory.h",
-      "src/jni/pc/rtccertificate.cc",
-      "src/jni/pc/rtccertificate.h",
-      "src/jni/pc/rtcstatscollectorcallbackwrapper.cc",
-      "src/jni/pc/rtcstatscollectorcallbackwrapper.h",
-      "src/jni/pc/rtpparameters.cc",
-      "src/jni/pc/rtpparameters.h",
-      "src/jni/pc/rtpreceiver.cc",
-      "src/jni/pc/rtpreceiver.h",
-      "src/jni/pc/rtpsender.cc",
-      "src/jni/pc/rtpsender.h",
-      "src/jni/pc/rtptransceiver.cc",
-      "src/jni/pc/rtptransceiver.h",
-      "src/jni/pc/sdpobserver.cc",
-      "src/jni/pc/sdpobserver.h",
-      "src/jni/pc/sessiondescription.cc",
-      "src/jni/pc/sessiondescription.h",
-      "src/jni/pc/sslcertificateverifierwrapper.cc",
-      "src/jni/pc/sslcertificateverifierwrapper.h",
-      "src/jni/pc/statsobserver.cc",
-      "src/jni/pc/statsobserver.h",
-      "src/jni/pc/turncustomizer.cc",
-      "src/jni/pc/turncustomizer.h",
+      "src/jni/android_network_monitor_jni.h",
+      "src/jni/pc/android_network_monitor.h",
+      "src/jni/pc/audio_track.cc",
+      "src/jni/pc/call_session_file_rotating_log_sink.cc",
+      "src/jni/pc/crypto_options.cc",
+      "src/jni/pc/crypto_options.h",
+      "src/jni/pc/data_channel.cc",
+      "src/jni/pc/data_channel.h",
+      "src/jni/pc/dtmf_sender.cc",
+      "src/jni/pc/ice_candidate.cc",
+      "src/jni/pc/ice_candidate.h",
+      "src/jni/pc/media_constraints.cc",
+      "src/jni/pc/media_constraints.h",
+      "src/jni/pc/media_source.cc",
+      "src/jni/pc/media_stream.cc",
+      "src/jni/pc/media_stream.h",
+      "src/jni/pc/media_stream_track.cc",
+      "src/jni/pc/media_stream_track.h",
+      "src/jni/pc/owned_factory_and_threads.cc",
+      "src/jni/pc/owned_factory_and_threads.h",
+      "src/jni/pc/peer_connection.cc",
+      "src/jni/pc/peer_connection.h",
+      "src/jni/pc/peer_connection_factory.cc",
+      "src/jni/pc/peer_connection_factory.h",
+      "src/jni/pc/rtc_certificate.cc",
+      "src/jni/pc/rtc_certificate.h",
+      "src/jni/pc/rtc_stats_collector_callback_wrapper.cc",
+      "src/jni/pc/rtc_stats_collector_callback_wrapper.h",
+      "src/jni/pc/rtp_parameters.cc",
+      "src/jni/pc/rtp_parameters.h",
+      "src/jni/pc/rtp_receiver.cc",
+      "src/jni/pc/rtp_receiver.h",
+      "src/jni/pc/rtp_sender.cc",
+      "src/jni/pc/rtp_sender.h",
+      "src/jni/pc/rtp_transceiver.cc",
+      "src/jni/pc/rtp_transceiver.h",
+      "src/jni/pc/sdp_observer.cc",
+      "src/jni/pc/sdp_observer.h",
+      "src/jni/pc/session_description.cc",
+      "src/jni/pc/session_description.h",
+      "src/jni/pc/ssl_certificate_verifier_wrapper.cc",
+      "src/jni/pc/ssl_certificate_verifier_wrapper.h",
+      "src/jni/pc/stats_observer.cc",
+      "src/jni/pc/stats_observer.h",
+      "src/jni/pc/turn_customizer.cc",
+      "src/jni/pc/turn_customizer.h",
     ]
 
     deps = [
@@ -795,7 +795,7 @@
     visibility = [ "*" ]
     allow_poison = [ "software_video_codecs" ]
     sources = [
-      "src/jni/vp8codec.cc",
+      "src/jni/vp8_codec.cc",
     ]
     deps = [
       ":base_jni",
@@ -809,7 +809,7 @@
     visibility = [ "*" ]
     allow_poison = [ "software_video_codecs" ]
     sources = [
-      "src/jni/vp9codec.cc",
+      "src/jni/vp9_codec.cc",
     ]
     deps = [
       ":base_jni",
@@ -867,8 +867,8 @@
     sources = [
       "native_api/base/init.cc",
       "native_api/base/init.h",
-      "native_api/base/networkmonitor.cc",
-      "native_api/base/networkmonitor.h",
+      "native_api/base/network_monitor.cc",
+      "native_api/base/network_monitor.h",
     ]
 
     deps = [
@@ -931,8 +931,8 @@
   rtc_static_library("native_api_peerconnection") {
     visibility = [ "*" ]
     sources = [
-      "native_api/peerconnection/peerconnectionfactory.cc",
-      "native_api/peerconnection/peerconnectionfactory.h",
+      "native_api/peerconnection/peer_connection_factory.cc",
+      "native_api/peerconnection/peer_connection_factory.h",
     ]
     deps = [
       ":base_jni",
@@ -949,8 +949,8 @@
     visibility = [ "*" ]
     allow_poison = [ "audio_codecs" ]  # TODO(bugs.webrtc.org/8396): Remove.
     sources = [
-      "native_api/video/videosource.cc",
-      "native_api/video/videosource.h",
+      "native_api/video/video_source.cc",
+      "native_api/video/video_source.h",
       "native_api/video/wrapper.cc",
       "native_api/video/wrapper.h",
     ]
@@ -1045,8 +1045,8 @@
 
   rtc_static_library("videoframe_jni") {
     sources = [
-      "src/jni/videoframe.cc",
-      "src/jni/videoframe.h",
+      "src/jni/video_frame.cc",
+      "src/jni/video_frame.h",
       "src/jni/wrapped_native_i420_buffer.cc",
       "src/jni/wrapped_native_i420_buffer.h",
     ]
@@ -1066,8 +1066,8 @@
   rtc_static_library("logging_jni") {
     visibility = [ "*" ]
     sources = [
-      "src/jni/logging/logsink.cc",
-      "src/jni/logging/logsink.h",
+      "src/jni/logging/log_sink.cc",
+      "src/jni/logging/log_sink.h",
     ]
 
     deps = [
@@ -1471,9 +1471,9 @@
       "native_unittests/audio_device/audio_device_unittest.cc",
       "native_unittests/codecs/wrapper_unittest.cc",
       "native_unittests/java_types_unittest.cc",
-      "native_unittests/peerconnection/peerconnectionfactory_unittest.cc",
+      "native_unittests/peerconnection/peer_connection_factory_unittest.cc",
       "native_unittests/test_jni_onload.cc",
-      "native_unittests/video/videosource_unittest.cc",
+      "native_unittests/video/video_source_unittest.cc",
     ]
 
     data = [
diff --git a/sdk/android/native_api/audio_device_module/audio_device_android.cc b/sdk/android/native_api/audio_device_module/audio_device_android.cc
index 89ffeb6..fb7ce91 100644
--- a/sdk/android/native_api/audio_device_module/audio_device_android.cc
+++ b/sdk/android/native_api/audio_device_module/audio_device_android.cc
@@ -15,8 +15,8 @@
 
 #include "absl/memory/memory.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 
 #if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
 #include "sdk/android/src/jni/audio_device/aaudio_player.h"
diff --git a/sdk/android/native_api/base/network_monitor.cc b/sdk/android/native_api/base/network_monitor.cc
index 5d33ab7..822fab9 100644
--- a/sdk/android/native_api/base/network_monitor.cc
+++ b/sdk/android/native_api/base/network_monitor.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/native_api/base/networkmonitor.h"
+#include "sdk/android/native_api/base/network_monitor.h"
 
 #include <memory>
 
 #include "absl/memory/memory.h"
-#include "sdk/android/src/jni/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/android_network_monitor.h"
 
 namespace webrtc {
 
diff --git a/sdk/android/native_api/base/network_monitor.h b/sdk/android/native_api/base/network_monitor.h
index 537a247..135ebb1 100644
--- a/sdk/android/native_api/base/network_monitor.h
+++ b/sdk/android/native_api/base/network_monitor.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_NATIVE_API_BASE_NETWORKMONITOR_H_
-#define SDK_ANDROID_NATIVE_API_BASE_NETWORKMONITOR_H_
+#ifndef SDK_ANDROID_NATIVE_API_BASE_NETWORK_MONITOR_H_
+#define SDK_ANDROID_NATIVE_API_BASE_NETWORK_MONITOR_H_
 
 #include <jni.h>
 
 #include <memory>
 
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/network_monitor.h"
 
 namespace webrtc {
 
@@ -33,4 +33,4 @@
 
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_NATIVE_API_BASE_NETWORKMONITOR_H_
+#endif  // SDK_ANDROID_NATIVE_API_BASE_NETWORK_MONITOR_H_
diff --git a/sdk/android/native_api/codecs/wrapper.cc b/sdk/android/native_api/codecs/wrapper.cc
index 3c5fb3d..6b78e7e 100644
--- a/sdk/android/native_api/codecs/wrapper.cc
+++ b/sdk/android/native_api/codecs/wrapper.cc
@@ -12,9 +12,9 @@
 
 #include "absl/memory/memory.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
-#include "sdk/android/src/jni/videocodecinfo.h"
-#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
-#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
+#include "sdk/android/src/jni/video_codec_info.h"
+#include "sdk/android/src/jni/video_decoder_factory_wrapper.h"
+#include "sdk/android/src/jni/video_encoder_factory_wrapper.h"
 
 namespace webrtc {
 
diff --git a/sdk/android/native_api/jni/scoped_java_ref.h b/sdk/android/native_api/jni/scoped_java_ref.h
index b26ef2c..e37a992 100644
--- a/sdk/android/native_api/jni/scoped_java_ref.h
+++ b/sdk/android/native_api/jni/scoped_java_ref.h
@@ -17,7 +17,7 @@
 #include <jni.h>
 #include <utility>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "sdk/android/native_api/jni/jvm.h"
 
 namespace webrtc {
diff --git a/sdk/android/native_api/peerconnection/peer_connection_factory.cc b/sdk/android/native_api/peerconnection/peer_connection_factory.cc
index 892905b..e683975 100644
--- a/sdk/android/native_api/peerconnection/peer_connection_factory.cc
+++ b/sdk/android/native_api/peerconnection/peer_connection_factory.cc
@@ -7,14 +7,14 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "sdk/android/native_api/peerconnection/peerconnectionfactory.h"
+#include "sdk/android/native_api/peerconnection/peer_connection_factory.h"
 
 #include <jni.h>
 
 #include <memory>
 #include <utility>
 
-#include "sdk/android/src/jni/pc/peerconnectionfactory.h"
+#include "sdk/android/src/jni/pc/peer_connection_factory.h"
 
 namespace webrtc {
 
diff --git a/sdk/android/native_api/peerconnection/peer_connection_factory.h b/sdk/android/native_api/peerconnection/peer_connection_factory.h
index 652be7a..889d609 100644
--- a/sdk/android/native_api/peerconnection/peer_connection_factory.h
+++ b/sdk/android/native_api/peerconnection/peer_connection_factory.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEERCONNECTIONFACTORY_H_
-#define SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEERCONNECTIONFACTORY_H_
+#ifndef SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEER_CONNECTION_FACTORY_H_
+#define SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEER_CONNECTION_FACTORY_H_
 
 #include <jni.h>
 
 #include <memory>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
@@ -31,4 +31,4 @@
 
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEERCONNECTIONFACTORY_H_
+#endif  // SDK_ANDROID_NATIVE_API_PEERCONNECTION_PEER_CONNECTION_FACTORY_H_
diff --git a/sdk/android/native_api/video/video_source.cc b/sdk/android/native_api/video/video_source.cc
index aae1de7..a813f40 100644
--- a/sdk/android/native_api/video/video_source.cc
+++ b/sdk/android/native_api/video/video_source.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/native_api/video/videosource.h"
+#include "sdk/android/native_api/video/video_source.h"
 
-#include "sdk/android/src/jni/androidvideotracksource.h"
-#include "sdk/android/src/jni/nativecapturerobserver.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
+#include "sdk/android/src/jni/native_capturer_observer.h"
 
 namespace webrtc {
 
diff --git a/sdk/android/native_api/video/video_source.h b/sdk/android/native_api/video/video_source.h
index 75ebdbc..d46f3e8 100644
--- a/sdk/android/native_api/video/video_source.h
+++ b/sdk/android/native_api/video/video_source.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_NATIVE_API_VIDEO_VIDEOSOURCE_H_
-#define SDK_ANDROID_NATIVE_API_VIDEO_VIDEOSOURCE_H_
+#ifndef SDK_ANDROID_NATIVE_API_VIDEO_VIDEO_SOURCE_H_
+#define SDK_ANDROID_NATIVE_API_VIDEO_VIDEO_SOURCE_H_
 
 #include <jni.h>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "rtc_base/thread.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
@@ -38,4 +38,4 @@
 
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_NATIVE_API_VIDEO_VIDEOSOURCE_H_
+#endif  // SDK_ANDROID_NATIVE_API_VIDEO_VIDEO_SOURCE_H_
diff --git a/sdk/android/native_api/video/wrapper.cc b/sdk/android/native_api/video/wrapper.cc
index fe2d45a..7b87ad6 100644
--- a/sdk/android/native_api/video/wrapper.cc
+++ b/sdk/android/native_api/video/wrapper.cc
@@ -12,8 +12,8 @@
 
 #include "absl/memory/memory.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
-#include "sdk/android/src/jni/videoframe.h"
-#include "sdk/android/src/jni/videosink.h"
+#include "sdk/android/src/jni/video_frame.h"
+#include "sdk/android/src/jni/video_sink.h"
 
 namespace webrtc {
 
diff --git a/sdk/android/native_api/video/wrapper.h b/sdk/android/native_api/video/wrapper.h
index fc670ea..e32cf34 100644
--- a/sdk/android/native_api/video/wrapper.h
+++ b/sdk/android/native_api/video/wrapper.h
@@ -14,7 +14,7 @@
 #include <jni.h>
 #include <memory>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "api/video/video_frame.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
diff --git a/sdk/android/native_unittests/audio_device/audio_device_unittest.cc b/sdk/android/native_unittests/audio_device/audio_device_unittest.cc
index 8774119..6f52880 100644
--- a/sdk/android/native_unittests/audio_device/audio_device_unittest.cc
+++ b/sdk/android/native_unittests/audio_device/audio_device_unittest.cc
@@ -14,11 +14,11 @@
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_device/include/mock_audio_transport.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_native_unittests_jni/jni/ApplicationContextProvider_jni.h"
 #include "sdk/android/generated_native_unittests_jni/jni/BuildInfo_jni.h"
 #include "sdk/android/native_api/audio_device_module/audio_device_android.h"
@@ -28,7 +28,7 @@
 #include "sdk/android/src/jni/jni_helpers.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 using std::cout;
 using std::endl;
diff --git a/sdk/android/native_unittests/codecs/DEPS b/sdk/android/native_unittests/codecs/DEPS
index 5c7289d..fb2c30f 100644
--- a/sdk/android/native_unittests/codecs/DEPS
+++ b/sdk/android/native_unittests/codecs/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  "+media/base/mediaconstants.h",
+  "+media/base/media_constants.h",
 ]
diff --git a/sdk/android/native_unittests/codecs/wrapper_unittest.cc b/sdk/android/native_unittests/codecs/wrapper_unittest.cc
index 453b7da..53efd22 100644
--- a/sdk/android/native_unittests/codecs/wrapper_unittest.cc
+++ b/sdk/android/native_unittests/codecs/wrapper_unittest.cc
@@ -9,7 +9,7 @@
  */
 
 #include "sdk/android/native_api/codecs/wrapper.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "sdk/android/generated_native_unittests_jni/jni/CodecsWrapperTestHelper_jni.h"
 #include "test/gtest.h"
 
diff --git a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
index 5b902b7..de02071 100644
--- a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
+++ b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
@@ -7,16 +7,16 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "sdk/android/native_api/peerconnection/peerconnectionfactory.h"
+#include "sdk/android/native_api/peerconnection/peer_connection_factory.h"
 
 #include "absl/memory/memory.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "logging/rtc_event_log/rtc_event_log_factory.h"
-#include "media/base/mediaengine.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/base/media_engine.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
+#include "media/engine/webrtc_media_engine.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "rtc_base/logging.h"
 #include "sdk/android/generated_native_unittests_jni/jni/PeerConnectionFactoryInitializationHelper_jni.h"
diff --git a/sdk/android/native_unittests/video/video_source_unittest.cc b/sdk/android/native_unittests/video/video_source_unittest.cc
index 7ecf9f8..17d1df9 100644
--- a/sdk/android/native_unittests/video/video_source_unittest.cc
+++ b/sdk/android/native_unittests/video/video_source_unittest.cc
@@ -12,7 +12,7 @@
 
 #include "api/video/video_sink_interface.h"
 #include "sdk/android/generated_native_unittests_jni/jni/JavaVideoSourceTestHelper_jni.h"
-#include "sdk/android/native_api/video/videosource.h"
+#include "sdk/android/native_api/video/video_source.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/sdk/android/src/jni/android_media_codec_common.h b/sdk/android/src/jni/android_media_codec_common.h
index cc418ee..55955b0 100644
--- a/sdk/android/src/jni/android_media_codec_common.h
+++ b/sdk/android/src/jni/android_media_codec_common.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
-#define SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
+#ifndef SDK_ANDROID_SRC_JNI_ANDROID_MEDIA_CODEC_COMMON_H_
+#define SDK_ANDROID_SRC_JNI_ANDROID_MEDIA_CODEC_COMMON_H_
 
 #include <string>
 
@@ -84,4 +84,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_ANDROIDMEDIACODECCOMMON_H_
+#endif  // SDK_ANDROID_SRC_JNI_ANDROID_MEDIA_CODEC_COMMON_H_
diff --git a/sdk/android/src/jni/android_media_decoder.cc b/sdk/android/src/jni/android_media_decoder.cc
index 70d5b58..a73167d 100644
--- a/sdk/android/src/jni/android_media_decoder.cc
+++ b/sdk/android/src/jni/android_media_decoder.cc
@@ -16,7 +16,7 @@
 #include "api/video_codecs/sdp_video_format.h"
 #include "common_video/h264/h264_bitstream_parser.h"
 #include "common_video/include/i420_buffer_pool.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/utility/vp8_header_parser.h"
 #include "rtc_base/bind.h"
@@ -25,11 +25,11 @@
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_video_jni/jni/MediaCodecVideoDecoder_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidmediacodeccommon.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/android_media_codec_common.h"
+#include "sdk/android/src/jni/video_frame.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/planar_functions.h"
 #include "third_party/libyuv/include/libyuv/video_common.h"
diff --git a/sdk/android/src/jni/android_media_encoder.cc b/sdk/android/src/jni/android_media_encoder.cc
index 0bf7186..aaa2d9a 100644
--- a/sdk/android/src/jni/android_media_encoder.cc
+++ b/sdk/android/src/jni/android_media_encoder.cc
@@ -21,8 +21,8 @@
 #include "common_video/h264/h264_common.h"
 #include "common_video/h264/profile_level_id.h"
 #include "media/base/codec.h"
-#include "media/base/mediaconstants.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/base/media_constants.h"
+#include "media/engine/internal_encoder_factory.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/utility/quality_scaler.h"
 #include "modules/video_coding/utility/vp8_header_parser.h"
@@ -33,14 +33,14 @@
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/weak_ptr.h"
 #include "sdk/android/generated_video_jni/jni/MediaCodecVideoEncoder_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidmediacodeccommon.h"
+#include "sdk/android/src/jni/android_media_codec_common.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videocodecinfo.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_codec_info.h"
+#include "sdk/android/src/jni/video_frame.h"
 #include "system_wrappers/include/field_trial.h"
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/convert_from.h"
diff --git a/sdk/android/src/jni/android_network_monitor.cc b/sdk/android/src/jni/android_network_monitor.cc
index 7ac1728..b45d177 100644
--- a/sdk/android/src/jni/android_network_monitor.cc
+++ b/sdk/android/src/jni/android_network_monitor.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/android_network_monitor.h"
 
 #include <dlfcn.h>
 #ifndef RTLD_NOLOAD
@@ -18,7 +18,7 @@
 
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/ipaddress.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
 #include "sdk/android/generated_base_jni/jni/NetworkMonitorAutoDetect_jni.h"
diff --git a/sdk/android/src/jni/android_network_monitor.h b/sdk/android/src/jni/android_network_monitor.h
index 563d5bd..898ddc9 100644
--- a/sdk/android/src/jni/android_network_monitor.h
+++ b/sdk/android/src/jni/android_network_monitor.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
-#define SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
+#ifndef SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_
+#define SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_
 
 #include <stdint.h>
 #include <map>
 #include <string>
 #include <vector>
 
-#include "rtc_base/networkmonitor.h"
+#include "rtc_base/network_monitor.h"
 #include "rtc_base/thread_checker.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
@@ -136,4 +136,4 @@
 
 }  // namespace webrtc_jni
 
-#endif  // SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_H_
+#endif  // SDK_ANDROID_SRC_JNI_ANDROID_NETWORK_MONITOR_H_
diff --git a/sdk/android/src/jni/android_network_monitor_jni.h b/sdk/android/src/jni/android_network_monitor_jni.h
index 407e6f6..e703974 100644
--- a/sdk/android/src/jni/android_network_monitor_jni.h
+++ b/sdk/android/src/jni/android_network_monitor_jni.h
@@ -11,4 +11,4 @@
 // TODO(deadbeef): Remove this file when clients are updated to new include
 // path.
 
-#include "sdk/android/src/jni/pc/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/pc/android_network_monitor.h"
diff --git a/sdk/android/src/jni/android_video_track_source.cc b/sdk/android/src/jni/android_video_track_source.cc
index f573eda..4fbbffb 100644
--- a/sdk/android/src/jni/android_video_track_source.cc
+++ b/sdk/android/src/jni/android_video_track_source.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
 
 #include <utility>
 
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
 #include "rtc_base/logging.h"
 
 namespace webrtc {
diff --git a/sdk/android/src/jni/android_video_track_source.h b/sdk/android/src/jni/android_video_track_source.h
index 4f8442e..c68f8d1 100644
--- a/sdk/android/src/jni/android_video_track_source.h
+++ b/sdk/android/src/jni/android_video_track_source.h
@@ -15,12 +15,12 @@
 
 #include "common_video/include/i420_buffer_pool.h"
 #include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "media/base/adaptedvideotracksource.h"
-#include "rtc_base/asyncinvoker.h"
+#include "media/base/adapted_video_track_source.h"
+#include "rtc_base/async_invoker.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/thread_checker.h"
-#include "rtc_base/timestampaligner.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "rtc_base/timestamp_aligner.h"
+#include "sdk/android/src/jni/video_frame.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/audio_device/aaudio_player.h b/sdk/android/src/jni/audio_device/aaudio_player.h
index b43b5b3..e6146d0 100644
--- a/sdk/android/src/jni/audio_device/aaudio_player.h
+++ b/sdk/android/src/jni/audio_device/aaudio_player.h
@@ -17,7 +17,7 @@
 #include "absl/types/optional.h"
 #include "modules/audio_device/audio_device_buffer.h"
 #include "modules/audio_device/include/audio_device_defines.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
diff --git a/sdk/android/src/jni/audio_device/aaudio_recorder.cc b/sdk/android/src/jni/audio_device/aaudio_recorder.cc
index 8134d3c..7393275 100644
--- a/sdk/android/src/jni/audio_device/aaudio_recorder.cc
+++ b/sdk/android/src/jni/audio_device/aaudio_recorder.cc
@@ -15,7 +15,7 @@
 #include "modules/audio_device/fine_audio_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 #include "system_wrappers/include/sleep.h"
 
diff --git a/sdk/android/src/jni/audio_device/aaudio_recorder.h b/sdk/android/src/jni/audio_device/aaudio_recorder.h
index ec38083..0ed0fa2 100644
--- a/sdk/android/src/jni/audio_device/aaudio_recorder.h
+++ b/sdk/android/src/jni/audio_device/aaudio_recorder.h
@@ -16,7 +16,7 @@
 
 #include "modules/audio_device/audio_device_buffer.h"
 #include "modules/audio_device/include/audio_device_defines.h"
-#include "rtc_base/messagehandler.h"
+#include "rtc_base/message_handler.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_checker.h"
 #include "sdk/android/src/jni/audio_device/aaudio_wrapper.h"
diff --git a/sdk/android/src/jni/audio_device/aaudio_wrapper.cc b/sdk/android/src/jni/audio_device/aaudio_wrapper.cc
index a9d647f..99a2a7f 100644
--- a/sdk/android/src/jni/audio_device/aaudio_wrapper.cc
+++ b/sdk/android/src/jni/audio_device/aaudio_wrapper.cc
@@ -12,7 +12,7 @@
 
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 #define LOG_ON_ERROR(op)                                                      \
   do {                                                                        \
diff --git a/sdk/android/src/jni/audio_device/audio_device_module.cc b/sdk/android/src/jni/audio_device/audio_device_module.cc
index 36bd70c..61be7def 100644
--- a/sdk/android/src/jni/audio_device/audio_device_module.cc
+++ b/sdk/android/src/jni/audio_device/audio_device_module.cc
@@ -16,7 +16,7 @@
 #include "modules/audio_device/audio_device_buffer.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/thread_checker.h"
 #include "sdk/android/generated_audio_device_module_base_jni/jni/WebRtcAudioManager_jni.h"
 #include "system_wrappers/include/metrics.h"
diff --git a/sdk/android/src/jni/audio_device/audio_record_jni.cc b/sdk/android/src/jni/audio_device/audio_record_jni.cc
index 390cec0..74c0f36 100644
--- a/sdk/android/src/jni/audio_device/audio_record_jni.cc
+++ b/sdk/android/src/jni/audio_device/audio_record_jni.cc
@@ -18,7 +18,7 @@
 #include "rtc_base/format_macros.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_java_audio_device_module_native_jni/jni/WebRtcAudioRecord_jni.h"
 #include "sdk/android/src/jni/audio_device/audio_common.h"
 #include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/audio_device/opensles_player.cc b/sdk/android/src/jni/audio_device/opensles_player.cc
index 00a5f1e..67d6c1f 100644
--- a/sdk/android/src/jni/audio_device/opensles_player.cc
+++ b/sdk/android/src/jni/audio_device/opensles_player.cc
@@ -19,7 +19,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/src/jni/audio_device/audio_common.h"
 
 #define TAG "OpenSLESPlayer"
diff --git a/sdk/android/src/jni/audio_device/opensles_recorder.cc b/sdk/android/src/jni/audio_device/opensles_recorder.cc
index 32d9e5c..4f14907 100644
--- a/sdk/android/src/jni/audio_device/opensles_recorder.cc
+++ b/sdk/android/src/jni/audio_device/opensles_recorder.cc
@@ -19,7 +19,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/src/jni/audio_device/audio_common.h"
 
 #define TAG "OpenSLESRecorder"
diff --git a/sdk/android/src/jni/class_reference_holder.h b/sdk/android/src/jni/class_reference_holder.h
index 51759fc..4702f5e 100644
--- a/sdk/android/src/jni/class_reference_holder.h
+++ b/sdk/android/src/jni/class_reference_holder.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
-#define SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
+#ifndef SDK_ANDROID_SRC_JNI_CLASS_REFERENCE_HOLDER_H_
+#define SDK_ANDROID_SRC_JNI_CLASS_REFERENCE_HOLDER_H_
 
 // TODO(magjed): Update external clients to call webrtc::jni::InitClassLoader
 // immediately instead.
@@ -38,4 +38,4 @@
 
 }  // namespace webrtc_jni
 
-#endif  // SDK_ANDROID_SRC_JNI_CLASSREFERENCEHOLDER_H_
+#endif  // SDK_ANDROID_SRC_JNI_CLASS_REFERENCE_HOLDER_H_
diff --git a/sdk/android/src/jni/encoded_image.cc b/sdk/android/src/jni/encoded_image.cc
index 21f8336..daa7788 100644
--- a/sdk/android/src/jni/encoded_image.cc
+++ b/sdk/android/src/jni/encoded_image.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/encodedimage.h"
+#include "sdk/android/src/jni/encoded_image.h"
 
 #include "api/video/encoded_image.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_video_jni/jni/EncodedImage_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/encoded_image.h b/sdk/android/src/jni/encoded_image.h
index 66c226b..02047aa 100644
--- a/sdk/android/src/jni/encoded_image.h
+++ b/sdk/android/src/jni/encoded_image.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
-#define SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
+#ifndef SDK_ANDROID_SRC_JNI_ENCODED_IMAGE_H_
+#define SDK_ANDROID_SRC_JNI_ENCODED_IMAGE_H_
 
 #include <jni.h>
 #include "common_types.h"  // NOLINT(build/include)
@@ -33,4 +33,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_ENCODEDIMAGE_H_
+#endif  // SDK_ANDROID_SRC_JNI_ENCODED_IMAGE_H_
diff --git a/sdk/android/src/jni/h264_utils.cc b/sdk/android/src/jni/h264_utils.cc
index 12324b5..c067abd 100644
--- a/sdk/android/src/jni/h264_utils.cc
+++ b/sdk/android/src/jni/h264_utils.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videocodecinfo.h"
+#include "sdk/android/src/jni/video_codec_info.h"
 
 #include "common_video/h264/profile_level_id.h"
 #include "sdk/android/generated_video_jni/jni/H264Utils_jni.h"
diff --git a/sdk/android/src/jni/jni_common.cc b/sdk/android/src/jni/jni_common.cc
index 8129b1e..915a935 100644
--- a/sdk/android/src/jni/jni_common.cc
+++ b/sdk/android/src/jni/jni_common.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/refcount.h"
+#include "rtc_base/ref_count.h"
 #include "sdk/android/generated_base_jni/jni/JniCommon_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
diff --git a/sdk/android/src/jni/jni_generator_helper.cc b/sdk/android/src/jni/jni_generator_helper.cc
index 24a6212..d26c992 100644
--- a/sdk/android/src/jni/jni_generator_helper.cc
+++ b/sdk/android/src/jni/jni_generator_helper.cc
@@ -10,7 +10,7 @@
 
 #include "sdk/android/src/jni/jni_generator_helper.h"
 
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "sdk/android/native_api/jni/class_loader.h"
 
 namespace webrtc {
diff --git a/sdk/android/src/jni/jni_onload.cc b/sdk/android/src/jni/jni_onload.cc
index 83c61d6..88730ea 100644
--- a/sdk/android/src/jni/jni_onload.cc
+++ b/sdk/android/src/jni/jni_onload.cc
@@ -12,8 +12,8 @@
 #undef JNIEXPORT
 #define JNIEXPORT __attribute__((visibility("default")))
 
-#include "rtc_base/ssladapter.h"
-#include "sdk/android/src/jni/classreferenceholder.h"
+#include "rtc_base/ssl_adapter.h"
+#include "sdk/android/src/jni/class_reference_holder.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
diff --git a/sdk/android/src/jni/logging/log_sink.cc b/sdk/android/src/jni/logging/log_sink.cc
index cfa3c60..eebe668 100644
--- a/sdk/android/src/jni/logging/log_sink.cc
+++ b/sdk/android/src/jni/logging/log_sink.cc
@@ -7,7 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "sdk/android/src/jni/logging/logsink.h"
+#include "sdk/android/src/jni/logging/log_sink.h"
 
 #include "sdk/android/generated_logging_jni/jni/JNILogging_jni.h"
 
diff --git a/sdk/android/src/jni/logging/log_sink.h b/sdk/android/src/jni/logging/log_sink.h
index bac51a0..e48b88d 100644
--- a/sdk/android/src/jni/logging/log_sink.h
+++ b/sdk/android/src/jni/logging/log_sink.h
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
-#define SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
+#ifndef SDK_ANDROID_SRC_JNI_LOGGING_LOG_SINK_H_
+#define SDK_ANDROID_SRC_JNI_LOGGING_LOG_SINK_H_
 
 #include <string>
 
@@ -36,4 +36,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_LOGGING_LOGSINK_H_
+#endif  // SDK_ANDROID_SRC_JNI_LOGGING_LOG_SINK_H_
diff --git a/sdk/android/src/jni/native_capturer_observer.cc b/sdk/android/src/jni/native_capturer_observer.cc
index c332343..fe6f836 100644
--- a/sdk/android/src/jni/native_capturer_observer.cc
+++ b/sdk/android/src/jni/native_capturer_observer.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/nativecapturerobserver.h"
+#include "sdk/android/src/jni/native_capturer_observer.h"
 
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
 #include "rtc_base/logging.h"
 #include "sdk/android/generated_video_jni/jni/NativeCapturerObserver_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/native_capturer_observer.h b/sdk/android/src/jni/native_capturer_observer.h
index 57ddc07..51acf41 100644
--- a/sdk/android/src/jni/native_capturer_observer.h
+++ b/sdk/android/src/jni/native_capturer_observer.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_NATIVE_CAPTURER_OBSERVER_H_
+#define SDK_ANDROID_SRC_JNI_NATIVE_CAPTURER_OBSERVER_H_
 
 #include <jni.h>
 
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
 
 namespace webrtc {
 namespace jni {
@@ -26,4 +26,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
+#endif  // SDK_ANDROID_SRC_JNI_NATIVE_CAPTURER_OBSERVER_H_
diff --git a/sdk/android/src/jni/pc/android_network_monitor.h b/sdk/android/src/jni/pc/android_network_monitor.h
index 3eee11b..609c1b0 100644
--- a/sdk/android/src/jni/pc/android_network_monitor.h
+++ b/sdk/android/src/jni/pc/android_network_monitor.h
@@ -9,4 +9,4 @@
  */
 
 // TODO(sakal): Remove this file once clients have update to the native API.
-#include "sdk/android/src/jni/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/android_network_monitor.h"
diff --git a/sdk/android/src/jni/pc/audio_track.cc b/sdk/android/src/jni/pc/audio_track.cc
index ed1d0bc..355df39 100644
--- a/sdk/android/src/jni/pc/audio_track.cc
+++ b/sdk/android/src/jni/pc/audio_track.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "sdk/android/generated_peerconnection_jni/jni/AudioTrack_jni.h"
 
 namespace webrtc {
diff --git a/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc b/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc
index d933daa..bc65c3a 100644
--- a/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc
+++ b/sdk/android/src/jni/pc/call_session_file_rotating_log_sink.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_base/logsinks.h"
+#include "rtc_base/log_sinks.h"
 #include "sdk/android/generated_peerconnection_jni/jni/CallSessionFileRotatingLogSink_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/crypto_options.cc b/sdk/android/src/jni/pc/crypto_options.cc
index 0f38b13..a592df8 100644
--- a/sdk/android/src/jni/pc/crypto_options.cc
+++ b/sdk/android/src/jni/pc/crypto_options.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/cryptooptions.h"
+#include "sdk/android/src/jni/pc/crypto_options.h"
 
 #include "sdk/android/generated_peerconnection_jni/jni/CryptoOptions_jni.h"
 
diff --git a/sdk/android/src/jni/pc/crypto_options.h b/sdk/android/src/jni/pc/crypto_options.h
index 9890264..a9c8f26 100644
--- a/sdk/android/src/jni/pc/crypto_options.h
+++ b/sdk/android/src/jni/pc/crypto_options.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
-#define SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_CRYPTO_OPTIONS_H_
+#define SDK_ANDROID_SRC_JNI_PC_CRYPTO_OPTIONS_H_
 
 #include <jni.h>
 
 #include "absl/types/optional.h"
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -27,4 +27,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_CRYPTOOPTIONS_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_CRYPTO_OPTIONS_H_
diff --git a/sdk/android/src/jni/pc/data_channel.cc b/sdk/android/src/jni/pc/data_channel.cc
index d07e00e..4f704e2 100644
--- a/sdk/android/src/jni/pc/data_channel.cc
+++ b/sdk/android/src/jni/pc/data_channel.cc
@@ -13,12 +13,12 @@
 #include <limits>
 
 #include "absl/memory/memory.h"
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 #include "rtc_base/logging.h"
 #include "sdk/android/generated_peerconnection_jni/jni/DataChannel_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/datachannel.h"
+#include "sdk/android/src/jni/pc/data_channel.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/pc/data_channel.h b/sdk/android/src/jni/pc/data_channel.h
index c6786f6..9da1b67 100644
--- a/sdk/android/src/jni/pc/data_channel.h
+++ b/sdk/android/src/jni/pc/data_channel.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
-#define SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_DATA_CHANNEL_H_
+#define SDK_ANDROID_SRC_JNI_PC_DATA_CHANNEL_H_
 
 namespace webrtc {
 namespace jni {
@@ -24,4 +24,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_DATACHANNEL_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_DATA_CHANNEL_H_
diff --git a/sdk/android/src/jni/pc/dtmf_sender.cc b/sdk/android/src/jni/pc/dtmf_sender.cc
index 0dad8bd..a9c1995 100644
--- a/sdk/android/src/jni/pc/dtmf_sender.cc
+++ b/sdk/android/src/jni/pc/dtmf_sender.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/dtmfsenderinterface.h"
+#include "api/dtmf_sender_interface.h"
 #include "sdk/android/generated_peerconnection_jni/jni/DtmfSender_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/ice_candidate.cc b/sdk/android/src/jni/pc/ice_candidate.cc
index b9d66a4..ee4a4cd 100644
--- a/sdk/android/src/jni/pc/ice_candidate.cc
+++ b/sdk/android/src/jni/pc/ice_candidate.cc
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/icecandidate.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
 
 #include <string>
 
-#include "pc/webrtcsdp.h"
+#include "pc/webrtc_sdp.h"
 #include "sdk/android/generated_peerconnection_jni/jni/IceCandidate_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/pc/ice_candidate.h b/sdk/android/src/jni/pc/ice_candidate.h
index 662b649..0feeeb4 100644
--- a/sdk/android/src/jni/pc/ice_candidate.h
+++ b/sdk/android/src/jni/pc/ice_candidate.h
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
-#define SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_ICE_CANDIDATE_H_
+#define SDK_ANDROID_SRC_JNI_PC_ICE_CANDIDATE_H_
 
 #include <vector>
 
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 #include "api/jsep.h"
-#include "api/jsepicecandidate.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtpparameters.h"
-#include "rtc_base/sslidentity.h"
+#include "api/jsep_ice_candidate.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtp_parameters.h"
+#include "rtc_base/ssl_identity.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -82,4 +82,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_ICECANDIDATE_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_ICE_CANDIDATE_H_
diff --git a/sdk/android/src/jni/pc/media.cc b/sdk/android/src/jni/pc/media.cc
index d1d9627..e2da4ec 100644
--- a/sdk/android/src/jni/pc/media.cc
+++ b/sdk/android/src/jni/pc/media.cc
@@ -11,11 +11,11 @@
 
 #include <utility>
 
-#include "api/call/callfactoryinterface.h"
+#include "api/call/call_factory_interface.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
 #include "logging/rtc_event_log/rtc_event_log_factory.h"
-#include "media/engine/webrtcmediaengine.h"
+#include "media/engine/webrtc_media_engine.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
 
diff --git a/sdk/android/src/jni/pc/media_constraints.cc b/sdk/android/src/jni/pc/media_constraints.cc
index e7a4bb5..8c7d173 100644
--- a/sdk/android/src/jni/pc/media_constraints.cc
+++ b/sdk/android/src/jni/pc/media_constraints.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/mediaconstraints.h"
+#include "sdk/android/src/jni/pc/media_constraints.h"
 
 #include "absl/memory/memory.h"
 #include "sdk/android/generated_peerconnection_jni/jni/MediaConstraints_jni.h"
diff --git a/sdk/android/src/jni/pc/media_constraints.h b/sdk/android/src/jni/pc/media_constraints.h
index 2fbf34e..e29b900 100644
--- a/sdk/android/src/jni/pc/media_constraints.h
+++ b/sdk/android/src/jni/pc/media_constraints.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIA_CONSTRAINTS_H_
+#define SDK_ANDROID_SRC_JNI_PC_MEDIA_CONSTRAINTS_H_
 
 #include <jni.h>
 #include <memory>
 
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -27,4 +27,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIACONSTRAINTS_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIA_CONSTRAINTS_H_
diff --git a/sdk/android/src/jni/pc/media_source.cc b/sdk/android/src/jni/pc/media_source.cc
index 6a7f47b..83cdfb7 100644
--- a/sdk/android/src/jni/pc/media_source.cc
+++ b/sdk/android/src/jni/pc/media_source.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "sdk/android/generated_peerconnection_jni/jni/MediaSource_jni.h"
 
 namespace webrtc {
diff --git a/sdk/android/src/jni/pc/media_stream.cc b/sdk/android/src/jni/pc/media_stream.cc
index 35efc17..deb4252 100644
--- a/sdk/android/src/jni/pc/media_stream.cc
+++ b/sdk/android/src/jni/pc/media_stream.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/mediastream.h"
+#include "sdk/android/src/jni/pc/media_stream.h"
 
 #include "absl/memory/memory.h"
 #include "sdk/android/generated_peerconnection_jni/jni/MediaStream_jni.h"
diff --git a/sdk/android/src/jni/pc/media_stream.h b/sdk/android/src/jni/pc/media_stream.h
index 479ab11..135a349 100644
--- a/sdk/android/src/jni/pc/media_stream.h
+++ b/sdk/android/src/jni/pc/media_stream.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_H_
+#define SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_H_
 
 #include <jni.h>
 #include <memory>
 
-#include "api/mediastreaminterface.h"
-#include "pc/mediastreamobserver.h"
+#include "api/media_stream_interface.h"
+#include "pc/media_stream_observer.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -51,4 +51,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIASTREAM_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_H_
diff --git a/sdk/android/src/jni/pc/media_stream_track.cc b/sdk/android/src/jni/pc/media_stream_track.cc
index 67044cc..19ce610 100644
--- a/sdk/android/src/jni/pc/media_stream_track.cc
+++ b/sdk/android/src/jni/pc/media_stream_track.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "sdk/android/generated_peerconnection_jni/jni/MediaStreamTrack_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/media_stream_track.h b/sdk/android/src/jni/pc/media_stream_track.h
index 8af425c..8bfe302 100644
--- a/sdk/android/src/jni/pc/media_stream_track.h
+++ b/sdk/android/src/jni/pc/media_stream_track.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
-#define SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_TRACK_H_
+#define SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_TRACK_H_
 
 #include <jni.h>
 
-#include "api/mediatypes.h"
+#include "api/media_types.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -28,4 +28,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIASTREAMTRACK_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_MEDIA_STREAM_TRACK_H_
diff --git a/sdk/android/src/jni/pc/owned_factory_and_threads.cc b/sdk/android/src/jni/pc/owned_factory_and_threads.cc
index 2d62ea3..5d7a0bb 100644
--- a/sdk/android/src/jni/pc/owned_factory_and_threads.cc
+++ b/sdk/android/src/jni/pc/owned_factory_and_threads.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h"
+#include "sdk/android/src/jni/pc/owned_factory_and_threads.h"
 
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/peerconnectionfactory.h"
+#include "sdk/android/src/jni/pc/peer_connection_factory.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/pc/owned_factory_and_threads.h b/sdk/android/src/jni/pc/owned_factory_and_threads.h
index bacd42d..cc71001 100644
--- a/sdk/android/src/jni/pc/owned_factory_and_threads.h
+++ b/sdk/android/src/jni/pc/owned_factory_and_threads.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
-#define SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_OWNED_FACTORY_AND_THREADS_H_
+#define SDK_ANDROID_SRC_JNI_PC_OWNED_FACTORY_AND_THREADS_H_
 
 #include <jni.h>
 #include <memory>
 #include <utility>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
@@ -60,4 +60,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_OWNEDFACTORYANDTHREADS_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_OWNED_FACTORY_AND_THREADS_H_
diff --git a/sdk/android/src/jni/pc/peer_connection.cc b/sdk/android/src/jni/pc/peer_connection.cc
index 142454a..50a48c4 100644
--- a/sdk/android/src/jni/pc/peer_connection.cc
+++ b/sdk/android/src/jni/pc/peer_connection.cc
@@ -25,7 +25,7 @@
 // return to the Java frame that called code in this file, at which point it's
 // impossible to tell which JNI call broke).
 
-#include "sdk/android/src/jni/pc/peerconnection.h"
+#include "sdk/android/src/jni/pc/peer_connection.h"
 
 #include <limits>
 #include <memory>
@@ -33,28 +33,28 @@
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "api/mediaconstraintsinterface.h"
-#include "api/peerconnectioninterface.h"
-#include "api/rtpreceiverinterface.h"
-#include "api/rtpsenderinterface.h"
-#include "api/rtptransceiverinterface.h"
+#include "api/media_constraints_interface.h"
+#include "api/peer_connection_interface.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_interface.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "sdk/android/generated_peerconnection_jni/jni/PeerConnection_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/cryptooptions.h"
-#include "sdk/android/src/jni/pc/datachannel.h"
-#include "sdk/android/src/jni/pc/icecandidate.h"
-#include "sdk/android/src/jni/pc/mediaconstraints.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
-#include "sdk/android/src/jni/pc/rtccertificate.h"
-#include "sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h"
-#include "sdk/android/src/jni/pc/rtpsender.h"
-#include "sdk/android/src/jni/pc/sdpobserver.h"
-#include "sdk/android/src/jni/pc/sessiondescription.h"
-#include "sdk/android/src/jni/pc/statsobserver.h"
-#include "sdk/android/src/jni/pc/turncustomizer.h"
+#include "sdk/android/src/jni/pc/crypto_options.h"
+#include "sdk/android/src/jni/pc/data_channel.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
+#include "sdk/android/src/jni/pc/media_constraints.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
+#include "sdk/android/src/jni/pc/rtc_certificate.h"
+#include "sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h"
+#include "sdk/android/src/jni/pc/rtp_sender.h"
+#include "sdk/android/src/jni/pc/sdp_observer.h"
+#include "sdk/android/src/jni/pc/session_description.h"
+#include "sdk/android/src/jni/pc/stats_observer.h"
+#include "sdk/android/src/jni/pc/turn_customizer.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/pc/peer_connection.h b/sdk/android/src/jni/pc/peer_connection.h
index 7a282bf..15465e4 100644
--- a/sdk/android/src/jni/pc/peer_connection.h
+++ b/sdk/android/src/jni/pc/peer_connection.h
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
-#define SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_H_
+#define SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
-#include "api/peerconnectioninterface.h"
-#include "pc/mediastreamobserver.h"
+#include "api/peer_connection_interface.h"
+#include "pc/media_stream_observer.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediaconstraints.h"
-#include "sdk/android/src/jni/pc/mediastream.h"
-#include "sdk/android/src/jni/pc/rtpreceiver.h"
-#include "sdk/android/src/jni/pc/rtptransceiver.h"
+#include "sdk/android/src/jni/pc/media_constraints.h"
+#include "sdk/android/src/jni/pc/media_stream.h"
+#include "sdk/android/src/jni/pc/rtp_receiver.h"
+#include "sdk/android/src/jni/pc/rtp_transceiver.h"
 
 namespace webrtc {
 namespace jni {
@@ -125,4 +125,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_PEERCONNECTION_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_H_
diff --git a/sdk/android/src/jni/pc/peer_connection_factory.cc b/sdk/android/src/jni/pc/peer_connection_factory.cc
index 726295c..293031f 100644
--- a/sdk/android/src/jni/pc/peer_connection_factory.cc
+++ b/sdk/android/src/jni/pc/peer_connection_factory.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/peerconnectionfactory.h"
+#include "sdk/android/src/jni/pc/peer_connection_factory.h"
 
 #include <memory>
 #include <utility>
@@ -16,7 +16,7 @@
 #include "absl/memory/memory.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "media/base/mediaengine.h"
+#include "media/base/media_engine.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/utility/include/jvm_android.h"
 // We don't depend on the audio processing module implementation.
@@ -27,14 +27,14 @@
 #include "sdk/android/generated_peerconnection_jni/jni/PeerConnectionFactory_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/logging/logsink.h"
-#include "sdk/android/src/jni/pc/androidnetworkmonitor.h"
+#include "sdk/android/src/jni/logging/log_sink.h"
+#include "sdk/android/src/jni/pc/android_network_monitor.h"
 #include "sdk/android/src/jni/pc/audio.h"
-#include "sdk/android/src/jni/pc/icecandidate.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
 #include "sdk/android/src/jni/pc/media.h"
-#include "sdk/android/src/jni/pc/ownedfactoryandthreads.h"
-#include "sdk/android/src/jni/pc/peerconnection.h"
-#include "sdk/android/src/jni/pc/sslcertificateverifierwrapper.h"
+#include "sdk/android/src/jni/pc/owned_factory_and_threads.h"
+#include "sdk/android/src/jni/pc/peer_connection.h"
+#include "sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h"
 #include "sdk/android/src/jni/pc/video.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/sdk/android/src/jni/pc/peer_connection_factory.h b/sdk/android/src/jni/pc/peer_connection_factory.h
index 6f09776..ba8dbe6 100644
--- a/sdk/android/src/jni/pc/peer_connection_factory.h
+++ b/sdk/android/src/jni/pc/peer_connection_factory.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
-#define SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_FACTORY_H_
+#define SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_FACTORY_H_
 
 #include <jni.h>
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
@@ -34,4 +34,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONFACTORY_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_PEER_CONNECTION_FACTORY_H_
diff --git a/sdk/android/src/jni/pc/rtc_certificate.cc b/sdk/android/src/jni/pc/rtc_certificate.cc
index af5b076..d46faaf 100644
--- a/sdk/android/src/jni/pc/rtc_certificate.cc
+++ b/sdk/android/src/jni/pc/rtc_certificate.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtccertificate.h"
-#include "sdk/android/src/jni/pc/icecandidate.h"
+#include "sdk/android/src/jni/pc/rtc_certificate.h"
+#include "sdk/android/src/jni/pc/ice_candidate.h"
 
-#include "rtc_base/refcount.h"
-#include "rtc_base/rtccertificate.h"
-#include "rtc_base/rtccertificategenerator.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/rtc_certificate.h"
+#include "rtc_base/rtc_certificate_generator.h"
 #include "sdk/android/generated_peerconnection_jni/jni/RtcCertificatePem_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/rtc_certificate.h b/sdk/android/src/jni/pc/rtc_certificate.h
index f7d1f75..91a413c 100644
--- a/sdk/android/src/jni/pc/rtc_certificate.h
+++ b/sdk/android/src/jni/pc/rtc_certificate.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTC_CERTIFICATE_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTC_CERTIFICATE_H_
 
-#include "rtc_base/refcount.h"
-#include "rtc_base/rtccertificate.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/rtc_certificate.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
@@ -30,4 +30,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTCCERTIFICATE_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTC_CERTIFICATE_H_
diff --git a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc
index 966d2ef..9443b5d 100644
--- a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc
+++ b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtcstatscollectorcallbackwrapper.h"
+#include "sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h"
 
 #include <string>
 #include <vector>
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "sdk/android/generated_external_classes_jni/jni/BigInteger_jni.h"
 #include "sdk/android/generated_peerconnection_jni/jni/RTCStatsCollectorCallback_jni.h"
 #include "sdk/android/generated_peerconnection_jni/jni/RTCStatsReport_jni.h"
diff --git a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h
index a2794ff..50fad18 100644
--- a/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h
+++ b/sdk/android/src/jni/pc/rtc_stats_collector_callback_wrapper.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTC_STATS_COLLECTOR_CALLBACK_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTC_STATS_COLLECTOR_CALLBACK_WRAPPER_H_
 
 #include <jni.h>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -38,4 +38,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTCSTATSCOLLECTORCALLBACKWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTC_STATS_COLLECTOR_CALLBACK_WRAPPER_H_
diff --git a/sdk/android/src/jni/pc/rtp_parameters.cc b/sdk/android/src/jni/pc/rtp_parameters.cc
index 3c7a9a9..25adb4c 100644
--- a/sdk/android/src/jni/pc/rtp_parameters.cc
+++ b/sdk/android/src/jni/pc/rtp_parameters.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtpparameters.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
 
 #include "sdk/android/generated_peerconnection_jni/jni/RtpParameters_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/pc/rtp_parameters.h b/sdk/android/src/jni/pc/rtp_parameters.h
index ae79793..3bcd343 100644
--- a/sdk/android/src/jni/pc/rtp_parameters.h
+++ b/sdk/android/src/jni/pc/rtp_parameters.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_PARAMETERS_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_PARAMETERS_H_
 
 #include <jni.h>
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -32,4 +32,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTPPARAMETERS_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTP_PARAMETERS_H_
diff --git a/sdk/android/src/jni/pc/rtp_receiver.cc b/sdk/android/src/jni/pc/rtp_receiver.cc
index 28e2f6e..bc82ca8 100644
--- a/sdk/android/src/jni/pc/rtp_receiver.cc
+++ b/sdk/android/src/jni/pc/rtp_receiver.cc
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtpreceiver.h"
+#include "sdk/android/src/jni/pc/rtp_receiver.h"
 
 #include "sdk/android/generated_peerconnection_jni/jni/RtpReceiver_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
-#include "sdk/android/src/jni/pc/rtpparameters.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/pc/rtp_receiver.h b/sdk/android/src/jni/pc/rtp_receiver.h
index c2e9c31..dd8ba0e 100644
--- a/sdk/android/src/jni/pc/rtp_receiver.h
+++ b/sdk/android/src/jni/pc/rtp_receiver.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_RECEIVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_RECEIVER_H_
 
 #include <jni.h>
 
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -38,4 +38,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTPRECEIVER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTP_RECEIVER_H_
diff --git a/sdk/android/src/jni/pc/rtp_sender.cc b/sdk/android/src/jni/pc/rtp_sender.cc
index 4120466..42edb01 100644
--- a/sdk/android/src/jni/pc/rtp_sender.cc
+++ b/sdk/android/src/jni/pc/rtp_sender.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtpsender.h"
+#include "sdk/android/src/jni/pc/rtp_sender.h"
 
 #include "sdk/android/generated_peerconnection_jni/jni/RtpSender_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/rtpparameters.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/pc/rtp_sender.h b/sdk/android/src/jni/pc/rtp_sender.h
index 5d30ed5..d782ca9 100644
--- a/sdk/android/src/jni/pc/rtp_sender.h
+++ b/sdk/android/src/jni/pc/rtp_sender.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_SENDER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_SENDER_H_
 
 #include <jni.h>
 
-#include "api/rtpsenderinterface.h"
+#include "api/rtp_sender_interface.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -26,4 +26,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTPSENDER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTP_SENDER_H_
diff --git a/sdk/android/src/jni/pc/rtp_transceiver.cc b/sdk/android/src/jni/pc/rtp_transceiver.cc
index e7ec769..50844fd 100644
--- a/sdk/android/src/jni/pc/rtp_transceiver.cc
+++ b/sdk/android/src/jni/pc/rtp_transceiver.cc
@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/rtptransceiver.h"
+#include "sdk/android/src/jni/pc/rtp_transceiver.h"
 
 #include <string>
 
 #include "sdk/android/generated_peerconnection_jni/jni/RtpTransceiver_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/mediastreamtrack.h"
-#include "sdk/android/src/jni/pc/rtpparameters.h"
-#include "sdk/android/src/jni/pc/rtpreceiver.h"
-#include "sdk/android/src/jni/pc/rtpsender.h"
+#include "sdk/android/src/jni/pc/media_stream_track.h"
+#include "sdk/android/src/jni/pc/rtp_parameters.h"
+#include "sdk/android/src/jni/pc/rtp_receiver.h"
+#include "sdk/android/src/jni/pc/rtp_sender.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/pc/rtp_transceiver.h b/sdk/android/src/jni/pc/rtp_transceiver.h
index 61f3e0c..e96276c 100644
--- a/sdk/android/src/jni/pc/rtp_transceiver.h
+++ b/sdk/android/src/jni/pc/rtp_transceiver.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_RTP_TRANSCEIVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_RTP_TRANSCEIVER_H_
 
 #include <jni.h>
 
-#include "api/rtptransceiverinterface.h"
+#include "api/rtp_transceiver_interface.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -43,4 +43,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_RTPTRANSCEIVER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_RTP_TRANSCEIVER_H_
diff --git a/sdk/android/src/jni/pc/sdp_observer.cc b/sdk/android/src/jni/pc/sdp_observer.cc
index 87989ab..47d13fa 100644
--- a/sdk/android/src/jni/pc/sdp_observer.cc
+++ b/sdk/android/src/jni/pc/sdp_observer.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/sdpobserver.h"
+#include "sdk/android/src/jni/pc/sdp_observer.h"
 
 #include <utility>
 
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
 #include "sdk/android/generated_peerconnection_jni/jni/SdpObserver_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/sdp_observer.h b/sdk/android/src/jni/pc/sdp_observer.h
index 6673fec..e23792c 100644
--- a/sdk/android/src/jni/pc/sdp_observer.h
+++ b/sdk/android/src/jni/pc/sdp_observer.h
@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_SDP_OBSERVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_SDP_OBSERVER_H_
 
 #include <memory>
 #include <string>
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/pc/sessiondescription.h"
+#include "sdk/android/src/jni/pc/session_description.h"
 
 namespace webrtc {
 namespace jni {
@@ -58,4 +58,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_SDP_OBSERVER_H_
diff --git a/sdk/android/src/jni/pc/session_description.cc b/sdk/android/src/jni/pc/session_description.cc
index bd3806d..aa648fe 100644
--- a/sdk/android/src/jni/pc/session_description.cc
+++ b/sdk/android/src/jni/pc/session_description.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/sessiondescription.h"
+#include "sdk/android/src/jni/pc/session_description.h"
 
 #include <string>
 
diff --git a/sdk/android/src/jni/pc/session_description.h b/sdk/android/src/jni/pc/session_description.h
index a7ef667..fe30847 100644
--- a/sdk/android/src/jni/pc/session_description.h
+++ b/sdk/android/src/jni/pc/session_description.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
-#define SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_SESSION_DESCRIPTION_H_
+#define SDK_ANDROID_SRC_JNI_PC_SESSION_DESCRIPTION_H_
 
 #include <jni.h>
 #include <memory>
@@ -31,4 +31,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_SESSIONDESCRIPTION_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_SESSION_DESCRIPTION_H_
diff --git a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc
index 2ff9a46..0f21fd3 100644
--- a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc
+++ b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/sslcertificateverifierwrapper.h"
+#include "sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h"
 #include "sdk/android/generated_peerconnection_jni/jni/SSLCertificateVerifier_jni.h"
 #include "sdk/android/native_api/jni/class_loader.h"
 #include "sdk/android/native_api/jni/java_types.h"
diff --git a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h
index 719fa44..8c883f4 100644
--- a/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h
+++ b/sdk/android/src/jni/pc/ssl_certificate_verifier_wrapper.h
@@ -8,13 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_SSL_CERTIFICATE_VERIFIER_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_PC_SSL_CERTIFICATE_VERIFIER_WRAPPER_H_
 
 #include <jni.h>
 #include <vector>
 
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/ssl_certificate.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -38,4 +38,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_SSLCERTIFICATEVERIFIERWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_SSL_CERTIFICATE_VERIFIER_WRAPPER_H_
diff --git a/sdk/android/src/jni/pc/stats_observer.cc b/sdk/android/src/jni/pc/stats_observer.cc
index f30a34c..c7534ec 100644
--- a/sdk/android/src/jni/pc/stats_observer.cc
+++ b/sdk/android/src/jni/pc/stats_observer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/pc/statsobserver.h"
+#include "sdk/android/src/jni/pc/stats_observer.h"
 
 #include <vector>
 
diff --git a/sdk/android/src/jni/pc/stats_observer.h b/sdk/android/src/jni/pc/stats_observer.h
index d21fb98..0cfd433 100644
--- a/sdk/android/src/jni/pc/stats_observer.h
+++ b/sdk/android/src/jni/pc/stats_observer.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
-#define SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_STATS_OBSERVER_H_
+#define SDK_ANDROID_SRC_JNI_PC_STATS_OBSERVER_H_
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -33,4 +33,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_STATSOBSERVER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_STATS_OBSERVER_H_
diff --git a/sdk/android/src/jni/pc/turn_customizer.cc b/sdk/android/src/jni/pc/turn_customizer.cc
index d1432af..e756313 100644
--- a/sdk/android/src/jni/pc/turn_customizer.cc
+++ b/sdk/android/src/jni/pc/turn_customizer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/turncustomizer.h"
+#include "api/turn_customizer.h"
 #include "sdk/android/generated_peerconnection_jni/jni/TurnCustomizer_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
 #include "sdk/android/src/jni/jni_helpers.h"
diff --git a/sdk/android/src/jni/pc/turn_customizer.h b/sdk/android/src/jni/pc/turn_customizer.h
index ea69973..359234f 100644
--- a/sdk/android/src/jni/pc/turn_customizer.h
+++ b/sdk/android/src/jni/pc/turn_customizer.h
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
-#define SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
+#ifndef SDK_ANDROID_SRC_JNI_PC_TURN_CUSTOMIZER_H_
+#define SDK_ANDROID_SRC_JNI_PC_TURN_CUSTOMIZER_H_
 
-#include "api/turncustomizer.h"
+#include "api/turn_customizer.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {
@@ -24,4 +24,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_PC_TURNCUSTOMIZER_H_
+#endif  // SDK_ANDROID_SRC_JNI_PC_TURN_CUSTOMIZER_H_
diff --git a/sdk/android/src/jni/pc/video.cc b/sdk/android/src/jni/pc/video.cc
index c7c6e76..0d168eb 100644
--- a/sdk/android/src/jni/pc/video.cc
+++ b/sdk/android/src/jni/pc/video.cc
@@ -15,12 +15,12 @@
 
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
 #include "rtc_base/logging.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
-#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
-#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
+#include "sdk/android/src/jni/video_decoder_factory_wrapper.h"
+#include "sdk/android/src/jni/video_encoder_factory_wrapper.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/timestamp_aligner.cc b/sdk/android/src/jni/timestamp_aligner.cc
index 3620343..942da43 100644
--- a/sdk/android/src/jni/timestamp_aligner.cc
+++ b/sdk/android/src/jni/timestamp_aligner.cc
@@ -10,8 +10,8 @@
 
 #include <jni.h>
 
-#include "rtc_base/timestampaligner.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
+#include "rtc_base/timestamp_aligner.h"
 #include "sdk/android/generated_video_jni/jni/TimestampAligner_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
diff --git a/sdk/android/src/jni/video_codec_info.cc b/sdk/android/src/jni/video_codec_info.cc
index 20a641d..58b9113 100644
--- a/sdk/android/src/jni/video_codec_info.cc
+++ b/sdk/android/src/jni/video_codec_info.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videocodecinfo.h"
+#include "sdk/android/src/jni/video_codec_info.h"
 
 #include "sdk/android/generated_video_jni/jni/VideoCodecInfo_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
diff --git a/sdk/android/src/jni/video_codec_info.h b/sdk/android/src/jni/video_codec_info.h
index 2829c02..07b0730 100644
--- a/sdk/android/src/jni/video_codec_info.h
+++ b/sdk/android/src/jni/video_codec_info.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_CODEC_INFO_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_CODEC_INFO_H_
 
 #include <jni.h>
 
@@ -28,4 +28,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOCODECINFO_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_CODEC_INFO_H_
diff --git a/sdk/android/src/jni/video_codec_status.cc b/sdk/android/src/jni/video_codec_status.cc
index b4a0a52..f8613c5 100644
--- a/sdk/android/src/jni/video_codec_status.cc
+++ b/sdk/android/src/jni/video_codec_status.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videocodecstatus.h"
+#include "sdk/android/src/jni/video_codec_status.h"
 
 #include "sdk/android/generated_video_jni/jni/VideoCodecStatus_jni.h"
 
diff --git a/sdk/android/src/jni/video_codec_status.h b/sdk/android/src/jni/video_codec_status.h
index 2804654..607bd46 100644
--- a/sdk/android/src/jni/video_codec_status.h
+++ b/sdk/android/src/jni/video_codec_status.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_CODEC_STATUS_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_CODEC_STATUS_H_
 
 #include <jni.h>
 #include <stdint.h>
@@ -24,4 +24,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOCODECSTATUS_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_CODEC_STATUS_H_
diff --git a/sdk/android/src/jni/video_decoder_factory_wrapper.cc b/sdk/android/src/jni/video_decoder_factory_wrapper.cc
index 94b4467..792e297 100644
--- a/sdk/android/src/jni/video_decoder_factory_wrapper.cc
+++ b/sdk/android/src/jni/video_decoder_factory_wrapper.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videodecoderfactorywrapper.h"
+#include "sdk/android/src/jni/video_decoder_factory_wrapper.h"
 
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_decoder.h"
@@ -16,8 +16,8 @@
 #include "rtc_base/logging.h"
 #include "sdk/android/generated_video_jni/jni/VideoDecoderFactory_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/videocodecinfo.h"
-#include "sdk/android/src/jni/videodecoderwrapper.h"
+#include "sdk/android/src/jni/video_codec_info.h"
+#include "sdk/android/src/jni/video_decoder_wrapper.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/video_decoder_factory_wrapper.h b/sdk/android/src/jni/video_decoder_factory_wrapper.h
index a1716b1..2122fdc 100644
--- a/sdk/android/src/jni/video_decoder_factory_wrapper.h
+++ b/sdk/android/src/jni/video_decoder_factory_wrapper.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_DECODER_FACTORY_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_DECODER_FACTORY_WRAPPER_H_
 
 #include <jni.h>
 
@@ -38,4 +38,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEODECODERFACTORYWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_DECODER_FACTORY_WRAPPER_H_
diff --git a/sdk/android/src/jni/video_decoder_fallback.cc b/sdk/android/src/jni/video_decoder_fallback.cc
index 48cb88c..fb67ccb 100644
--- a/sdk/android/src/jni/video_decoder_fallback.cc
+++ b/sdk/android/src/jni/video_decoder_fallback.cc
@@ -13,7 +13,7 @@
 #include "api/video_codecs/video_decoder_software_fallback_wrapper.h"
 #include "sdk/android/generated_video_jni/jni/VideoDecoderFallback_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videodecoderwrapper.h"
+#include "sdk/android/src/jni/video_decoder_wrapper.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/video_decoder_wrapper.cc b/sdk/android/src/jni/video_decoder_wrapper.cc
index 6c1423c..26dc3d5 100644
--- a/sdk/android/src/jni/video_decoder_wrapper.cc
+++ b/sdk/android/src/jni/video_decoder_wrapper.cc
@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videodecoderwrapper.h"
+#include "sdk/android/src/jni/video_decoder_wrapper.h"
 
 #include "api/video/video_frame.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/utility/vp8_header_parser.h"
 #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_video_jni/jni/VideoDecoderWrapper_jni.h"
 #include "sdk/android/generated_video_jni/jni/VideoDecoder_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/encodedimage.h"
-#include "sdk/android/src/jni/videocodecstatus.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/encoded_image.h"
+#include "sdk/android/src/jni/video_codec_status.h"
+#include "sdk/android/src/jni/video_frame.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/video_decoder_wrapper.h b/sdk/android/src/jni/video_decoder_wrapper.h
index eb2958a..55a395b 100644
--- a/sdk/android/src/jni/video_decoder_wrapper.h
+++ b/sdk/android/src/jni/video_decoder_wrapper.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_DECODER_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_DECODER_WRAPPER_H_
 
 #include <jni.h>
 #include <atomic>
@@ -120,4 +120,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEODECODERWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_DECODER_WRAPPER_H_
diff --git a/sdk/android/src/jni/video_encoder_factory_wrapper.cc b/sdk/android/src/jni/video_encoder_factory_wrapper.cc
index 4402666..83cfb82 100644
--- a/sdk/android/src/jni/video_encoder_factory_wrapper.cc
+++ b/sdk/android/src/jni/video_encoder_factory_wrapper.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videoencoderfactorywrapper.h"
+#include "sdk/android/src/jni/video_encoder_factory_wrapper.h"
 
 #include "api/video_codecs/video_encoder.h"
 #include "common_types.h"  // NOLINT(build/include)
@@ -16,8 +16,8 @@
 #include "sdk/android/generated_video_jni/jni/VideoEncoderFactory_jni.h"
 #include "sdk/android/native_api/jni/class_loader.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/videocodecinfo.h"
-#include "sdk/android/src/jni/videoencoderwrapper.h"
+#include "sdk/android/src/jni/video_codec_info.h"
+#include "sdk/android/src/jni/video_encoder_wrapper.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/video_encoder_factory_wrapper.h b/sdk/android/src/jni/video_encoder_factory_wrapper.h
index 2c2dadc..0650c12 100644
--- a/sdk/android/src/jni/video_encoder_factory_wrapper.h
+++ b/sdk/android/src/jni/video_encoder_factory_wrapper.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_FACTORY_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_FACTORY_WRAPPER_H_
 
 #include <jni.h>
 #include <vector>
@@ -45,4 +45,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOENCODERFACTORYWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_FACTORY_WRAPPER_H_
diff --git a/sdk/android/src/jni/video_encoder_fallback.cc b/sdk/android/src/jni/video_encoder_fallback.cc
index 6948ee0..af9863c 100644
--- a/sdk/android/src/jni/video_encoder_fallback.cc
+++ b/sdk/android/src/jni/video_encoder_fallback.cc
@@ -13,7 +13,7 @@
 #include "api/video_codecs/video_encoder_software_fallback_wrapper.h"
 #include "sdk/android/generated_video_jni/jni/VideoEncoderFallback_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videoencoderwrapper.h"
+#include "sdk/android/src/jni/video_encoder_wrapper.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/video_encoder_wrapper.cc b/sdk/android/src/jni/video_encoder_wrapper.cc
index 2706e66..5d34cf7 100644
--- a/sdk/android/src/jni/video_encoder_wrapper.cc
+++ b/sdk/android/src/jni/video_encoder_wrapper.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videoencoderwrapper.h"
+#include "sdk/android/src/jni/video_encoder_wrapper.h"
 
 #include <utility>
 
@@ -18,13 +18,13 @@
 #include "modules/video_coding/utility/vp8_header_parser.h"
 #include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_video_jni/jni/VideoEncoderWrapper_jni.h"
 #include "sdk/android/generated_video_jni/jni/VideoEncoder_jni.h"
 #include "sdk/android/native_api/jni/class_loader.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/encodedimage.h"
-#include "sdk/android/src/jni/videocodecstatus.h"
+#include "sdk/android/src/jni/encoded_image.h"
+#include "sdk/android/src/jni/video_codec_status.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/video_encoder_wrapper.h b/sdk/android/src/jni/video_encoder_wrapper.h
index 3618f78..0d2a9b6 100644
--- a/sdk/android/src/jni/video_encoder_wrapper.h
+++ b/sdk/android/src/jni/video_encoder_wrapper.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_WRAPPER_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_WRAPPER_H_
 
 #include <jni.h>
 #include <deque>
@@ -21,7 +21,7 @@
 #include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
 #include "rtc_base/task_queue.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_frame.h"
 
 namespace webrtc {
 namespace jni {
@@ -119,4 +119,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOENCODERWRAPPER_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_ENCODER_WRAPPER_H_
diff --git a/sdk/android/src/jni/video_frame.cc b/sdk/android/src/jni/video_frame.cc
index 1d52433..d196b03 100644
--- a/sdk/android/src/jni/video_frame.cc
+++ b/sdk/android/src/jni/video_frame.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_frame.h"
 
 #include <memory>
 
@@ -18,7 +18,7 @@
 #include "rtc_base/keep_ref_until_done.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/android/generated_video_jni/jni/VideoFrame_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 #include "sdk/android/src/jni/wrapped_native_i420_buffer.h"
diff --git a/sdk/android/src/jni/video_frame.h b/sdk/android/src/jni/video_frame.h
index 107e03e..f6b569a 100644
--- a/sdk/android/src/jni/video_frame.h
+++ b/sdk/android/src/jni/video_frame.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_FRAME_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_FRAME_H_
 
 #include <jni.h>
 
@@ -84,4 +84,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOFRAME_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_FRAME_H_
diff --git a/sdk/android/src/jni/video_sink.cc b/sdk/android/src/jni/video_sink.cc
index bbdda31..6ffba9c 100644
--- a/sdk/android/src/jni/video_sink.cc
+++ b/sdk/android/src/jni/video_sink.cc
@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/android/src/jni/videosink.h"
+#include "sdk/android/src/jni/video_sink.h"
 
 #include "sdk/android/generated_video_jni/jni/VideoSink_jni.h"
-#include "sdk/android/src/jni/videoframe.h"
+#include "sdk/android/src/jni/video_frame.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/video_sink.h b/sdk/android/src/jni/video_sink.h
index 7efe444..f165454 100644
--- a/sdk/android/src/jni/video_sink.h
+++ b/sdk/android/src/jni/video_sink.h
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
-#define SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
+#ifndef SDK_ANDROID_SRC_JNI_VIDEO_SINK_H_
+#define SDK_ANDROID_SRC_JNI_VIDEO_SINK_H_
 
 #include <jni.h>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
@@ -33,4 +33,4 @@
 }  // namespace jni
 }  // namespace webrtc
 
-#endif  // SDK_ANDROID_SRC_JNI_VIDEOSINK_H_
+#endif  // SDK_ANDROID_SRC_JNI_VIDEO_SINK_H_
diff --git a/sdk/android/src/jni/video_source.cc b/sdk/android/src/jni/video_source.cc
index 54f03c1..c95c599 100644
--- a/sdk/android/src/jni/video_source.cc
+++ b/sdk/android/src/jni/video_source.cc
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
 #include "rtc_base/logging.h"
 #include "sdk/android/generated_video_jni/jni/VideoSource_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
-#include "sdk/android/src/jni/androidvideotracksource.h"
+#include "sdk/android/src/jni/android_video_track_source.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/android/src/jni/video_track.cc b/sdk/android/src/jni/video_track.cc
index c42a4e6..b3b1278 100644
--- a/sdk/android/src/jni/video_track.cc
+++ b/sdk/android/src/jni/video_track.cc
@@ -10,10 +10,10 @@
 
 #include <jni.h>
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "sdk/android/generated_video_jni/jni/VideoTrack_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
-#include "sdk/android/src/jni/videosink.h"
+#include "sdk/android/src/jni/video_sink.h"
 
 namespace webrtc {
 namespace jni {
diff --git a/sdk/objc/api/RTCVideoRendererAdapter+Private.h b/sdk/objc/api/RTCVideoRendererAdapter+Private.h
index 7cedba4..d983ae6 100644
--- a/sdk/objc/api/RTCVideoRendererAdapter+Private.h
+++ b/sdk/objc/api/RTCVideoRendererAdapter+Private.h
@@ -12,7 +12,7 @@
 
 #import "base/RTCVideoRenderer.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/logging/RTCCallbackLogger.mm b/sdk/objc/api/logging/RTCCallbackLogger.mm
index 8d415b9..e58b03b 100644
--- a/sdk/objc/api/logging/RTCCallbackLogger.mm
+++ b/sdk/objc/api/logging/RTCCallbackLogger.mm
@@ -13,8 +13,8 @@
 #include <memory>
 
 #include "rtc_base/checks.h"
+#include "rtc_base/log_sinks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/logsinks.h"
 
 class CallbackLogSink : public rtc::LogSink {
  public:
diff --git a/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h b/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h
index fe30d65..88dd971 100644
--- a/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h
+++ b/sdk/objc/api/peerconnection/RTCAudioTrack+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCAudioTrack.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCCertificate.mm b/sdk/objc/api/peerconnection/RTCCertificate.mm
index bce4c3b..250cfc4 100644
--- a/sdk/objc/api/peerconnection/RTCCertificate.mm
+++ b/sdk/objc/api/peerconnection/RTCCertificate.mm
@@ -13,8 +13,8 @@
 #import "base/RTCLogging.h"
 
 #include "rtc_base/logging.h"
-#include "rtc_base/rtccertificategenerator.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/rtc_certificate_generator.h"
+#include "rtc_base/ssl_identity.h"
 
 @implementation RTCCertificate
 
diff --git a/sdk/objc/api/peerconnection/RTCConfiguration+Native.h b/sdk/objc/api/peerconnection/RTCConfiguration+Native.h
index e14e6d4..54783f0 100644
--- a/sdk/objc/api/peerconnection/RTCConfiguration+Native.h
+++ b/sdk/objc/api/peerconnection/RTCConfiguration+Native.h
@@ -10,7 +10,7 @@
 
 #import "RTCConfiguration.h"
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCConfiguration+Private.h b/sdk/objc/api/peerconnection/RTCConfiguration+Private.h
index cb45441..845f779 100644
--- a/sdk/objc/api/peerconnection/RTCConfiguration+Private.h
+++ b/sdk/objc/api/peerconnection/RTCConfiguration+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCConfiguration.h"
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCConfiguration.mm b/sdk/objc/api/peerconnection/RTCConfiguration.mm
index 4041f83..83ae575 100644
--- a/sdk/objc/api/peerconnection/RTCConfiguration.mm
+++ b/sdk/objc/api/peerconnection/RTCConfiguration.mm
@@ -18,8 +18,8 @@
 #import "RTCIntervalRange+Private.h"
 #import "base/RTCLogging.h"
 
-#include "rtc_base/rtccertificategenerator.h"
-#include "rtc_base/sslidentity.h"
+#include "rtc_base/rtc_certificate_generator.h"
+#include "rtc_base/ssl_identity.h"
 
 @implementation RTCConfiguration
 
diff --git a/sdk/objc/api/peerconnection/RTCDataChannel+Private.h b/sdk/objc/api/peerconnection/RTCDataChannel+Private.h
index a88a316..74d0455 100644
--- a/sdk/objc/api/peerconnection/RTCDataChannel+Private.h
+++ b/sdk/objc/api/peerconnection/RTCDataChannel+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCDataChannel.h"
 
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h b/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h
index 11be5a6..244f742 100644
--- a/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h
+++ b/sdk/objc/api/peerconnection/RTCDataChannelConfiguration+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCDataChannelConfiguration.h"
 
-#include "api/datachannelinterface.h"
+#include "api/data_channel_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h b/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
index cdcf62c..ec05481 100644
--- a/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
+++ b/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCDtmfSender.h"
 
-#include "api/dtmfsenderinterface.h"
+#include "api/dtmf_sender_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCDtmfSender.mm b/sdk/objc/api/peerconnection/RTCDtmfSender.mm
index 1513840..77d0678 100644
--- a/sdk/objc/api/peerconnection/RTCDtmfSender.mm
+++ b/sdk/objc/api/peerconnection/RTCDtmfSender.mm
@@ -13,7 +13,7 @@
 #import "base/RTCLogging.h"
 #import "helpers/NSString+StdString.h"
 
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 @implementation RTCDtmfSender {
   rtc::scoped_refptr<webrtc::DtmfSenderInterface> _nativeDtmfSender;
diff --git a/sdk/objc/api/peerconnection/RTCFileLogger.mm b/sdk/objc/api/peerconnection/RTCFileLogger.mm
index 9515cfb..ef13023 100644
--- a/sdk/objc/api/peerconnection/RTCFileLogger.mm
+++ b/sdk/objc/api/peerconnection/RTCFileLogger.mm
@@ -13,9 +13,9 @@
 #include <memory>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/filerotatingstream.h"
+#include "rtc_base/file_rotating_stream.h"
+#include "rtc_base/log_sinks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/logsinks.h"
 
 NSString *const kDefaultLogDirName = @"webrtc_logs";
 NSUInteger const kDefaultMaxFileSize = 10 * 1024 * 1024; // 10MB.
diff --git a/sdk/objc/api/peerconnection/RTCIceServer+Private.h b/sdk/objc/api/peerconnection/RTCIceServer+Private.h
index 8d16dfd..53fbb45 100644
--- a/sdk/objc/api/peerconnection/RTCIceServer+Private.h
+++ b/sdk/objc/api/peerconnection/RTCIceServer+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCIceServer.h"
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h b/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h
index a4e59cd..afa7509 100644
--- a/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h
+++ b/sdk/objc/api/peerconnection/RTCIntervalRange+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCIntervalRange.h"
 
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h b/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h
index 51888b6..d87659d 100644
--- a/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h
+++ b/sdk/objc/api/peerconnection/RTCLegacyStatsReport+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCLegacyStatsReport.h"
 
-#include "api/statstypes.h"
+#include "api/stats_types.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h b/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h
index 68a9436..335b029 100644
--- a/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h
+++ b/sdk/objc/api/peerconnection/RTCMediaConstraints+Private.h
@@ -12,7 +12,7 @@
 
 #include <memory>
 
-#include "api/mediaconstraintsinterface.h"
+#include "api/media_constraints_interface.h"
 
 namespace webrtc {
 
diff --git a/sdk/objc/api/peerconnection/RTCMediaSource+Private.h b/sdk/objc/api/peerconnection/RTCMediaSource+Private.h
index a34cbbd..7d69aaa 100644
--- a/sdk/objc/api/peerconnection/RTCMediaSource+Private.h
+++ b/sdk/objc/api/peerconnection/RTCMediaSource+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCMediaSource.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCMediaStream+Private.h b/sdk/objc/api/peerconnection/RTCMediaStream+Private.h
index 21d64ec..23149ce 100644
--- a/sdk/objc/api/peerconnection/RTCMediaStream+Private.h
+++ b/sdk/objc/api/peerconnection/RTCMediaStream+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCMediaStream.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h b/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h
index 7f8810c..176bb73 100644
--- a/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h
+++ b/sdk/objc/api/peerconnection/RTCMediaStreamTrack+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCMediaStreamTrack.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 
 typedef NS_ENUM(NSInteger, RTCMediaStreamTrackType) {
   RTCMediaStreamTrackTypeAudio,
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h b/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h
index d26eb2e..3de6a9b 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h
+++ b/sdk/objc/api/peerconnection/RTCPeerConnection+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCPeerConnection.h"
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection.mm b/sdk/objc/api/peerconnection/RTCPeerConnection.mm
index b59dafe..fde71a2 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnection.mm
+++ b/sdk/objc/api/peerconnection/RTCPeerConnection.mm
@@ -28,7 +28,7 @@
 
 #include <memory>
 
-#include "api/jsepicecandidate.h"
+#include "api/jsep_ice_candidate.h"
 #include "api/media_transport_interface.h"
 #include "rtc_base/checks.h"
 
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h
index 4dc03cf..a82c445 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h
+++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCPeerConnectionFactory.h"
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
index 7262884..dfcb637 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
+++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
@@ -52,7 +52,7 @@
 // API layer.
 #include "absl/memory/memory.h"
 #include "api/media_transport_interface.h"
-#include "media/engine/webrtcmediaengine.h"  // nogncheck
+#include "media/engine/webrtc_media_engine.h"  // nogncheck
 
 @implementation RTCPeerConnectionFactory {
   std::unique_ptr<rtc::Thread> _networkThread;
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h b/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h
index 2ccbd1c..986b0e6 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h
+++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCPeerConnectionFactoryOptions.h"
 
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h
index 540601b..5471bf4 100644
--- a/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtcpParameters+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCRtcpParameters.h"
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h
index 3759a27..1b297ed 100644
--- a/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpCodecParameters+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCRtpCodecParameters.h"
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm
index d555bea..f25679e 100644
--- a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm
+++ b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm
@@ -13,7 +13,7 @@
 #import "RTCMediaStreamTrack.h"
 #import "helpers/NSString+StdString.h"
 
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "rtc_base/checks.h"
 
 const NSString * const kRTCRtxCodecName = @(cricket::kRtxCodecName);
diff --git a/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h
index fe60948..e3684d3 100644
--- a/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpEncodingParameters+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCRtpEncodingParameters.h"
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h b/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h
index 3f1f547..8a2a231 100644
--- a/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpHeaderExtension+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCRtpHeaderExtension.h"
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h b/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h
index 0b7aa20..a88ccfa 100644
--- a/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpParameters+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCRtpParameters.h"
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h b/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h
index 8013b69..419a347 100644
--- a/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h
+++ b/sdk/objc/api/peerconnection/RTCRtpReceiver+Native.h
@@ -10,7 +10,7 @@
 
 #import "RTCRtpReceiver.h"
 
-#include "api/crypto/framedecryptorinterface.h"
+#include "api/crypto/frame_decryptor_interface.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h b/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h
index 019b5764..6f56739 100644
--- a/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpReceiver+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCRtpReceiver.h"
 
-#include "api/rtpreceiverinterface.h"
+#include "api/rtp_receiver_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCRtpReceiver.mm b/sdk/objc/api/peerconnection/RTCRtpReceiver.mm
index 4d240be..5d44478 100644
--- a/sdk/objc/api/peerconnection/RTCRtpReceiver.mm
+++ b/sdk/objc/api/peerconnection/RTCRtpReceiver.mm
@@ -16,7 +16,7 @@
 #import "base/RTCLogging.h"
 #import "helpers/NSString+StdString.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 
 namespace webrtc {
 
diff --git a/sdk/objc/api/peerconnection/RTCRtpSender+Native.h b/sdk/objc/api/peerconnection/RTCRtpSender+Native.h
index 612c5e0..daef7ee 100644
--- a/sdk/objc/api/peerconnection/RTCRtpSender+Native.h
+++ b/sdk/objc/api/peerconnection/RTCRtpSender+Native.h
@@ -10,7 +10,7 @@
 
 #import "RTCRtpSender.h"
 
-#include "api/crypto/frameencryptorinterface.h"
+#include "api/crypto/frame_encryptor_interface.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCRtpSender+Private.h b/sdk/objc/api/peerconnection/RTCRtpSender+Private.h
index d0dcb2b..389b833 100644
--- a/sdk/objc/api/peerconnection/RTCRtpSender+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpSender+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCRtpSender.h"
 
-#include "api/rtpsenderinterface.h"
+#include "api/rtp_sender_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCRtpSender.mm b/sdk/objc/api/peerconnection/RTCRtpSender.mm
index 30e1bde..b227025 100644
--- a/sdk/objc/api/peerconnection/RTCRtpSender.mm
+++ b/sdk/objc/api/peerconnection/RTCRtpSender.mm
@@ -17,7 +17,7 @@
 #import "base/RTCLogging.h"
 #import "helpers/NSString+StdString.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 
 @implementation RTCRtpSender {
   RTCPeerConnectionFactory *_factory;
diff --git a/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h b/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h
index 61cbcb3..d7f6b58 100644
--- a/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h
+++ b/sdk/objc/api/peerconnection/RTCRtpTransceiver+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCRtpTransceiver.h"
 
-#include "api/rtptransceiverinterface.h"
+#include "api/rtp_transceiver_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCSSLAdapter.mm b/sdk/objc/api/peerconnection/RTCSSLAdapter.mm
index 18388f9..4302495 100644
--- a/sdk/objc/api/peerconnection/RTCSSLAdapter.mm
+++ b/sdk/objc/api/peerconnection/RTCSSLAdapter.mm
@@ -11,7 +11,7 @@
 #import "RTCSSLAdapter.h"
 
 #include "rtc_base/checks.h"
-#include "rtc_base/ssladapter.h"
+#include "rtc_base/ssl_adapter.h"
 
 BOOL RTCInitializeSSL(void) {
   BOOL initialized = rtc::InitializeSSL();
diff --git a/sdk/objc/api/peerconnection/RTCVideoSource+Private.h b/sdk/objc/api/peerconnection/RTCVideoSource+Private.h
index 828aad8..1827e6b 100644
--- a/sdk/objc/api/peerconnection/RTCVideoSource+Private.h
+++ b/sdk/objc/api/peerconnection/RTCVideoSource+Private.h
@@ -12,7 +12,7 @@
 
 #import "RTCMediaSource+Private.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "rtc_base/thread.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/sdk/objc/api/peerconnection/RTCVideoSource.mm b/sdk/objc/api/peerconnection/RTCVideoSource.mm
index 1cbeb0b..789c843 100644
--- a/sdk/objc/api/peerconnection/RTCVideoSource.mm
+++ b/sdk/objc/api/peerconnection/RTCVideoSource.mm
@@ -10,7 +10,7 @@
 
 #import "RTCVideoSource+Private.h"
 
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
 #include "rtc_base/checks.h"
 #include "sdk/objc/native/src/objc_video_track_source.h"
 
diff --git a/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h b/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h
index 176366a..dd3d172 100644
--- a/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h
+++ b/sdk/objc/api/peerconnection/RTCVideoTrack+Private.h
@@ -10,7 +10,7 @@
 
 #import "RTCVideoTrack.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm b/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm
index acbf126..3de6e22 100644
--- a/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm
+++ b/sdk/objc/api/video_codec/RTCVideoCodecConstants.mm
@@ -11,7 +11,7 @@
 
 #import "RTCVideoCodecConstants.h"
 
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 
 NSString *const kRTCVideoCodecVp8Name = @(cricket::kVp8CodecName);
 NSString *const kRTCVideoCodecVp9Name = @(cricket::kVp9CodecName);
diff --git a/sdk/objc/components/audio/RTCAudioSession.mm b/sdk/objc/components/audio/RTCAudioSession.mm
index b4d759b..1b2b487 100644
--- a/sdk/objc/components/audio/RTCAudioSession.mm
+++ b/sdk/objc/components/audio/RTCAudioSession.mm
@@ -12,9 +12,9 @@
 
 #import <UIKit/UIKit.h>
 
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 #import "RTCAudioSessionConfiguration.h"
 #import "base/RTCLogging.h"
diff --git a/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm b/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm
index 359656c..afd9fcb 100644
--- a/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm
+++ b/sdk/objc/components/video_codec/RTCH264ProfileLevelId.mm
@@ -17,7 +17,7 @@
 #endif
 
 #include "media/base/h264_profile_level_id.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 
 namespace {
 
diff --git a/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm b/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm
index 3bfb918..69ccc90 100644
--- a/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm
+++ b/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm
@@ -26,7 +26,7 @@
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/objc/components/video_codec/nalu_rewriter.h"
 
 // Struct that we pass to the decoder per frame to decode. We receive it again
diff --git a/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm b/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm
index f6690b6..51fa51e 100644
--- a/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm
+++ b/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm
@@ -36,7 +36,7 @@
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/objc/components/video_codec/nalu_rewriter.h"
 #include "third_party/libyuv/include/libyuv/convert_from.h"
 
diff --git a/sdk/objc/native/api/audio_device_module.mm b/sdk/objc/native/api/audio_device_module.mm
index 893aaec..e8f2b9a 100644
--- a/sdk/objc/native/api/audio_device_module.mm
+++ b/sdk/objc/native/api/audio_device_module.mm
@@ -11,7 +11,7 @@
 #include "audio_device_module.h"
 
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 
 #include "sdk/objc/native/src/audio/audio_device_module_ios.h"
 
diff --git a/sdk/objc/native/api/video_capturer.h b/sdk/objc/native/api/video_capturer.h
index d6f396b..c0a7760 100644
--- a/sdk/objc/native/api/video_capturer.h
+++ b/sdk/objc/native/api/video_capturer.h
@@ -13,7 +13,7 @@
 
 #import "base/RTCVideoCapturer.h"
 
-#include "api/mediastreaminterface.h"
+#include "api/media_stream_interface.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread.h"
 
diff --git a/sdk/objc/native/api/video_capturer.mm b/sdk/objc/native/api/video_capturer.mm
index 3bad998..2618550 100644
--- a/sdk/objc/native/api/video_capturer.mm
+++ b/sdk/objc/native/api/video_capturer.mm
@@ -11,7 +11,7 @@
 #include "sdk/objc/native/api/video_capturer.h"
 
 #include "absl/memory/memory.h"
-#include "api/videosourceproxy.h"
+#include "api/video_track_source_proxy.h"
 #include "sdk/objc/native/src/objc_video_track_source.h"
 
 namespace webrtc {
diff --git a/sdk/objc/native/src/audio/audio_device_ios.mm b/sdk/objc/native/src/audio/audio_device_ios.mm
index ec9a798..efbf463 100644
--- a/sdk/objc/native/src/audio/audio_device_ios.mm
+++ b/sdk/objc/native/src/audio/audio_device_ios.mm
@@ -18,14 +18,14 @@
 #include "api/array_view.h"
 #include "helpers.h"
 #include "modules/audio_device/fine_audio_buffer.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/thread_annotations.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/metrics.h"
 
 #import "base/RTCLogging.h"
diff --git a/sdk/objc/native/src/audio/audio_device_module_ios.h b/sdk/objc/native/src/audio/audio_device_module_ios.h
index 59730b6..3170313 100644
--- a/sdk/objc/native/src/audio/audio_device_module_ios.h
+++ b/sdk/objc/native/src/audio/audio_device_module_ios.h
@@ -18,7 +18,7 @@
 #include "modules/audio_device/audio_device_buffer.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 
diff --git a/sdk/objc/native/src/audio/audio_device_module_ios.mm b/sdk/objc/native/src/audio/audio_device_module_ios.mm
index 814ab90..ff9da47 100644
--- a/sdk/objc/native/src/audio/audio_device_module_ios.mm
+++ b/sdk/objc/native/src/audio/audio_device_module_ios.mm
@@ -14,8 +14,8 @@
 #include "modules/audio_device/audio_device_generic.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcount.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counted_object.h"
 #include "system_wrappers/include/metrics.h"
 
 #if defined(WEBRTC_IOS)
diff --git a/sdk/objc/native/src/audio/audio_session_observer.h b/sdk/objc/native/src/audio/audio_session_observer.h
index 2f8bd0c..27b1b38 100644
--- a/sdk/objc/native/src/audio/audio_session_observer.h
+++ b/sdk/objc/native/src/audio/audio_session_observer.h
@@ -11,7 +11,7 @@
 #ifndef SDK_OBJC_NATIVE_SRC_AUDIO_AUDIO_SESSION_OBSERVER_H_
 #define SDK_OBJC_NATIVE_SRC_AUDIO_AUDIO_SESSION_OBSERVER_H_
 
-#include "rtc_base/asyncinvoker.h"
+#include "rtc_base/async_invoker.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/sdk/objc/native/src/objc_video_decoder_factory.mm b/sdk/objc/native/src/objc_video_decoder_factory.mm
index 6e0ff27..f5c53b0 100644
--- a/sdk/objc/native/src/objc_video_decoder_factory.mm
+++ b/sdk/objc/native/src/objc_video_decoder_factory.mm
@@ -26,7 +26,7 @@
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/objc/native/src/objc_frame_buffer.h"
 
 namespace webrtc {
diff --git a/sdk/objc/native/src/objc_video_frame.mm b/sdk/objc/native/src/objc_video_frame.mm
index bf60824..76f7add 100644
--- a/sdk/objc/native/src/objc_video_frame.mm
+++ b/sdk/objc/native/src/objc_video_frame.mm
@@ -10,7 +10,7 @@
 
 #include "sdk/objc/native/src/objc_video_frame.h"
 
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "sdk/objc/native/src/objc_frame_buffer.h"
 
 namespace webrtc {
diff --git a/sdk/objc/native/src/objc_video_track_source.h b/sdk/objc/native/src/objc_video_track_source.h
index 7956014..93e7d15 100644
--- a/sdk/objc/native/src/objc_video_track_source.h
+++ b/sdk/objc/native/src/objc_video_track_source.h
@@ -14,8 +14,8 @@
 #import "base/RTCVideoCapturer.h"
 
 #include "base/RTCMacros.h"
-#include "media/base/adaptedvideotracksource.h"
-#include "rtc_base/timestampaligner.h"
+#include "media/base/adapted_video_track_source.h"
+#include "rtc_base/timestamp_aligner.h"
 
 RTC_FWD_DECL_OBJC_CLASS(RTCVideoFrame);
 
diff --git a/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm b/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm
index fa864a2..291c9f0 100644
--- a/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm
+++ b/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm
@@ -20,8 +20,8 @@
 #import "frame_buffer_helpers.h"
 
 #include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "media/base/fakevideorenderer.h"
-#include "rtc_base/refcountedobject.h"
+#include "media/base/fake_video_renderer.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "sdk/objc/native/api/video_frame.h"
 
diff --git a/stats/BUILD.gn b/stats/BUILD.gn
index c16d8d1..85fe091 100644
--- a/stats/BUILD.gn
+++ b/stats/BUILD.gn
@@ -18,9 +18,9 @@
   visibility = [ "*" ]
   cflags = []
   sources = [
-    "rtcstats.cc",
+    "rtc_stats.cc",
+    "rtc_stats_report.cc",
     "rtcstats_objects.cc",
-    "rtcstatsreport.cc",
   ]
 
   deps = [
@@ -34,8 +34,8 @@
   visibility = [ "*" ]
   cflags = []
   sources = [
-    "test/rtcteststats.cc",
-    "test/rtcteststats.h",
+    "test/rtc_test_stats.cc",
+    "test/rtc_test_stats.h",
   ]
 
   deps = [
@@ -50,8 +50,8 @@
   rtc_test("rtc_stats_unittests") {
     testonly = true
     sources = [
-      "rtcstats_unittest.cc",
-      "rtcstatsreport_unittest.cc",
+      "rtc_stats_report_unittest.cc",
+      "rtc_stats_unittest.cc",
     ]
 
     deps = [
diff --git a/stats/rtc_stats.cc b/stats/rtc_stats.cc
index d5ea319..4332fe6 100644
--- a/stats/rtc_stats.cc
+++ b/stats/rtc_stats.cc
@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/stats/rtcstats.h"
+#include "api/stats/rtc_stats.h"
 
 #include <cstdio>
 
 #include "rtc_base/arraysize.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "rtc_base/strings/string_builder.h"
 
 namespace webrtc {
diff --git a/stats/rtc_stats_report.cc b/stats/rtc_stats_report.cc
index 82db8f6..bdafd56 100644
--- a/stats/rtc_stats_report.cc
+++ b/stats/rtc_stats_report.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/stats/rtcstatsreport.h"
+#include "api/stats/rtc_stats_report.h"
 
 #include <type_traits>
 #include <utility>
diff --git a/stats/rtc_stats_report_unittest.cc b/stats/rtc_stats_report_unittest.cc
index 80a6f2d..a7d4a42 100644
--- a/stats/rtc_stats_report_unittest.cc
+++ b/stats/rtc_stats_report_unittest.cc
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/stats/rtcstatsreport.h"
+#include "api/stats/rtc_stats_report.h"
 
-#include "api/stats/rtcstats.h"
+#include "api/stats/rtc_stats.h"
 #include "rtc_base/checks.h"
 #include "test/gtest.h"
 
diff --git a/stats/rtc_stats_unittest.cc b/stats/rtc_stats_unittest.cc
index 95a4015..b079ddd 100644
--- a/stats/rtc_stats_unittest.cc
+++ b/stats/rtc_stats_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/stats/rtcstats.h"
+#include "api/stats/rtc_stats.h"
 
 #include <cmath>
 #include <cstdint>
@@ -17,7 +17,7 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/strings/json.h"
-#include "stats/test/rtcteststats.h"
+#include "stats/test/rtc_test_stats.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/stats/test/rtc_test_stats.cc b/stats/test/rtc_test_stats.cc
index 538f303..d5576e6 100644
--- a/stats/test/rtc_test_stats.cc
+++ b/stats/test/rtc_test_stats.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "stats/test/rtcteststats.h"
+#include "stats/test/rtc_test_stats.h"
 
 #include "rtc_base/checks.h"
 
diff --git a/stats/test/rtc_test_stats.h b/stats/test/rtc_test_stats.h
index 766d045..1db32c2 100644
--- a/stats/test/rtc_test_stats.h
+++ b/stats/test/rtc_test_stats.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef STATS_TEST_RTCTESTSTATS_H_
-#define STATS_TEST_RTCTESTSTATS_H_
+#ifndef STATS_TEST_RTC_TEST_STATS_H_
+#define STATS_TEST_RTC_TEST_STATS_H_
 
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include "api/stats/rtcstats.h"
+#include "api/stats/rtc_stats.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
@@ -46,4 +46,4 @@
 
 }  // namespace webrtc
 
-#endif  // STATS_TEST_RTCTESTSTATS_H_
+#endif  // STATS_TEST_RTC_TEST_STATS_H_
diff --git a/system_wrappers/include/metrics.h b/system_wrappers/include/metrics.h
index d70a7c6..6b29018 100644
--- a/system_wrappers/include/metrics.h
+++ b/system_wrappers/include/metrics.h
@@ -16,7 +16,7 @@
 #include <memory>
 #include <string>
 
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 
 // Macros for allowing WebRTC clients (e.g. Chrome) to gather and aggregate
diff --git a/system_wrappers/source/clock.cc b/system_wrappers/source/clock.cc
index 32cf1de..27624be 100644
--- a/system_wrappers/source/clock.cc
+++ b/system_wrappers/source/clock.cc
@@ -17,7 +17,7 @@
 
 #include <mmsystem.h>
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 #elif defined(WEBRTC_POSIX)
 
@@ -27,7 +27,7 @@
 #endif  // defined(WEBRTC_POSIX)
 
 #include "rtc_base/synchronization/rw_lock_wrapper.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/system_wrappers/source/metrics.cc b/system_wrappers/source/metrics.cc
index 4aa8770..f98b4cd 100644
--- a/system_wrappers/source/metrics.cc
+++ b/system_wrappers/source/metrics.cc
@@ -11,7 +11,7 @@
 
 #include <algorithm>
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 
 // Default implementation of histogram methods for WebRTC clients that do not
diff --git a/test/BUILD.gn b/test/BUILD.gn
index ffa6d01..786f3c0 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -398,8 +398,8 @@
       ":fileutils_override_impl",
     ]
     sources = [
-      "testsupport/iosfileutils.h",
-      "testsupport/iosfileutils.mm",
+      "testsupport/ios_file_utils.h",
+      "testsupport/ios_file_utils.mm",
     ]
     deps = [
       "..:webrtc_common",
@@ -417,8 +417,8 @@
       ":fileutils_override_impl",
     ]
     sources = [
-      "testsupport/macfileutils.h",
-      "testsupport/macfileutils.mm",
+      "testsupport/mac_file_utils.h",
+      "testsupport/mac_file_utils.mm",
     ]
     deps = [
       "../rtc_base:checks",
@@ -430,8 +430,8 @@
   testonly = true
   visibility = [ "*" ]
   sources = [
-    "testsupport/fileutils.cc",
-    "testsupport/fileutils.h",
+    "testsupport/file_utils.cc",
+    "testsupport/file_utils.h",
   ]
   deps = [
     ":fileutils_override_api",
@@ -458,7 +458,7 @@
 rtc_source_set("fileutils_override_api") {
   testonly = true
   sources = [
-    "testsupport/fileutils_override.h",
+    "testsupport/file_utils_override.h",
   ]
 }
 
@@ -466,7 +466,7 @@
   testonly = true
   visibility = [ ":fileutils" ]
   sources = [
-    "testsupport/fileutils_override.cc",
+    "testsupport/file_utils_override.cc",
   ]
   deps = [
     ":fileutils_override_api",
@@ -534,7 +534,7 @@
   testonly = true
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
-    "testsupport/fileutils_unittest.cc",
+    "testsupport/file_utils_unittest.cc",
   ]
   deps = [
     ":fileutils",
diff --git a/test/DEPS b/test/DEPS
index 1106230..d3b03e0 100644
--- a/test/DEPS
+++ b/test/DEPS
@@ -37,7 +37,7 @@
     "+p2p/base/mdns_message.h",
   ],
   ".*pseudotcp_parser_fuzzer\.cc": [
-    "+p2p/base/pseudotcp.h",
+    "+p2p/base/pseudo_tcp.h",
   ],
   ".*stun_parser_fuzzer\.cc": [
     "+p2p/base/stun.h",
diff --git a/test/call_test.cc b/test/call_test.cc
index 26c8b44..fff0323 100644
--- a/test/call_test.cc
+++ b/test/call_test.cc
@@ -24,7 +24,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/event.h"
 #include "test/fake_encoder.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/encoder_settings.cc b/test/encoder_settings.cc
index d4727b4..e576cc4 100644
--- a/test/encoder_settings.cc
+++ b/test/encoder_settings.cc
@@ -15,7 +15,7 @@
 #include "api/video_codecs/sdp_video_format.h"
 #include "call/rtp_config.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/test/fake_decoder.cc b/test/fake_decoder.cc
index 2114c64..2dc5b64 100644
--- a/test/fake_decoder.cc
+++ b/test/fake_decoder.cc
@@ -19,7 +19,7 @@
 #include "modules/video_coding/include/video_error_codes.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 webrtc {
 namespace test {
diff --git a/test/fake_encoder.h b/test/fake_encoder.h
index 753b1ea..d9ac76b 100644
--- a/test/fake_encoder.h
+++ b/test/fake_encoder.h
@@ -24,7 +24,7 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/include/video_codec_interface.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/test/fake_texture_frame.cc b/test/fake_texture_frame.cc
index 45d6130..4fa5e9d 100644
--- a/test/fake_texture_frame.cc
+++ b/test/fake_texture_frame.cc
@@ -11,7 +11,7 @@
 #include "test/fake_texture_frame.h"
 
 #include "api/video/i420_buffer.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/fake_vp8_decoder.cc b/test/fake_vp8_decoder.cc
index c5ece83..7b0cea0 100644
--- a/test/fake_vp8_decoder.cc
+++ b/test/fake_vp8_decoder.cc
@@ -19,7 +19,7 @@
 #include "api/video/video_rotation.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/frame_generator.h b/test/frame_generator.h
index 45cc9f0..ba36d38 100644
--- a/test/frame_generator.h
+++ b/test/frame_generator.h
@@ -16,7 +16,7 @@
 
 #include "api/video/video_frame.h"
 #include "api/video/video_source_interface.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 namespace webrtc {
 class Clock;
diff --git a/test/frame_generator_capturer.cc b/test/frame_generator_capturer.cc
index 768bab5..e1b5c80 100644
--- a/test/frame_generator_capturer.cc
+++ b/test/frame_generator_capturer.cc
@@ -18,10 +18,10 @@
 
 #include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/task_queue.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/test/frame_generator_capturer.h b/test/frame_generator_capturer.h
index cb76806..217858b 100644
--- a/test/frame_generator_capturer.h
+++ b/test/frame_generator_capturer.h
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "api/video/video_frame.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/task_queue.h"
 #include "test/frame_generator.h"
 #include "test/test_video_capturer.h"
diff --git a/test/frame_generator_unittest.cc b/test/frame_generator_unittest.cc
index bfa19e5..fa6da9a 100644
--- a/test/frame_generator_unittest.cc
+++ b/test/frame_generator_unittest.cc
@@ -19,7 +19,7 @@
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/frame_generator.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/fuzzers/forward_error_correction_fuzzer.cc b/test/fuzzers/forward_error_correction_fuzzer.cc
index 2eb357b..1385e54 100644
--- a/test/fuzzers/forward_error_correction_fuzzer.cc
+++ b/test/fuzzers/forward_error_correction_fuzzer.cc
@@ -12,7 +12,7 @@
 
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/test/fuzzers/pseudotcp_parser_fuzzer.cc b/test/fuzzers/pseudotcp_parser_fuzzer.cc
index bab09df..78ddf0e 100644
--- a/test/fuzzers/pseudotcp_parser_fuzzer.cc
+++ b/test/fuzzers/pseudotcp_parser_fuzzer.cc
@@ -11,7 +11,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "p2p/base/pseudotcp.h"
+#include "p2p/base/pseudo_tcp.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/test/fuzzers/residual_echo_detector_fuzzer.cc b/test/fuzzers/residual_echo_detector_fuzzer.cc
index b0405ee..99ea06a 100644
--- a/test/fuzzers/residual_echo_detector_fuzzer.cc
+++ b/test/fuzzers/residual_echo_detector_fuzzer.cc
@@ -17,7 +17,7 @@
 
 #include "modules/audio_processing/residual_echo_detector.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 
 namespace webrtc {
 
diff --git a/test/fuzzers/sdp_parser_fuzzer.cc b/test/fuzzers/sdp_parser_fuzzer.cc
index 763dbc5..c85eab4 100644
--- a/test/fuzzers/sdp_parser_fuzzer.cc
+++ b/test/fuzzers/sdp_parser_fuzzer.cc
@@ -11,7 +11,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "api/jsepsessiondescription.h"
+#include "api/jsep_session_description.h"
 
 namespace webrtc {
 void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/turn_unwrap_fuzzer.cc b/test/fuzzers/turn_unwrap_fuzzer.cc
index ed9f34d..47ee7fd 100644
--- a/test/fuzzers/turn_unwrap_fuzzer.cc
+++ b/test/fuzzers/turn_unwrap_fuzzer.cc
@@ -11,7 +11,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "media/base/turnutils.h"
+#include "media/base/turn_utils.h"
 
 namespace webrtc {
 void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/url_decode_fuzzer.cc b/test/fuzzers/url_decode_fuzzer.cc
index d47e88d..bf2a0f3 100644
--- a/test/fuzzers/url_decode_fuzzer.cc
+++ b/test/fuzzers/url_decode_fuzzer.cc
@@ -12,7 +12,7 @@
 #include <stdint.h>
 #include <string>
 
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 
 namespace webrtc {
 
diff --git a/test/layer_filtering_transport.h b/test/layer_filtering_transport.h
index ad825a9..95a5388 100644
--- a/test/layer_filtering_transport.h
+++ b/test/layer_filtering_transport.h
@@ -16,7 +16,7 @@
 #include <memory>
 
 #include "api/call/transport.h"
-#include "api/mediatypes.h"
+#include "api/media_types.h"
 #include "call/call.h"
 #include "call/simulated_packet_receiver.h"
 #include "test/direct_transport.h"
diff --git a/test/mac/video_renderer_mac.h b/test/mac/video_renderer_mac.h
index e6499f0..956f50b 100644
--- a/test/mac/video_renderer_mac.h
+++ b/test/mac/video_renderer_mac.h
@@ -11,7 +11,7 @@
 #ifndef TEST_MAC_VIDEO_RENDERER_MAC_H_
 #define TEST_MAC_VIDEO_RENDERER_MAC_H_
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "test/gl/gl_renderer.h"
 
 @class CocoaWindow;
diff --git a/test/mock_audio_decoder_factory.h b/test/mock_audio_decoder_factory.h
index 247f9fa..b54e109 100644
--- a/test/mock_audio_decoder_factory.h
+++ b/test/mock_audio_decoder_factory.h
@@ -16,7 +16,7 @@
 
 #include "api/audio_codecs/audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/gmock.h"
 
diff --git a/test/mock_audio_encoder_factory.h b/test/mock_audio_encoder_factory.h
index 340602c..55fe259 100644
--- a/test/mock_audio_encoder_factory.h
+++ b/test/mock_audio_encoder_factory.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "api/audio_codecs/audio_encoder_factory.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/gmock.h"
 
diff --git a/test/pc/e2e/api/peerconnection_quality_test_fixture.h b/test/pc/e2e/api/peerconnection_quality_test_fixture.h
index 1640340..9b3e75c 100644
--- a/test/pc/e2e/api/peerconnection_quality_test_fixture.h
+++ b/test/pc/e2e/api/peerconnection_quality_test_fixture.h
@@ -14,11 +14,11 @@
 #include <string>
 #include <vector>
 
-#include "api/asyncresolverfactory.h"
-#include "api/call/callfactoryinterface.h"
+#include "api/async_resolver_factory.h"
+#include "api/call/call_factory_interface.h"
 #include "api/fec_controller.h"
 #include "api/media_transport_interface.h"
-#include "api/peerconnectioninterface.h"
+#include "api/peer_connection_interface.h"
 #include "api/test/simulated_network.h"
 #include "api/transport/network_control.h"
 #include "api/video_codecs/video_decoder_factory.h"
@@ -26,8 +26,8 @@
 #include "api/video_codecs/video_encoder_factory.h"
 #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
 #include "rtc_base/network.h"
-#include "rtc_base/rtccertificategenerator.h"
-#include "rtc_base/sslcertificate.h"
+#include "rtc_base/rtc_certificate_generator.h"
+#include "rtc_base/ssl_certificate.h"
 #include "rtc_base/thread.h"
 #include "test/pc/e2e/api/audio_quality_analyzer_interface.h"
 #include "test/pc/e2e/api/video_quality_analyzer_interface.h"
diff --git a/test/rtp_file_reader.cc b/test/rtp_file_reader.cc
index c9eb986..203bf30 100644
--- a/test/rtp_file_reader.cc
+++ b/test/rtp_file_reader.cc
@@ -18,7 +18,7 @@
 
 #include "modules/rtp_rtcp/source/rtp_utility.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/system/arch.h"
diff --git a/test/rtp_file_reader_unittest.cc b/test/rtp_file_reader_unittest.cc
index b41f32f..ab51224 100644
--- a/test/rtp_file_reader_unittest.cc
+++ b/test/rtp_file_reader_unittest.cc
@@ -14,7 +14,7 @@
 #include "modules/rtp_rtcp/source/rtp_utility.h"
 #include "test/gtest.h"
 #include "test/rtp_file_reader.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/test/rtp_file_writer.cc b/test/rtp_file_writer.cc
index 9bde92a..de9f711 100644
--- a/test/rtp_file_writer.cc
+++ b/test/rtp_file_writer.cc
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/rtp_file_writer_unittest.cc b/test/rtp_file_writer_unittest.cc
index 18efd08..6bfad41 100644
--- a/test/rtp_file_writer_unittest.cc
+++ b/test/rtp_file_writer_unittest.cc
@@ -15,7 +15,7 @@
 #include "test/gtest.h"
 #include "test/rtp_file_reader.h"
 #include "test/rtp_file_writer.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 
diff --git a/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h
index d4aadfe..7cff645 100644
--- a/test/rtp_rtcp_observer.h
+++ b/test/rtp_rtcp_observer.h
@@ -18,7 +18,7 @@
 #include "call/simulated_packet_receiver.h"
 #include "call/video_send_stream.h"
 #include "modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/constants.h"
diff --git a/test/scenario/audio_stream.cc b/test/scenario/audio_stream.cc
index e161b8e..d924275 100644
--- a/test/scenario/audio_stream.cc
+++ b/test/scenario/audio_stream.cc
@@ -10,7 +10,7 @@
 #include "test/scenario/audio_stream.h"
 
 #include "absl/memory/memory.h"
-#include "rtc_base/bitrateallocationstrategy.h"
+#include "rtc_base/bitrate_allocation_strategy.h"
 #include "test/call_test.h"
 
 #if WEBRTC_ENABLE_PROTOBUF
diff --git a/test/scenario/audio_stream.h b/test/scenario/audio_stream.h
index 3ab0a1f..430e333 100644
--- a/test/scenario/audio_stream.h
+++ b/test/scenario/audio_stream.h
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "test/scenario/call_client.h"
 #include "test/scenario/column_printer.h"
 #include "test/scenario/network_node.h"
diff --git a/test/scenario/call_client.h b/test/scenario/call_client.h
index bea25cb..ace6366 100644
--- a/test/scenario/call_client.h
+++ b/test/scenario/call_client.h
@@ -18,7 +18,7 @@
 #include "modules/audio_device/include/test_audio_device.h"
 #include "modules/congestion_controller/test/controller_printer.h"
 #include "modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "test/scenario/column_printer.h"
 #include "test/scenario/network/network_emulation.h"
 #include "test/scenario/network_node.h"
diff --git a/test/scenario/column_printer.h b/test/scenario/column_printer.h
index b1299a0..5ac9a1b 100644
--- a/test/scenario/column_printer.h
+++ b/test/scenario/column_printer.h
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/strings/string_builder.h"
 
 namespace webrtc {
diff --git a/test/scenario/network/network_emulation.h b/test/scenario/network/network_emulation.h
index ccb4171..ec179b0 100644
--- a/test/scenario/network/network_emulation.h
+++ b/test/scenario/network/network_emulation.h
@@ -21,9 +21,9 @@
 #include "absl/types/optional.h"
 #include "api/test/simulated_network.h"
 #include "api/units/timestamp.h"
-#include "rtc_base/asyncsocket.h"
-#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/async_socket.h"
+#include "rtc_base/copy_on_write_buffer.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/test/scenario/network_node.h b/test/scenario/network_node.h
index 190ecb2..cce1dd9 100644
--- a/test/scenario/network_node.h
+++ b/test/scenario/network_node.h
@@ -20,8 +20,8 @@
 #include "api/units/timestamp.h"
 #include "call/call.h"
 #include "call/simulated_network.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "test/scenario/column_printer.h"
 #include "test/scenario/network/network_emulation.h"
 #include "test/scenario/scenario_config.h"
diff --git a/test/scenario/quality_stats.h b/test/scenario/quality_stats.h
index 5e0ee48..34702ac 100644
--- a/test/scenario/quality_stats.h
+++ b/test/scenario/quality_stats.h
@@ -20,7 +20,7 @@
 #include "api/video/video_sink_interface.h"
 #include "api/video/video_source_interface.h"
 #include "rtc_base/task_queue.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/clock.h"
 #include "test/scenario/quality_info.h"
 #include "test/scenario/scenario_config.h"
diff --git a/test/scenario/scenario.cc b/test/scenario/scenario.cc
index cadb4b5..0efe80c 100644
--- a/test/scenario/scenario.cc
+++ b/test/scenario/scenario.cc
@@ -14,9 +14,9 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "rtc_base/flags.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 #include "test/scenario/network/network_emulation.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 WEBRTC_DEFINE_bool(scenario_logs, false, "Save logs from scenario framework.");
 WEBRTC_DEFINE_string(out_root,
diff --git a/test/scenario/scenario.h b/test/scenario/scenario.h
index b5b29d7..f566840 100644
--- a/test/scenario/scenario.h
+++ b/test/scenario/scenario.h
@@ -14,8 +14,8 @@
 #include <utility>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/fake_clock.h"
 #include "test/scenario/audio_stream.h"
 #include "test/scenario/call_client.h"
 #include "test/scenario/column_printer.h"
diff --git a/test/scenario/scenario_config.h b/test/scenario/scenario_config.h
index 682a1cb..fc0da05 100644
--- a/test/scenario/scenario_config.h
+++ b/test/scenario/scenario_config.h
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "absl/types/optional.h"
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "api/transport/network_control.h"
 #include "api/units/data_rate.h"
 #include "api/units/data_size.h"
diff --git a/test/scenario/simulated_time.cc b/test/scenario/simulated_time.cc
index 7be1755..18dff32 100644
--- a/test/scenario/simulated_time.cc
+++ b/test/scenario/simulated_time.cc
@@ -17,7 +17,7 @@
 
 #include "absl/types/optional.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/socketaddress.h"
+#include "rtc_base/socket_address.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/scenario/simulated_time.h b/test/scenario/simulated_time.h
index be9331c..a4cb70a 100644
--- a/test/scenario/simulated_time.h
+++ b/test/scenario/simulated_time.h
@@ -24,7 +24,7 @@
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
-#include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/copy_on_write_buffer.h"
 #include "test/scenario/call_client.h"
 #include "test/scenario/network_node.h"
 #include "test/scenario/scenario_config.h"
diff --git a/test/scenario/video_stream.cc b/test/scenario/video_stream.cc
index b68858b..d427a90 100644
--- a/test/scenario/video_stream.cc
+++ b/test/scenario/video_stream.cc
@@ -15,14 +15,14 @@
 #include "absl/memory/memory.h"
 #include "api/test/video/function_video_encoder_factory.h"
 #include "api/video/builtin_video_bitrate_allocator_factory.h"
-#include "media/base/mediaconstants.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
-#include "media/engine/webrtcvideoengine.h"
+#include "media/base/media_constants.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
+#include "media/engine/webrtc_video_engine.h"
 #include "test/call_test.h"
 #include "test/fake_encoder.h"
 #include "test/scenario/hardware_codecs.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/scenario/video_stream.h b/test/scenario/video_stream.h
index 6604576..23994be 100644
--- a/test/scenario/video_stream.h
+++ b/test/scenario/video_stream.h
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "test/fake_encoder.h"
 #include "test/frame_generator_capturer.h"
 #include "test/scenario/call_client.h"
diff --git a/test/single_threaded_task_queue.cc b/test/single_threaded_task_queue.cc
index 5c35c2e..965cb47 100644
--- a/test/single_threaded_task_queue.cc
+++ b/test/single_threaded_task_queue.cc
@@ -15,7 +15,7 @@
 #include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/single_threaded_task_queue.h b/test/single_threaded_task_queue.h
index 0721891..5458dd1 100644
--- a/test/single_threaded_task_queue.h
+++ b/test/single_threaded_task_queue.h
@@ -14,7 +14,7 @@
 #include <list>
 #include <memory>
 
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/thread_checker.h"
diff --git a/test/test_main_lib.cc b/test/test_main_lib.cc
index ef595c7..515285e 100644
--- a/test/test_main_lib.cc
+++ b/test/test_main_lib.cc
@@ -23,11 +23,11 @@
 #include "test/field_trial.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "test/testsupport/perf_test.h"
 
 #if defined(WEBRTC_WIN)
-#include "rtc_base/win32socketinit.h"
+#include "rtc_base/win32_socket_init.h"
 #endif
 
 #if defined(WEBRTC_IOS)
diff --git a/test/test_video_capturer.h b/test/test_video_capturer.h
index 250736e..9c5b498 100644
--- a/test/test_video_capturer.h
+++ b/test/test_video_capturer.h
@@ -16,8 +16,8 @@
 
 #include "api/video/video_frame.h"
 #include "api/video/video_source_interface.h"
-#include "media/base/videoadapter.h"
-#include "media/base/videobroadcaster.h"
+#include "media/base/video_adapter.h"
+#include "media/base/video_broadcaster.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/testsupport/file_utils.cc b/test/testsupport/file_utils.cc
index 45f7091..45b2bc2 100644
--- a/test/testsupport/file_utils.cc
+++ b/test/testsupport/file_utils.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 #include <assert.h>
 
@@ -47,16 +47,16 @@
 #include <utility>
 
 #if defined(WEBRTC_IOS)
-#include "test/testsupport/iosfileutils.h"
+#include "test/testsupport/ios_file_utils.h"
 #endif
 
 #if defined(WEBRTC_MAC)
-#include "test/testsupport/macfileutils.h"
+#include "test/testsupport/mac_file_utils.h"
 #endif
 
 #include "rtc_base/checks.h"
-#include "rtc_base/stringutils.h"
-#include "test/testsupport/fileutils_override.h"
+#include "rtc_base/string_utils.h"
+#include "test/testsupport/file_utils_override.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/testsupport/file_utils.h b/test/testsupport/file_utils.h
index 8a18698..cdf3a31 100644
--- a/test/testsupport/file_utils.h
+++ b/test/testsupport/file_utils.h
@@ -10,8 +10,8 @@
 
 #include <stdio.h>
 
-#ifndef TEST_TESTSUPPORT_FILEUTILS_H_
-#define TEST_TESTSUPPORT_FILEUTILS_H_
+#ifndef TEST_TESTSUPPORT_FILE_UTILS_H_
+#define TEST_TESTSUPPORT_FILE_UTILS_H_
 
 #include <string>
 #include <vector>
@@ -106,4 +106,4 @@
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // TEST_TESTSUPPORT_FILEUTILS_H_
+#endif  // TEST_TESTSUPPORT_FILE_UTILS_H_
diff --git a/test/testsupport/file_utils_override.cc b/test/testsupport/file_utils_override.cc
index 5040fa5..e2c2c0f 100644
--- a/test/testsupport/file_utils_override.cc
+++ b/test/testsupport/file_utils_override.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "test/testsupport/fileutils_override.h"
+#include "test/testsupport/file_utils_override.h"
 
 #include <limits.h>
 #include <stdio.h>
@@ -33,17 +33,17 @@
 #endif
 
 #if defined(WEBRTC_IOS)
-#include "test/testsupport/iosfileutils.h"
+#include "test/testsupport/ios_file_utils.h"
 #endif
 
 #if defined(WEBRTC_MAC)
-#include "test/testsupport/macfileutils.h"
+#include "test/testsupport/mac_file_utils.h"
 #endif
 
 #include "absl/types/optional.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/stringutils.h"
+#include "rtc_base/string_utils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/test/testsupport/file_utils_override.h b/test/testsupport/file_utils_override.h
index 0a631df..a72cd80 100644
--- a/test/testsupport/file_utils_override.h
+++ b/test/testsupport/file_utils_override.h
@@ -10,8 +10,8 @@
 
 #include <string>
 
-#ifndef TEST_TESTSUPPORT_FILEUTILS_OVERRIDE_H_
-#define TEST_TESTSUPPORT_FILEUTILS_OVERRIDE_H_
+#ifndef TEST_TESTSUPPORT_FILE_UTILS_OVERRIDE_H_
+#define TEST_TESTSUPPORT_FILE_UTILS_OVERRIDE_H_
 
 namespace webrtc {
 namespace test {
@@ -53,4 +53,4 @@
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // TEST_TESTSUPPORT_FILEUTILS_OVERRIDE_H_
+#endif  // TEST_TESTSUPPORT_FILE_UTILS_OVERRIDE_H_
diff --git a/test/testsupport/file_utils_unittest.cc b/test/testsupport/file_utils_unittest.cc
index 49e30ff..49bc260 100644
--- a/test/testsupport/file_utils_unittest.cc
+++ b/test/testsupport/file_utils_unittest.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 #include <stdio.h>
 #include <algorithm>
diff --git a/test/testsupport/ios_file_utils.h b/test/testsupport/ios_file_utils.h
index f0194ba..bafe254 100644
--- a/test/testsupport/ios_file_utils.h
+++ b/test/testsupport/ios_file_utils.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef TEST_TESTSUPPORT_IOSFILEUTILS_H_
-#define TEST_TESTSUPPORT_IOSFILEUTILS_H_
+#ifndef TEST_TESTSUPPORT_IOS_FILE_UTILS_H_
+#define TEST_TESTSUPPORT_IOS_FILE_UTILS_H_
 
 #include <string>
 
@@ -23,4 +23,4 @@
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // TEST_TESTSUPPORT_IOSFILEUTILS_H_
+#endif  // TEST_TESTSUPPORT_IOS_FILE_UTILS_H_
diff --git a/test/testsupport/mac_file_utils.h b/test/testsupport/mac_file_utils.h
index 82ae866..c6cbdc5 100644
--- a/test/testsupport/mac_file_utils.h
+++ b/test/testsupport/mac_file_utils.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef TEST_TESTSUPPORT_MACFILEUTILS_H_
-#define TEST_TESTSUPPORT_MACFILEUTILS_H_
+#ifndef TEST_TESTSUPPORT_MAC_FILE_UTILS_H_
+#define TEST_TESTSUPPORT_MAC_FILE_UTILS_H_
 
 #include <string>
 
@@ -21,4 +21,4 @@
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // TEST_TESTSUPPORT_MACFILEUTILS_H_
+#endif  // TEST_TESTSUPPORT_MAC_FILE_UTILS_H_
diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc
index bd810e3..e0a77ae 100644
--- a/test/testsupport/perf_test.cc
+++ b/test/testsupport/perf_test.cc
@@ -10,7 +10,7 @@
 
 #include "test/testsupport/perf_test.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 
 #include <stdio.h>
 #include <cmath>
diff --git a/test/testsupport/test_artifacts.cc b/test/testsupport/test_artifacts.cc
index 9438cef..f45a92d 100644
--- a/test/testsupport/test_artifacts.cc
+++ b/test/testsupport/test_artifacts.cc
@@ -15,7 +15,7 @@
 #include "rtc_base/file.h"
 #include "rtc_base/flags.h"
 #include "rtc_base/logging.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 namespace {
 const std::string& DefaultArtifactPath() {
diff --git a/test/testsupport/test_artifacts_unittest.cc b/test/testsupport/test_artifacts_unittest.cc
index d573dc8..41c188d 100644
--- a/test/testsupport/test_artifacts_unittest.cc
+++ b/test/testsupport/test_artifacts_unittest.cc
@@ -16,7 +16,7 @@
 #include "rtc_base/file.h"
 #include "rtc_base/flags.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 
 WEBRTC_DECLARE_string(test_artifacts_dir);
 
diff --git a/test/testsupport/y4m_frame_writer_unittest.cc b/test/testsupport/y4m_frame_writer_unittest.cc
index 6d3aba7..f1de242 100644
--- a/test/testsupport/y4m_frame_writer_unittest.cc
+++ b/test/testsupport/y4m_frame_writer_unittest.cc
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "test/testsupport/frame_writer.h"
 
 namespace webrtc {
diff --git a/test/testsupport/yuv_frame_reader.cc b/test/testsupport/yuv_frame_reader.cc
index d36a367..97b94bb 100644
--- a/test/testsupport/yuv_frame_reader.cc
+++ b/test/testsupport/yuv_frame_reader.cc
@@ -14,7 +14,7 @@
 #include "api/video/i420_buffer.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/frame_utils.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "test/testsupport/frame_reader.h"
 
 namespace webrtc {
diff --git a/test/testsupport/yuv_frame_reader_unittest.cc b/test/testsupport/yuv_frame_reader_unittest.cc
index 4a2b01c..cd405f5 100644
--- a/test/testsupport/yuv_frame_reader_unittest.cc
+++ b/test/testsupport/yuv_frame_reader_unittest.cc
@@ -17,7 +17,7 @@
 #include "api/video/video_frame_buffer.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "test/testsupport/frame_reader.h"
 
 namespace webrtc {
diff --git a/test/testsupport/yuv_frame_writer_unittest.cc b/test/testsupport/yuv_frame_writer_unittest.cc
index a5ceff0..12094bb 100644
--- a/test/testsupport/yuv_frame_writer_unittest.cc
+++ b/test/testsupport/yuv_frame_writer_unittest.cc
@@ -15,7 +15,7 @@
 #include <string>
 
 #include "test/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "test/testsupport/frame_writer.h"
 
 namespace webrtc {
diff --git a/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc b/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc
index 7ff65b5..96c236c 100644
--- a/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc
+++ b/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc
@@ -31,14 +31,14 @@
     // rtc_unittests
     // https://code.google.com/p/webrtc/issues/detail?id=2080
     "race:rtc_base/logging.cc\n"
-    "race:rtc_base/sharedexclusivelock_unittest.cc\n"
-    "race:rtc_base/signalthread_unittest.cc\n"
+    "race:rtc_base/shared_exclusive_lock_unittest.cc\n"
+    "race:rtc_base/signal_thread_unittest.cc\n"
 
     // rtc_pc_unittests
     // https://code.google.com/p/webrtc/issues/detail?id=2079
-    "race:rtc_base/testclient.cc\n"
-    "race:rtc_base/virtualsocketserver.cc\n"
-    "race:talk/p2p/base/stunserver_unittest.cc\n"
+    "race:rtc_base/test_client.cc\n"
+    "race:rtc_base/virtual_socket_server.cc\n"
+    "race:talk/p2p/base/stun_server_unittest.cc\n"
 
     // third_party/usrsctp
     // TODO(jiayl): https://code.google.com/p/webrtc/issues/detail?id=3492
diff --git a/video/buffered_frame_decryptor.h b/video/buffered_frame_decryptor.h
index 28a0b55..82732a2 100644
--- a/video/buffered_frame_decryptor.h
+++ b/video/buffered_frame_decryptor.h
@@ -14,8 +14,8 @@
 #include <deque>
 #include <memory>
 
-#include "api/crypto/cryptooptions.h"
-#include "api/crypto/framedecryptorinterface.h"
+#include "api/crypto/crypto_options.h"
+#include "api/crypto/frame_decryptor_interface.h"
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/frame_object.h"
 
diff --git a/video/buffered_frame_decryptor_unittest.cc b/video/buffered_frame_decryptor_unittest.cc
index 8a0c951..ef807ef 100644
--- a/video/buffered_frame_decryptor_unittest.cc
+++ b/video/buffered_frame_decryptor_unittest.cc
@@ -17,7 +17,7 @@
 #include "absl/memory/memory.h"
 #include "api/test/mock_frame_decryptor.h"
 #include "modules/video_coding/packet_buffer.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/video/call_stats.h b/video/call_stats.h
index 930c3ef..34519ba 100644
--- a/video/call_stats.h
+++ b/video/call_stats.h
@@ -16,8 +16,8 @@
 
 #include "modules/include/module.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_checker.h"
 #include "system_wrappers/include/clock.h"
 
diff --git a/video/cpu_scaling_tests.cc b/video/cpu_scaling_tests.cc
index c4d1b1e..c6a8975 100644
--- a/video/cpu_scaling_tests.cc
+++ b/video/cpu_scaling_tests.cc
@@ -11,7 +11,7 @@
 #include <limits>
 #include <vector>
 
-#include "api/rtpparameters.h"
+#include "api/rtp_parameters.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_sink_interface.h"
 #include "api/video/video_source_interface.h"
diff --git a/video/encoder_rtcp_feedback.h b/video/encoder_rtcp_feedback.h
index b838979..bdae914 100644
--- a/video/encoder_rtcp_feedback.h
+++ b/video/encoder_rtcp_feedback.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "system_wrappers/include/clock.h"
 
 namespace webrtc {
diff --git a/video/end_to_end_tests/codec_tests.cc b/video/end_to_end_tests/codec_tests.cc
index f446228..3c9b39c 100644
--- a/video/end_to_end_tests/codec_tests.cc
+++ b/video/end_to_end_tests/codec_tests.cc
@@ -14,8 +14,8 @@
 #include "api/video/color_space.h"
 #include "api/video/video_rotation.h"
 #include "common_video/test/utilities.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
 #include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h"
 #include "modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h"
diff --git a/video/end_to_end_tests/config_tests.cc b/video/end_to_end_tests/config_tests.cc
index 448f74c..c5f6e3f 100644
--- a/video/end_to_end_tests/config_tests.cc
+++ b/video/end_to_end_tests/config_tests.cc
@@ -11,7 +11,7 @@
 #include <map>
 #include <vector>
 
-#include "api/crypto/cryptooptions.h"
+#include "api/crypto/crypto_options.h"
 #include "api/rtp_headers.h"
 #include "call/flexfec_receive_stream.h"
 #include "call/rtp_config.h"
diff --git a/video/end_to_end_tests/extended_reports_tests.cc b/video/end_to_end_tests/extended_reports_tests.cc
index 2afda42..5b649d5 100644
--- a/video/end_to_end_tests/extended_reports_tests.cc
+++ b/video/end_to_end_tests/extended_reports_tests.cc
@@ -31,7 +31,7 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/source/rtcp_packet/dlrr.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
diff --git a/video/end_to_end_tests/fec_tests.cc b/video/end_to_end_tests/fec_tests.cc
index a8fa82d..42215d3 100644
--- a/video/end_to_end_tests/fec_tests.cc
+++ b/video/end_to_end_tests/fec_tests.cc
@@ -13,7 +13,7 @@
 #include "api/test/video/function_video_encoder_factory.h"
 #include "call/fake_network_pipe.h"
 #include "call/simulated_network.h"
-#include "media/engine/internaldecoderfactory.h"
+#include "media/engine/internal_decoder_factory.h"
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "test/call_test.h"
diff --git a/video/end_to_end_tests/frame_encryption_tests.cc b/video/end_to_end_tests/frame_encryption_tests.cc
index 8cd7b47..98b3a4b 100644
--- a/video/end_to_end_tests/frame_encryption_tests.cc
+++ b/video/end_to_end_tests/frame_encryption_tests.cc
@@ -10,7 +10,7 @@
 
 #include "api/test/fake_frame_decryptor.h"
 #include "api/test/fake_frame_encryptor.h"
-#include "media/engine/internaldecoderfactory.h"
+#include "media/engine/internal_decoder_factory.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "test/call_test.h"
 #include "test/field_trial.h"
diff --git a/video/end_to_end_tests/multi_stream_tester.cc b/video/end_to_end_tests/multi_stream_tester.cc
index 5d5ba63..e9d1d04 100644
--- a/video/end_to_end_tests/multi_stream_tester.cc
+++ b/video/end_to_end_tests/multi_stream_tester.cc
@@ -21,7 +21,7 @@
 #include "call/fake_network_pipe.h"
 #include "call/simulated_network.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
-#include "media/engine/internaldecoderfactory.h"
+#include "media/engine/internal_decoder_factory.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "test/call_test.h"
 #include "test/encoder_settings.h"
diff --git a/video/overuse_frame_detector.cc b/video/overuse_frame_detector.cc
index cba167d..b214b39 100644
--- a/video/overuse_frame_detector.cc
+++ b/video/overuse_frame_detector.cc
@@ -24,7 +24,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/exp_filter.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/field_trial.h"
 
 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
diff --git a/video/overuse_frame_detector.h b/video/overuse_frame_detector.h
index ea0d76d..3db8643 100644
--- a/video/overuse_frame_detector.h
+++ b/video/overuse_frame_detector.h
@@ -17,7 +17,7 @@
 #include "absl/types/optional.h"
 #include "api/video/video_stream_encoder_observer.h"
 #include "modules/video_coding/utility/quality_scaler.h"
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 #include "rtc_base/numerics/exp_filter.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/task_queue.h"
diff --git a/video/overuse_frame_detector_unittest.cc b/video/overuse_frame_detector_unittest.cc
index eef2339..7e160f7 100644
--- a/video/overuse_frame_detector_unittest.cc
+++ b/video/overuse_frame_detector_unittest.cc
@@ -15,7 +15,7 @@
 #include "api/video/i420_buffer.h"
 #include "modules/video_coding/utility/quality_scaler.h"
 #include "rtc_base/event.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/random.h"
 #include "test/gmock.h"
 #include "test/gtest.h"
diff --git a/video/picture_id_tests.cc b/video/picture_id_tests.cc
index c8f5cf3..f74cebc 100644
--- a/video/picture_id_tests.cc
+++ b/video/picture_id_tests.cc
@@ -13,7 +13,7 @@
 #include "api/test/video/function_video_encoder_factory.h"
 #include "call/fake_network_pipe.h"
 #include "call/simulated_network.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/engine/internal_encoder_factory.h"
 #include "media/engine/simulcast_encoder_adapter.h"
 #include "modules/rtp_rtcp/source/rtp_format.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
diff --git a/video/quality_scaling_tests.cc b/video/quality_scaling_tests.cc
index 01328f8..4f68eb1 100644
--- a/video/quality_scaling_tests.cc
+++ b/video/quality_scaling_tests.cc
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "api/test/video/function_video_encoder_factory.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/engine/internal_encoder_factory.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
diff --git a/video/receive_statistics_proxy.cc b/video/receive_statistics_proxy.cc
index b9da65a..8ad6ef5 100644
--- a/video/receive_statistics_proxy.cc
+++ b/video/receive_statistics_proxy.cc
@@ -18,7 +18,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/clock.h"
 #include "system_wrappers/include/metrics.h"
 
diff --git a/video/receive_statistics_proxy.h b/video/receive_statistics_proxy.h
index 83d5bce..e1a0784 100644
--- a/video/receive_statistics_proxy.h
+++ b/video/receive_statistics_proxy.h
@@ -19,12 +19,12 @@
 #include "absl/types/optional.h"
 #include "call/video_receive_stream.h"
 #include "modules/video_coding/include/video_coding_defines.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/numerics/histogram_percentile_counter.h"
 #include "rtc_base/numerics/moving_max_counter.h"
 #include "rtc_base/numerics/sample_counter.h"
 #include "rtc_base/rate_statistics.h"
-#include "rtc_base/ratetracker.h"
+#include "rtc_base/rate_tracker.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/thread_checker.h"
 #include "video/quality_threshold.h"
diff --git a/video/replay.cc b/video/replay.cc
index a6d78aa..030c01a 100644
--- a/video/replay.cc
+++ b/video/replay.cc
@@ -21,14 +21,14 @@
 #include "call/call.h"
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
-#include "media/engine/internaldecoderfactory.h"
+#include "media/engine/internal_decoder_factory.h"
 #include "modules/rtp_rtcp/include/rtp_header_parser.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/file.h"
 #include "rtc_base/flags.h"
 #include "rtc_base/string_to_number.h"
 #include "rtc_base/strings/json.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/clock.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/call_test.h"
diff --git a/video/rtp_streams_synchronizer.cc b/video/rtp_streams_synchronizer.cc
index 3110661..9646f9d 100644
--- a/video/rtp_streams_synchronizer.cc
+++ b/video/rtp_streams_synchronizer.cc
@@ -13,7 +13,7 @@
 #include "absl/types/optional.h"
 #include "call/syncable.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/rtp_to_ntp_estimator.h"
 
diff --git a/video/rtp_streams_synchronizer.h b/video/rtp_streams_synchronizer.h
index 720ea14..0778fc5 100644
--- a/video/rtp_streams_synchronizer.h
+++ b/video/rtp_streams_synchronizer.h
@@ -17,7 +17,7 @@
 #include <memory>
 
 #include "modules/include/module.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_checker.h"
 #include "video/stream_synchronization.h"
 
diff --git a/video/rtp_video_stream_receiver.cc b/video/rtp_video_stream_receiver.cc
index 0cd3b7e..0986400 100644
--- a/video/rtp_video_stream_receiver.cc
+++ b/video/rtp_video_stream_receiver.cc
@@ -16,7 +16,7 @@
 
 #include "absl/memory/memory.h"
 
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/pacing/packet_router.h"
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "modules/rtp_rtcp/include/receive_statistics.h"
diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h
index f4d71b4..c1ee662 100644
--- a/video/rtp_video_stream_receiver.h
+++ b/video/rtp_video_stream_receiver.h
@@ -19,7 +19,7 @@
 
 #include "absl/types/optional.h"
 
-#include "api/crypto/framedecryptorinterface.h"
+#include "api/crypto/frame_decryptor_interface.h"
 #include "api/video/color_space.h"
 #include "api/video_codecs/video_codec.h"
 #include "call/rtp_packet_sink_interface.h"
@@ -35,8 +35,8 @@
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/packet_buffer.h"
 #include "modules/video_coding/rtp_frame_reference_finder.h"
-#include "rtc_base/constructormagic.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/numerics/sequence_number_util.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/video/rtp_video_stream_receiver_unittest.cc b/video/rtp_video_stream_receiver_unittest.cc
index ae3751b..6ec7046 100644
--- a/video/rtp_video_stream_receiver_unittest.cc
+++ b/video/rtp_video_stream_receiver_unittest.cc
@@ -13,7 +13,7 @@
 
 #include "absl/memory/memory.h"
 #include "common_video/h264/h264_common.h"
-#include "media/base/mediaconstants.h"
+#include "media/base/media_constants.h"
 #include "modules/pacing/packet_router.h"
 #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h"
 #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h"
@@ -23,7 +23,7 @@
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/packet.h"
 #include "modules/video_coding/rtp_frame_reference_finder.h"
-#include "rtc_base/bytebuffer.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/logging.h"
 #include "system_wrappers/include/clock.h"
 #include "system_wrappers/include/field_trial.h"
diff --git a/video/screenshare_loopback.cc b/video/screenshare_loopback.cc
index 46fd2af..a153e2f 100644
--- a/video/screenshare_loopback.cc
+++ b/video/screenshare_loopback.cc
@@ -22,7 +22,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/flags.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
diff --git a/video/send_delay_stats.h b/video/send_delay_stats.h
index 108795a..c3b9dc2 100644
--- a/video/send_delay_stats.h
+++ b/video/send_delay_stats.h
@@ -20,7 +20,7 @@
 #include "call/video_send_stream.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module_common_types_public.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
 #include "video/stats_counter.h"
diff --git a/video/send_statistics_proxy.h b/video/send_statistics_proxy.h
index 7316f3b..ca8f542 100644
--- a/video/send_statistics_proxy.h
+++ b/video/send_statistics_proxy.h
@@ -20,9 +20,9 @@
 #include "call/video_send_stream.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_coding_defines.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/numerics/exp_filter.h"
-#include "rtc_base/ratetracker.h"
+#include "rtc_base/rate_tracker.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
 #include "video/report_block_stats.h"
diff --git a/video/stats_counter.h b/video/stats_counter.h
index 6801739..fb6017f 100644
--- a/video/stats_counter.h
+++ b/video/stats_counter.h
@@ -14,7 +14,7 @@
 #include <memory>
 #include <string>
 
-#include "rtc_base/constructormagic.h"
+#include "rtc_base/constructor_magic.h"
 
 namespace webrtc {
 
diff --git a/video/sv_loopback.cc b/video/sv_loopback.cc
index 635cc56..8785f15 100644
--- a/video/sv_loopback.cc
+++ b/video/sv_loopback.cc
@@ -22,7 +22,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/flags.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringencode.h"
+#include "rtc_base/string_encode.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
diff --git a/video/video_analyzer.cc b/video/video_analyzer.cc
index 950cf68..8987a82 100644
--- a/video/video_analyzer.cc
+++ b/video/video_analyzer.cc
@@ -21,7 +21,7 @@
 #include "rtc_base/memory_usage.h"
 #include "system_wrappers/include/cpu_info.h"
 #include "test/call_test.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "test/testsupport/frame_writer.h"
 #include "test/testsupport/perf_test.h"
 #include "test/testsupport/test_artifacts.h"
diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
index 736d21e..2a1bb82 100644
--- a/video/video_quality_test.cc
+++ b/video/video_quality_test.cc
@@ -23,8 +23,8 @@
 #include "logging/rtc_event_log/output/rtc_event_log_output_file.h"
 #include "media/engine/adm_helpers.h"
 #include "media/engine/encoder_simulcast_proxy.h"
-#include "media/engine/internalencoderfactory.h"
-#include "media/engine/webrtcvideoengine.h"
+#include "media/engine/internal_encoder_factory.h"
+#include "media/engine/webrtc_video_engine.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_mixer/audio_mixer_impl.h"
 #include "modules/video_coding/codecs/h264/include/h264.h"
@@ -35,7 +35,7 @@
 #include "modules/video_coding/utility/ivf_file_writer.h"
 #include "rtc_base/strings/string_builder.h"
 #include "test/run_loop.h"
-#include "test/testsupport/fileutils.h"
+#include "test/testsupport/file_utils.h"
 #include "test/vcm_capturer.h"
 #include "test/video_renderer.h"
 #include "video/frame_dumping_decoder.h"
diff --git a/video/video_quality_test.h b/video/video_quality_test.h
index 51686ec..028dddf 100644
--- a/video/video_quality_test.h
+++ b/video/video_quality_test.h
@@ -19,8 +19,8 @@
 #include "api/test/video_quality_test_fixture.h"
 #include "api/video/video_bitrate_allocator_factory.h"
 #include "call/fake_network_pipe.h"
-#include "media/engine/internaldecoderfactory.h"
-#include "media/engine/internalencoderfactory.h"
+#include "media/engine/internal_decoder_factory.h"
+#include "media/engine/internal_encoder_factory.h"
 #include "test/call_test.h"
 #include "test/frame_generator.h"
 #include "test/layer_filtering_transport.h"
diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc
index b34e1b7..4a73dec 100644
--- a/video/video_receive_stream.cc
+++ b/video/video_receive_stream.cc
@@ -20,7 +20,7 @@
 #include "absl/memory/memory.h"
 #include "absl/types/optional.h"
 #include "api/array_view.h"
-#include "api/crypto/framedecryptorinterface.h"
+#include "api/crypto/frame_decryptor_interface.h"
 #include "api/video/encoded_image.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_codec.h"
@@ -43,7 +43,7 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_file.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/clock.h"
 #include "system_wrappers/include/field_trial.h"
diff --git a/video/video_receive_stream_unittest.cc b/video/video_receive_stream_unittest.cc
index 0ec9e17..259026a 100644
--- a/video/video_receive_stream_unittest.cc
+++ b/video/video_receive_stream_unittest.cc
@@ -15,11 +15,11 @@
 
 #include "api/video_codecs/video_decoder.h"
 #include "call/rtp_stream_receiver_controller.h"
-#include "media/base/fakevideorenderer.h"
+#include "media/base/fake_video_renderer.h"
 #include "modules/pacing/packet_router.h"
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "modules/utility/include/process_thread.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "system_wrappers/include/clock.h"
 #include "test/field_trial.h"
diff --git a/video/video_send_stream.h b/video/video_send_stream.h
index 0765b52..f260304 100644
--- a/video/video_send_stream.h
+++ b/video/video_send_stream.h
@@ -20,7 +20,7 @@
 #include "call/bitrate_allocator.h"
 #include "call/video_receive_stream.h"
 #include "call/video_send_stream.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/task_queue.h"
 #include "video/send_delay_stats.h"
diff --git a/video/video_send_stream_impl.cc b/video/video_send_stream_impl.cc
index 42ec4a0..aa76967 100644
--- a/video/video_send_stream_impl.cc
+++ b/video/video_send_stream_impl.cc
@@ -15,14 +15,14 @@
 #include <string>
 #include <utility>
 
-#include "api/crypto/cryptooptions.h"
-#include "api/rtpparameters.h"
+#include "api/crypto/crypto_options.h"
+#include "api/rtp_parameters.h"
 #include "api/video_codecs/video_codec.h"
 #include "call/rtp_transport_controller_send_interface.h"
 #include "call/video_send_stream.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/pacing/paced_sender.h"
-#include "rtc_base/atomicops.h"
+#include "rtc_base/atomic_ops.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/experiments/alr_experiment.h"
 #include "rtc_base/logging.h"
@@ -30,7 +30,7 @@
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/thread_checker.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/clock.h"
 #include "system_wrappers/include/field_trial.h"
diff --git a/video/video_send_stream_impl.h b/video/video_send_stream_impl.h
index fc89bf1..cfc3328 100644
--- a/video/video_send_stream_impl.h
+++ b/video/video_send_stream_impl.h
@@ -33,7 +33,7 @@
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/utility/include/process_thread.h"
 #include "modules/video_coding/include/video_codec_interface.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_annotations.h"
 #include "rtc_base/weak_ptr.h"
diff --git a/video/video_send_stream_impl_unittest.cc b/video/video_send_stream_impl_unittest.cc
index 5eb6d7b..af8c307 100644
--- a/video/video_send_stream_impl_unittest.cc
+++ b/video/video_send_stream_impl_unittest.cc
@@ -18,7 +18,7 @@
 #include "modules/utility/include/process_thread.h"
 #include "modules/video_coding/fec_controller_default.h"
 #include "rtc_base/experiments/alr_experiment.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/task_queue_for_test.h"
 #include "test/field_trial.h"
 #include "test/gmock.h"
diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index c306e84..3264ce7 100644
--- a/video/video_send_stream_tests.cc
+++ b/video/video_send_stream_tests.cc
@@ -26,13 +26,13 @@
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/experiments/alr_experiment.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/rate_limiter.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/call_test.h"
 #include "test/configurable_frame_size_encoder.h"
diff --git a/video/video_stream_decoder.h b/video/video_stream_decoder.h
index df2ab9b..5a62d2c 100644
--- a/video/video_stream_decoder.h
+++ b/video/video_stream_decoder.h
@@ -19,7 +19,7 @@
 #include "api/video/video_sink_interface.h"
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "modules/video_coding/include/video_coding_defines.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
diff --git a/video/video_stream_decoder_impl.cc b/video/video_stream_decoder_impl.cc
index 4a22f5d..fd3c620 100644
--- a/video/video_stream_decoder_impl.cc
+++ b/video/video_stream_decoder_impl.cc
@@ -13,7 +13,7 @@
 #include "absl/memory/memory.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/mod_ops.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 
diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index 0cb6c3b..2d4de8f 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -30,7 +30,7 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/system/fallthrough.h"
-#include "rtc_base/timeutils.h"
+#include "rtc_base/time_utils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/field_trial.h"
 #include "video/overuse_frame_detector.h"
diff --git a/video/video_stream_encoder.h b/video/video_stream_encoder.h
index e522d64..577ca5b 100644
--- a/video/video_stream_encoder.h
+++ b/video/video_stream_encoder.h
@@ -27,7 +27,7 @@
 #include "modules/video_coding/utility/frame_dropper.h"
 #include "modules/video_coding/utility/quality_scaler.h"
 #include "modules/video_coding/video_coding_impl.h"
-#include "rtc_base/criticalsection.h"
+#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/rate_statistics.h"
 #include "rtc_base/sequenced_task_checker.h"
diff --git a/video/video_stream_encoder_unittest.cc b/video/video_stream_encoder_unittest.cc
index 7cc1e64..e83b04e 100644
--- a/video/video_stream_encoder_unittest.cc
+++ b/video/video_stream_encoder_unittest.cc
@@ -18,12 +18,12 @@
 #include "api/video/i420_buffer.h"
 #include "api/video_codecs/create_vp8_temporal_layers.h"
 #include "api/video_codecs/vp8_temporal_layers.h"
-#include "media/base/videoadapter.h"
+#include "media/base/video_adapter.h"
 #include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
 #include "modules/video_coding/utility/default_video_bitrate_allocator.h"
-#include "rtc_base/fakeclock.h"
+#include "rtc_base/fake_clock.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/refcountedobject.h"
+#include "rtc_base/ref_counted_object.h"
 #include "system_wrappers/include/metrics.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/encoder_settings.h"