Rename tools-webrtc -> tools_webrtc

This aligns with established naming convention for all
other directories.

BUG=webrtc:7593
NOTRY=True
NOTREECHECKS=True
R=ehmaldonado@webrtc.org, mbonadei@webrtc.org
TBR=henrika@webrtc.org

Review-Url: https://codereview.webrtc.org/2864213004 .
Cr-Commit-Position: refs/heads/master@{#18059}
diff --git a/.gitignore b/.gitignore
index 42cd042..55b2781 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,16 +46,16 @@
 /testing
 /third_party
 /tools
-/tools-webrtc/android/profiling/flamegraph
-/tools-webrtc/android/profiling/simpleperf
-/tools-webrtc/audio_quality/linux/pesq
-/tools-webrtc/audio_quality/mac/pesq
-/tools-webrtc/audio_quality/win/*.exe
-/tools-webrtc/video_quality_toolchain/linux/ffmpeg
-/tools-webrtc/video_quality_toolchain/linux/zxing
-/tools-webrtc/video_quality_toolchain/mac/ffmpeg
-/tools-webrtc/video_quality_toolchain/mac/zxing
-/tools-webrtc/video_quality_toolchain/win/*.dll
-/tools-webrtc/video_quality_toolchain/win/*.exe
+/tools_webrtc/android/profiling/flamegraph
+/tools_webrtc/android/profiling/simpleperf
+/tools_webrtc/audio_quality/linux/pesq
+/tools_webrtc/audio_quality/mac/pesq
+/tools_webrtc/audio_quality/win/*.exe
+/tools_webrtc/video_quality_toolchain/linux/ffmpeg
+/tools_webrtc/video_quality_toolchain/linux/zxing
+/tools_webrtc/video_quality_toolchain/mac/ffmpeg
+/tools_webrtc/video_quality_toolchain/mac/zxing
+/tools_webrtc/video_quality_toolchain/win/*.dll
+/tools_webrtc/video_quality_toolchain/win/*.exe
 /x86-generic_out/
 /xcodebuild
diff --git a/DEPS b/DEPS
index c0eb634..5be4d77 100644
--- a/DEPS
+++ b/DEPS
@@ -165,7 +165,7 @@
         'python',
         'src/build/landmines.py',
         '--landmine-scripts',
-        'src/tools-webrtc/get_landmines.py',
+        'src/tools_webrtc/get_landmines.py',
         '--src-dir',
         'src',
     ],
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 24eff14..694624e 100755
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -15,7 +15,7 @@
 
 # Files and directories that are *skipped* by cpplint in the presubmit script.
 CPPLINT_BLACKLIST = [
-  'tools-webrtc',
+  'tools_webrtc',
   'webrtc/api/video_codecs/video_decoder.h',
   'webrtc/api/video_codecs/video_encoder.h',
   'webrtc/base',
@@ -332,7 +332,7 @@
 
 def _CheckNoPackageBoundaryViolations(input_api, gn_files, output_api):
   cwd = input_api.PresubmitLocalPath()
-  script_path = os.path.join('tools-webrtc', 'check_package_boundaries.py')
+  script_path = os.path.join('tools_webrtc', 'check_package_boundaries.py')
   webrtc_path = os.path.join('webrtc')
   command = [sys.executable, script_path, webrtc_path]
   command += [gn_file.LocalPath() for gn_file in gn_files]
@@ -474,7 +474,7 @@
       Join('webrtc', 'tools'),
       Join('webrtc', 'audio', 'test', 'unittests'),
   ] + [
-      root for root, _, files in os.walk(Join('tools-webrtc'))
+      root for root, _, files in os.walk(Join('tools_webrtc'))
       if any(f.endswith('_test.py') for f in files)
   ]
 
@@ -533,8 +533,8 @@
                   r'^third_party[\\\/].*\.py$',
                   r'^tools[\\\/].*\.py$',
                   # TODO(phoglund): should arguably be checked.
-                  r'^tools-webrtc[\\\/]mb[\\\/].*\.py$',
-                  r'^tools-webrtc[\\\/]valgrind[\\\/].*\.py$',
+                  r'^tools_webrtc[\\\/]mb[\\\/].*\.py$',
+                  r'^tools_webrtc[\\\/]valgrind[\\\/].*\.py$',
                   r'^xcodebuild.*[\\\/].*\.py$',),
       pylintrc='pylintrc'))
 
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index af4924d..9a67763 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -22,17 +22,17 @@
 
 # Use our own suppressions files.
 asan_suppressions_file = "//build/sanitizers/asan_suppressions.cc"
-lsan_suppressions_file = "//tools-webrtc/sanitizers/lsan_suppressions_webrtc.cc"
-tsan_suppressions_file = "//tools-webrtc/sanitizers/tsan_suppressions_webrtc.cc"
+lsan_suppressions_file = "//tools_webrtc/sanitizers/lsan_suppressions_webrtc.cc"
+tsan_suppressions_file = "//tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc"
 msan_blacklist_path =
-    rebase_path("//tools-webrtc/msan/blacklist.txt", root_build_dir)
+    rebase_path("//tools_webrtc/msan/blacklist.txt", root_build_dir)
 ubsan_blacklist_path =
-    rebase_path("//tools-webrtc/ubsan/blacklist.txt", root_build_dir)
+    rebase_path("//tools_webrtc/ubsan/blacklist.txt", root_build_dir)
 ubsan_vptr_blacklist_path =
-    rebase_path("//tools-webrtc/ubsan/vptr_blacklist.txt", root_build_dir)
+    rebase_path("//tools_webrtc/ubsan/vptr_blacklist.txt", root_build_dir)
 
 # Android lint suppressions file
-lint_suppressions_file = "//tools-webrtc/android/suppressions.xml"
+lint_suppressions_file = "//tools_webrtc/android/suppressions.xml"
 
 # For Chromium, Android 32-bit non-component, non-clang builds hit a 4GiB size
 # limit, making them requiring symbol_level=2. WebRTC doesn't hit that problem
diff --git a/tools-webrtc/ios/SDK/PodTest/PodTest.xcodeproj/project.pbxproj b/tools-webrtc/ios/SDK/PodTest/PodTest.xcodeproj/project.pbxproj
deleted file mode 100644
index 61f4a63..0000000
--- a/tools-webrtc/ios/SDK/PodTest/PodTest.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,387 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		35CCB21D484D1895C69C8136 /* libPods-PodTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B440848658A273284BE622B2 /* libPods-PodTest.a */; };
-		980224E81CA2492B00295D57 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 980224E71CA2492B00295D57 /* main.m */; };
-		980224EB1CA2492B00295D57 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 980224EA1CA2492B00295D57 /* AppDelegate.m */; };
-		980224EE1CA2492B00295D57 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 980224ED1CA2492B00295D57 /* ViewController.m */; };
-		980224F11CA2492B00295D57 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 980224EF1CA2492B00295D57 /* Main.storyboard */; };
-		980224F31CA2492B00295D57 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 980224F21CA2492B00295D57 /* Assets.xcassets */; };
-		980224F61CA2492B00295D57 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 980224F41CA2492B00295D57 /* LaunchScreen.storyboard */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		958C1C282F79C7CA1502DE3B /* Pods-PodTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PodTest.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PodTest/Pods-PodTest.debug.xcconfig"; sourceTree = "<group>"; };
-		980224E31CA2492B00295D57 /* PodTest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PodTest.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		980224E71CA2492B00295D57 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		980224E91CA2492B00295D57 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		980224EA1CA2492B00295D57 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		980224EC1CA2492B00295D57 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		980224ED1CA2492B00295D57 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
-		980224F01CA2492B00295D57 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		980224F21CA2492B00295D57 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		980224F51CA2492B00295D57 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		980224F71CA2492B00295D57 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		A08398FF9AFA120A294C8B4A /* Pods-PodTest.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PodTest.release.xcconfig"; path = "Pods/Target Support Files/Pods-PodTest/Pods-PodTest.release.xcconfig"; sourceTree = "<group>"; };
-		B440848658A273284BE622B2 /* libPods-PodTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PodTest.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		980224E01CA2492B00295D57 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				35CCB21D484D1895C69C8136 /* libPods-PodTest.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		2D0689FF9D90317696844B09 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				958C1C282F79C7CA1502DE3B /* Pods-PodTest.debug.xcconfig */,
-				A08398FF9AFA120A294C8B4A /* Pods-PodTest.release.xcconfig */,
-			);
-			name = Pods;
-			sourceTree = "<group>";
-		};
-		94F704D644F27718B3DC8356 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				B440848658A273284BE622B2 /* libPods-PodTest.a */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		980224DA1CA2492B00295D57 = {
-			isa = PBXGroup;
-			children = (
-				980224E51CA2492B00295D57 /* PodTest */,
-				980224E41CA2492B00295D57 /* Products */,
-				2D0689FF9D90317696844B09 /* Pods */,
-				94F704D644F27718B3DC8356 /* Frameworks */,
-			);
-			sourceTree = "<group>";
-		};
-		980224E41CA2492B00295D57 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				980224E31CA2492B00295D57 /* PodTest.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		980224E51CA2492B00295D57 /* PodTest */ = {
-			isa = PBXGroup;
-			children = (
-				980224E91CA2492B00295D57 /* AppDelegate.h */,
-				980224EA1CA2492B00295D57 /* AppDelegate.m */,
-				980224EC1CA2492B00295D57 /* ViewController.h */,
-				980224ED1CA2492B00295D57 /* ViewController.m */,
-				980224EF1CA2492B00295D57 /* Main.storyboard */,
-				980224F21CA2492B00295D57 /* Assets.xcassets */,
-				980224F41CA2492B00295D57 /* LaunchScreen.storyboard */,
-				980224F71CA2492B00295D57 /* Info.plist */,
-				980224E61CA2492B00295D57 /* Supporting Files */,
-			);
-			path = PodTest;
-			sourceTree = "<group>";
-		};
-		980224E61CA2492B00295D57 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				980224E71CA2492B00295D57 /* main.m */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		980224E21CA2492B00295D57 /* PodTest */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 980224FA1CA2492B00295D57 /* Build configuration list for PBXNativeTarget "PodTest" */;
-			buildPhases = (
-				1DF1B456F5E58A85BF7C31CB /* Check Pods Manifest.lock */,
-				980224DF1CA2492B00295D57 /* Sources */,
-				980224E01CA2492B00295D57 /* Frameworks */,
-				980224E11CA2492B00295D57 /* Resources */,
-				38335E508F0DC12B95F1FA81 /* Embed Pods Frameworks */,
-				AC997D7BBE631007E4045090 /* Copy Pods Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = PodTest;
-			productName = PodTest;
-			productReference = 980224E31CA2492B00295D57 /* PodTest.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		980224DB1CA2492B00295D57 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0720;
-				ORGANIZATIONNAME = "Google Inc.";
-				TargetAttributes = {
-					980224E21CA2492B00295D57 = {
-						CreatedOnToolsVersion = 7.2.1;
-					};
-				};
-			};
-			buildConfigurationList = 980224DE1CA2492B00295D57 /* Build configuration list for PBXProject "PodTest" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 980224DA1CA2492B00295D57;
-			productRefGroup = 980224E41CA2492B00295D57 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				980224E21CA2492B00295D57 /* PodTest */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		980224E11CA2492B00295D57 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				980224F61CA2492B00295D57 /* LaunchScreen.storyboard in Resources */,
-				980224F31CA2492B00295D57 /* Assets.xcassets in Resources */,
-				980224F11CA2492B00295D57 /* Main.storyboard in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		1DF1B456F5E58A85BF7C31CB /* Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Check Pods Manifest.lock";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		38335E508F0DC12B95F1FA81 /* Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PodTest/Pods-PodTest-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		AC997D7BBE631007E4045090 /* Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PodTest/Pods-PodTest-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		980224DF1CA2492B00295D57 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				980224EE1CA2492B00295D57 /* ViewController.m in Sources */,
-				980224EB1CA2492B00295D57 /* AppDelegate.m in Sources */,
-				980224E81CA2492B00295D57 /* main.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		980224EF1CA2492B00295D57 /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				980224F01CA2492B00295D57 /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-		980224F41CA2492B00295D57 /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				980224F51CA2492B00295D57 /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		980224F81CA2492B00295D57 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		980224F91CA2492B00295D57 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		980224FB1CA2492B00295D57 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 958C1C282F79C7CA1502DE3B /* Pods-PodTest.debug.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = PodTest/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.google.PodTest;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		980224FC1CA2492B00295D57 /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = A08398FF9AFA120A294C8B4A /* Pods-PodTest.release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ENABLE_BITCODE = NO;
-				INFOPLIST_FILE = PodTest/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.google.PodTest;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		980224DE1CA2492B00295D57 /* Build configuration list for PBXProject "PodTest" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				980224F81CA2492B00295D57 /* Debug */,
-				980224F91CA2492B00295D57 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		980224FA1CA2492B00295D57 /* Build configuration list for PBXNativeTarget "PodTest" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				980224FB1CA2492B00295D57 /* Debug */,
-				980224FC1CA2492B00295D57 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 980224DB1CA2492B00295D57 /* Project object */;
-}
diff --git a/tools-webrtc/ios/SDK/PodTest/PodTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tools-webrtc/ios/SDK/PodTest/PodTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index de211a5..0000000
--- a/tools-webrtc/ios/SDK/PodTest/PodTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:PodTest.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/tools-webrtc/OWNERS b/tools_webrtc/OWNERS
similarity index 100%
rename from tools-webrtc/OWNERS
rename to tools_webrtc/OWNERS
diff --git a/tools-webrtc/PRESUBMIT.py b/tools_webrtc/PRESUBMIT.py
similarity index 100%
rename from tools-webrtc/PRESUBMIT.py
rename to tools_webrtc/PRESUBMIT.py
diff --git a/tools-webrtc/android/AndroidManifest.xml b/tools_webrtc/android/AndroidManifest.xml
similarity index 100%
rename from tools-webrtc/android/AndroidManifest.xml
rename to tools_webrtc/android/AndroidManifest.xml
diff --git a/tools-webrtc/android/adb_shell.sh b/tools_webrtc/android/adb_shell.sh
similarity index 100%
rename from tools-webrtc/android/adb_shell.sh
rename to tools_webrtc/android/adb_shell.sh
diff --git a/tools-webrtc/android/build_aar.py b/tools_webrtc/android/build_aar.py
similarity index 99%
rename from tools-webrtc/android/build_aar.py
rename to tools_webrtc/android/build_aar.py
index 9db8f8f..54272e9 100755
--- a/tools-webrtc/android/build_aar.py
+++ b/tools_webrtc/android/build_aar.py
@@ -11,7 +11,7 @@
 """Script to generate libwebrtc.aar for distribution.
 
 The script has to be run from the root src folder.
-./tools-webrtc/android/build_aar.py
+./tools_webrtc/android/build_aar.py
 
 .aar-file is just a zip-archive containing the files of the library. The file
 structure generated by this script looks like this:
diff --git a/tools-webrtc/android/profiling/perf_setup.sh b/tools_webrtc/android/profiling/perf_setup.sh
similarity index 98%
rename from tools-webrtc/android/profiling/perf_setup.sh
rename to tools_webrtc/android/profiling/perf_setup.sh
index 810c486..9c6b0f9 100755
--- a/tools-webrtc/android/profiling/perf_setup.sh
+++ b/tools_webrtc/android/profiling/perf_setup.sh
@@ -26,7 +26,7 @@
 #
 # Example usage:
 #
-#   > . tools-webrtc/android/profiling/perf_setup.sh out/Release
+#   > . tools_webrtc/android/profiling/perf_setup.sh out/Release
 #   > perf_record 120
 #   > flame_graph
 #   > plot_flame_graph
@@ -409,7 +409,7 @@
   fi
   ok "${APP_NAME} is installed on the device"
 
-  # Download simpleperf to <src>/tools-webrtc/android/profiling/simpleperf/.
+  # Download simpleperf to <src>/tools_webrtc/android/profiling/simpleperf/.
   # Cloning will only take place if the target does not already exist.
   # The PATH variable will also be updated.
   # TODO(henrika): would it be better to use a target outside the WebRTC repo?
@@ -445,7 +445,7 @@
   perf_update
   ok "symbol cache is updated"
 
-  # Download Flame Graph to <src>/tools-webrtc/android/profiling/flamegraph/.
+  # Download Flame Graph to <src>/tools_webrtc/android/profiling/flamegraph/.
   # Cloning will only take place if the target does not already exist.
   # The PATH variable will also be updated.
   # TODO(henrika): would it be better to use a target outside the WebRTC repo?
diff --git a/tools-webrtc/android/profiling/utilities.sh b/tools_webrtc/android/profiling/utilities.sh
similarity index 100%
rename from tools-webrtc/android/profiling/utilities.sh
rename to tools_webrtc/android/profiling/utilities.sh
diff --git a/tools-webrtc/android/suppressions.xml b/tools_webrtc/android/suppressions.xml
similarity index 100%
rename from tools-webrtc/android/suppressions.xml
rename to tools_webrtc/android/suppressions.xml
diff --git a/tools-webrtc/audio_quality/README b/tools_webrtc/audio_quality/README
similarity index 100%
rename from tools-webrtc/audio_quality/README
rename to tools_webrtc/audio_quality/README
diff --git a/tools-webrtc/audio_quality/linux/PolqaOem64.sha1 b/tools_webrtc/audio_quality/linux/PolqaOem64.sha1
similarity index 100%
rename from tools-webrtc/audio_quality/linux/PolqaOem64.sha1
rename to tools_webrtc/audio_quality/linux/PolqaOem64.sha1
diff --git a/tools-webrtc/audio_quality/linux/pesq.sha1 b/tools_webrtc/audio_quality/linux/pesq.sha1
similarity index 100%
rename from tools-webrtc/audio_quality/linux/pesq.sha1
rename to tools_webrtc/audio_quality/linux/pesq.sha1
diff --git a/tools-webrtc/audio_quality/mac/pesq.sha1 b/tools_webrtc/audio_quality/mac/pesq.sha1
similarity index 100%
rename from tools-webrtc/audio_quality/mac/pesq.sha1
rename to tools_webrtc/audio_quality/mac/pesq.sha1
diff --git a/tools-webrtc/audio_quality/win/PolqaOem64.dll.sha1 b/tools_webrtc/audio_quality/win/PolqaOem64.dll.sha1
similarity index 100%
rename from tools-webrtc/audio_quality/win/PolqaOem64.dll.sha1
rename to tools_webrtc/audio_quality/win/PolqaOem64.dll.sha1
diff --git a/tools-webrtc/audio_quality/win/PolqaOem64.exe.sha1 b/tools_webrtc/audio_quality/win/PolqaOem64.exe.sha1
similarity index 100%
rename from tools-webrtc/audio_quality/win/PolqaOem64.exe.sha1
rename to tools_webrtc/audio_quality/win/PolqaOem64.exe.sha1
diff --git a/tools-webrtc/audio_quality/win/pesq.exe.sha1 b/tools_webrtc/audio_quality/win/pesq.exe.sha1
similarity index 100%
rename from tools-webrtc/audio_quality/win/pesq.exe.sha1
rename to tools_webrtc/audio_quality/win/pesq.exe.sha1
diff --git a/tools-webrtc/audio_quality/win/vcomp120.dll.sha1 b/tools_webrtc/audio_quality/win/vcomp120.dll.sha1
similarity index 100%
rename from tools-webrtc/audio_quality/win/vcomp120.dll.sha1
rename to tools_webrtc/audio_quality/win/vcomp120.dll.sha1
diff --git a/tools-webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py
similarity index 100%
rename from tools-webrtc/autoroller/roll_deps.py
rename to tools_webrtc/autoroller/roll_deps.py
diff --git a/tools-webrtc/autoroller/unittests/roll_deps_test.py b/tools_webrtc/autoroller/unittests/roll_deps_test.py
similarity index 100%
rename from tools-webrtc/autoroller/unittests/roll_deps_test.py
rename to tools_webrtc/autoroller/unittests/roll_deps_test.py
diff --git a/tools-webrtc/autoroller/unittests/testdata/DEPS b/tools_webrtc/autoroller/unittests/testdata/DEPS
similarity index 100%
rename from tools-webrtc/autoroller/unittests/testdata/DEPS
rename to tools_webrtc/autoroller/unittests/testdata/DEPS
diff --git a/tools-webrtc/autoroller/unittests/testdata/DEPS.chromium.new b/tools_webrtc/autoroller/unittests/testdata/DEPS.chromium.new
similarity index 100%
rename from tools-webrtc/autoroller/unittests/testdata/DEPS.chromium.new
rename to tools_webrtc/autoroller/unittests/testdata/DEPS.chromium.new
diff --git a/tools-webrtc/autoroller/unittests/testdata/DEPS.chromium.old b/tools_webrtc/autoroller/unittests/testdata/DEPS.chromium.old
similarity index 100%
rename from tools-webrtc/autoroller/unittests/testdata/DEPS.chromium.old
rename to tools_webrtc/autoroller/unittests/testdata/DEPS.chromium.old
diff --git a/tools-webrtc/check_package_boundaries.py b/tools_webrtc/check_package_boundaries.py
similarity index 100%
rename from tools-webrtc/check_package_boundaries.py
rename to tools_webrtc/check_package_boundaries.py
diff --git a/tools-webrtc/check_package_boundaries_test.py b/tools_webrtc/check_package_boundaries_test.py
similarity index 100%
rename from tools-webrtc/check_package_boundaries_test.py
rename to tools_webrtc/check_package_boundaries_test.py
diff --git a/tools-webrtc/cpu/OWNERS b/tools_webrtc/cpu/OWNERS
similarity index 100%
rename from tools-webrtc/cpu/OWNERS
rename to tools_webrtc/cpu/OWNERS
diff --git a/tools-webrtc/cpu/README b/tools_webrtc/cpu/README
similarity index 100%
rename from tools-webrtc/cpu/README
rename to tools_webrtc/cpu/README
diff --git a/tools-webrtc/cpu/cpu_mon.py b/tools_webrtc/cpu/cpu_mon.py
similarity index 100%
rename from tools-webrtc/cpu/cpu_mon.py
rename to tools_webrtc/cpu/cpu_mon.py
diff --git a/tools-webrtc/download_tools.py b/tools_webrtc/download_tools.py
similarity index 100%
rename from tools-webrtc/download_tools.py
rename to tools_webrtc/download_tools.py
diff --git a/tools-webrtc/get_landmines.py b/tools_webrtc/get_landmines.py
similarity index 100%
rename from tools-webrtc/get_landmines.py
rename to tools_webrtc/get_landmines.py
diff --git a/tools-webrtc/gn_check_autofix.py b/tools_webrtc/gn_check_autofix.py
similarity index 97%
rename from tools-webrtc/gn_check_autofix.py
rename to tools_webrtc/gn_check_autofix.py
index 3c1b367..b939636 100644
--- a/tools-webrtc/gn_check_autofix.py
+++ b/tools_webrtc/gn_check_autofix.py
@@ -15,9 +15,9 @@
 check for different configurations.
 
 Usage:
-    $ python tools-webrtc/gn_check_autofix.py -m some_mater -b some_bot
+    $ python tools_webrtc/gn_check_autofix.py -m some_mater -b some_bot
     or
-    $ python tools-webrtc/gn_check_autofix.py -c some_mb_config
+    $ python tools_webrtc/gn_check_autofix.py -c some_mb_config
 """
 
 import os
diff --git a/tools-webrtc/gtest-parallel-wrapper.py b/tools_webrtc/gtest-parallel-wrapper.py
similarity index 100%
rename from tools-webrtc/gtest-parallel-wrapper.py
rename to tools_webrtc/gtest-parallel-wrapper.py
diff --git a/tools-webrtc/ios/OWNERS b/tools_webrtc/ios/OWNERS
similarity index 100%
rename from tools-webrtc/ios/OWNERS
rename to tools_webrtc/ios/OWNERS
diff --git a/tools-webrtc/ios/SDK/PodTest/PodTest/AppDelegate.h b/tools_webrtc/ios/SDK/PodTest/PodTest/AppDelegate.h
similarity index 100%
rename from tools-webrtc/ios/SDK/PodTest/PodTest/AppDelegate.h
rename to tools_webrtc/ios/SDK/PodTest/PodTest/AppDelegate.h
diff --git a/tools-webrtc/ios/SDK/PodTest/PodTest/AppDelegate.m b/tools_webrtc/ios/SDK/PodTest/PodTest/AppDelegate.m
similarity index 100%
rename from tools-webrtc/ios/SDK/PodTest/PodTest/AppDelegate.m
rename to tools_webrtc/ios/SDK/PodTest/PodTest/AppDelegate.m
diff --git a/tools-webrtc/ios/SDK/PodTest/PodTest/Assets.xcassets/AppIcon.appiconset/Contents.json b/tools_webrtc/ios/SDK/PodTest/PodTest/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from tools-webrtc/ios/SDK/PodTest/PodTest/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to tools_webrtc/ios/SDK/PodTest/PodTest/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/tools-webrtc/ios/SDK/PodTest/PodTest/Base.lproj/LaunchScreen.storyboard b/tools_webrtc/ios/SDK/PodTest/PodTest/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from tools-webrtc/ios/SDK/PodTest/PodTest/Base.lproj/LaunchScreen.storyboard
rename to tools_webrtc/ios/SDK/PodTest/PodTest/Base.lproj/LaunchScreen.storyboard
diff --git a/tools-webrtc/ios/SDK/PodTest/PodTest/Base.lproj/Main.storyboard b/tools_webrtc/ios/SDK/PodTest/PodTest/Base.lproj/Main.storyboard
similarity index 100%
rename from tools-webrtc/ios/SDK/PodTest/PodTest/Base.lproj/Main.storyboard
rename to tools_webrtc/ios/SDK/PodTest/PodTest/Base.lproj/Main.storyboard
diff --git a/tools-webrtc/ios/SDK/PodTest/PodTest/Info.plist b/tools_webrtc/ios/SDK/PodTest/PodTest/Info.plist
similarity index 100%
rename from tools-webrtc/ios/SDK/PodTest/PodTest/Info.plist
rename to tools_webrtc/ios/SDK/PodTest/PodTest/Info.plist
diff --git a/tools-webrtc/ios/SDK/PodTest/PodTest/ViewController.h b/tools_webrtc/ios/SDK/PodTest/PodTest/ViewController.h
similarity index 100%
rename from tools-webrtc/ios/SDK/PodTest/PodTest/ViewController.h
rename to tools_webrtc/ios/SDK/PodTest/PodTest/ViewController.h
diff --git a/tools-webrtc/ios/SDK/PodTest/PodTest/ViewController.m b/tools_webrtc/ios/SDK/PodTest/PodTest/ViewController.m
similarity index 100%
rename from tools-webrtc/ios/SDK/PodTest/PodTest/ViewController.m
rename to tools_webrtc/ios/SDK/PodTest/PodTest/ViewController.m
diff --git a/tools-webrtc/ios/SDK/PodTest/PodTest/main.m b/tools_webrtc/ios/SDK/PodTest/PodTest/main.m
similarity index 100%
rename from tools-webrtc/ios/SDK/PodTest/PodTest/main.m
rename to tools_webrtc/ios/SDK/PodTest/PodTest/main.m
diff --git a/tools-webrtc/ios/SDK/PodTest/Podfile b/tools_webrtc/ios/SDK/PodTest/Podfile
similarity index 100%
rename from tools-webrtc/ios/SDK/PodTest/Podfile
rename to tools_webrtc/ios/SDK/PodTest/Podfile
diff --git a/tools-webrtc/ios/build_ios_libs.py b/tools_webrtc/ios/build_ios_libs.py
similarity index 100%
rename from tools-webrtc/ios/build_ios_libs.py
rename to tools_webrtc/ios/build_ios_libs.py
diff --git a/tools-webrtc/ios/build_ios_libs.sh b/tools_webrtc/ios/build_ios_libs.sh
similarity index 100%
rename from tools-webrtc/ios/build_ios_libs.sh
rename to tools_webrtc/ios/build_ios_libs.sh
diff --git a/tools-webrtc/ios/client.webrtc/iOS32_Debug.json b/tools_webrtc/ios/client.webrtc/iOS32_Debug.json
similarity index 100%
rename from tools-webrtc/ios/client.webrtc/iOS32_Debug.json
rename to tools_webrtc/ios/client.webrtc/iOS32_Debug.json
diff --git a/tools-webrtc/ios/client.webrtc/iOS32_Release.json b/tools_webrtc/ios/client.webrtc/iOS32_Release.json
similarity index 100%
rename from tools-webrtc/ios/client.webrtc/iOS32_Release.json
rename to tools_webrtc/ios/client.webrtc/iOS32_Release.json
diff --git "a/tools-webrtc/ios/client.webrtc/iOS32_Sim_Debug_\050iOS_9.0\051.json" "b/tools_webrtc/ios/client.webrtc/iOS32_Sim_Debug_\050iOS_9.0\051.json"
similarity index 100%
rename from "tools-webrtc/ios/client.webrtc/iOS32_Sim_Debug_\050iOS_9.0\051.json"
rename to "tools_webrtc/ios/client.webrtc/iOS32_Sim_Debug_\050iOS_9.0\051.json"
diff --git a/tools-webrtc/ios/client.webrtc/iOS64_Debug.json b/tools_webrtc/ios/client.webrtc/iOS64_Debug.json
similarity index 100%
rename from tools-webrtc/ios/client.webrtc/iOS64_Debug.json
rename to tools_webrtc/ios/client.webrtc/iOS64_Debug.json
diff --git a/tools-webrtc/ios/client.webrtc/iOS64_Release.json b/tools_webrtc/ios/client.webrtc/iOS64_Release.json
similarity index 100%
rename from tools-webrtc/ios/client.webrtc/iOS64_Release.json
rename to tools_webrtc/ios/client.webrtc/iOS64_Release.json
diff --git "a/tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_\050iOS_10.0\051.json" "b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_\050iOS_10.0\051.json"
similarity index 100%
rename from "tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_\050iOS_10.0\051.json"
rename to "tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_\050iOS_10.0\051.json"
diff --git "a/tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_\050iOS_9.0\051.json" "b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_\050iOS_9.0\051.json"
similarity index 100%
rename from "tools-webrtc/ios/client.webrtc/iOS64_Sim_Debug_\050iOS_9.0\051.json"
rename to "tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_\050iOS_9.0\051.json"
diff --git a/tools-webrtc/ios/generate_licenses.py b/tools_webrtc/ios/generate_licenses.py
similarity index 100%
rename from tools-webrtc/ios/generate_licenses.py
rename to tools_webrtc/ios/generate_licenses.py
diff --git a/tools-webrtc/ios/merge_ios_libs.py b/tools_webrtc/ios/merge_ios_libs.py
similarity index 100%
rename from tools-webrtc/ios/merge_ios_libs.py
rename to tools_webrtc/ios/merge_ios_libs.py
diff --git a/tools-webrtc/ios/no_op.cc b/tools_webrtc/ios/no_op.cc
similarity index 100%
rename from tools-webrtc/ios/no_op.cc
rename to tools_webrtc/ios/no_op.cc
diff --git a/tools-webrtc/ios/objc_app.plist b/tools_webrtc/ios/objc_app.plist
similarity index 100%
rename from tools-webrtc/ios/objc_app.plist
rename to tools_webrtc/ios/objc_app.plist
diff --git a/tools-webrtc/ios/tests/common_tests.json b/tools_webrtc/ios/tests/common_tests.json
similarity index 100%
rename from tools-webrtc/ios/tests/common_tests.json
rename to tools_webrtc/ios/tests/common_tests.json
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json
similarity index 100%
rename from tools-webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json
rename to tools_webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json
similarity index 100%
rename from tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json
rename to tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json
similarity index 100%
rename from tools-webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json
rename to tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json
similarity index 100%
rename from tools-webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json
rename to tools_webrtc/ios/tryserver.webrtc/ios_arm64_dbg.json
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios_arm64_rel.json b/tools_webrtc/ios/tryserver.webrtc/ios_arm64_rel.json
similarity index 100%
rename from tools-webrtc/ios/tryserver.webrtc/ios_arm64_rel.json
rename to tools_webrtc/ios/tryserver.webrtc/ios_arm64_rel.json
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios_dbg.json
similarity index 100%
rename from tools-webrtc/ios/tryserver.webrtc/ios_dbg.json
rename to tools_webrtc/ios/tryserver.webrtc/ios_dbg.json
diff --git a/tools-webrtc/ios/tryserver.webrtc/ios_rel.json b/tools_webrtc/ios/tryserver.webrtc/ios_rel.json
similarity index 100%
rename from tools-webrtc/ios/tryserver.webrtc/ios_rel.json
rename to tools_webrtc/ios/tryserver.webrtc/ios_rel.json
diff --git a/tools-webrtc/matlab/maxUnwrap.m b/tools_webrtc/matlab/maxUnwrap.m
similarity index 100%
rename from tools-webrtc/matlab/maxUnwrap.m
rename to tools_webrtc/matlab/maxUnwrap.m
diff --git a/tools-webrtc/matlab/parseLog.m b/tools_webrtc/matlab/parseLog.m
similarity index 100%
rename from tools-webrtc/matlab/parseLog.m
rename to tools_webrtc/matlab/parseLog.m
diff --git a/tools-webrtc/matlab/rtpAnalyze.m b/tools_webrtc/matlab/rtpAnalyze.m
similarity index 100%
rename from tools-webrtc/matlab/rtpAnalyze.m
rename to tools_webrtc/matlab/rtpAnalyze.m
diff --git a/tools-webrtc/mb/OWNERS b/tools_webrtc/mb/OWNERS
similarity index 100%
rename from tools-webrtc/mb/OWNERS
rename to tools_webrtc/mb/OWNERS
diff --git a/tools-webrtc/mb/PRESUBMIT.py b/tools_webrtc/mb/PRESUBMIT.py
similarity index 100%
rename from tools-webrtc/mb/PRESUBMIT.py
rename to tools_webrtc/mb/PRESUBMIT.py
diff --git a/tools-webrtc/mb/README.md b/tools_webrtc/mb/README.md
similarity index 100%
rename from tools-webrtc/mb/README.md
rename to tools_webrtc/mb/README.md
diff --git a/tools-webrtc/mb/docs/README.md b/tools_webrtc/mb/docs/README.md
similarity index 100%
rename from tools-webrtc/mb/docs/README.md
rename to tools_webrtc/mb/docs/README.md
diff --git a/tools-webrtc/mb/docs/design_spec.md b/tools_webrtc/mb/docs/design_spec.md
similarity index 100%
rename from tools-webrtc/mb/docs/design_spec.md
rename to tools_webrtc/mb/docs/design_spec.md
diff --git a/tools-webrtc/mb/docs/user_guide.md b/tools_webrtc/mb/docs/user_guide.md
similarity index 100%
rename from tools-webrtc/mb/docs/user_guide.md
rename to tools_webrtc/mb/docs/user_guide.md
diff --git a/tools-webrtc/mb/gn_isolate_map.pyl b/tools_webrtc/mb/gn_isolate_map.pyl
similarity index 100%
rename from tools-webrtc/mb/gn_isolate_map.pyl
rename to tools_webrtc/mb/gn_isolate_map.pyl
diff --git a/tools-webrtc/mb/mb b/tools_webrtc/mb/mb
similarity index 100%
rename from tools-webrtc/mb/mb
rename to tools_webrtc/mb/mb
diff --git a/tools-webrtc/mb/mb.bat b/tools_webrtc/mb/mb.bat
similarity index 100%
rename from tools-webrtc/mb/mb.bat
rename to tools_webrtc/mb/mb.bat
diff --git a/tools-webrtc/mb/mb.py b/tools_webrtc/mb/mb.py
similarity index 99%
rename from tools-webrtc/mb/mb.py
rename to tools_webrtc/mb/mb.py
index c01d6ab..d12ba38 100755
--- a/tools-webrtc/mb/mb.py
+++ b/tools_webrtc/mb/mb.py
@@ -619,7 +619,7 @@
   def ReadIOSBotConfig(self):
     if not self.args.master or not self.args.builder:
       return {}
-    path = self.PathJoin(self.src_dir, 'tools-webrtc', 'ios',
+    path = self.PathJoin(self.src_dir, 'tools_webrtc', 'ios',
                          self.args.master,
                          self.args.builder.replace(' ', '_') + '.json')
     if not self.Exists(path):
@@ -1077,7 +1077,7 @@
       memcheck = is_linux and 'rtc_use_memcheck=true' in vals['gn_args']
       memcheck_cmdline = [
           'bash',
-          '../../tools-webrtc/valgrind/webrtc_tests.sh',
+          '../../tools_webrtc/valgrind/webrtc_tests.sh',
           '--tool',
           'memcheck',
           '--target',
@@ -1090,12 +1090,12 @@
       if not memcheck:
         extra_files += [
             '../../third_party/gtest-parallel/gtest-parallel',
-            '../../tools-webrtc/gtest-parallel-wrapper.py',
+            '../../tools_webrtc/gtest-parallel-wrapper.py',
         ]
         sep = '\\' if self.platform == 'win32' else '/'
         output_dir = '${ISOLATED_OUTDIR}' + sep + 'test_logs'
         gtest_parallel_wrapper = [
-            '../../tools-webrtc/gtest-parallel-wrapper.py',
+            '../../tools_webrtc/gtest-parallel-wrapper.py',
             '--output_dir=%s' % output_dir,
             '--gtest_color=no',
             # We tell gtest-parallel to interrupt the test after 900 seconds,
diff --git a/tools-webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
similarity index 99%
rename from tools-webrtc/mb/mb_config.pyl
rename to tools_webrtc/mb/mb_config.pyl
index 43f1590..3c16f22 100644
--- a/tools-webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -246,7 +246,7 @@
     # iOS
     # The 'ios' config is just used for auditing. iOS bots
     # use the ios recipes and look up their GN arguments via files checked in
-    # under //tools-webrtc/ios/bots. It is an error to actually use one of these
+    # under //tools_webrtc/ios/bots. It is an error to actually use one of these
     # configs to generate the build files.
     'ios': [ 'error'],
 
diff --git a/tools-webrtc/mb/mb_unittest.py b/tools_webrtc/mb/mb_unittest.py
similarity index 97%
rename from tools-webrtc/mb/mb_unittest.py
rename to tools_webrtc/mb/mb_unittest.py
index cced4eb..e9fb30b 100755
--- a/tools-webrtc/mb/mb_unittest.py
+++ b/tools_webrtc/mb/mb_unittest.py
@@ -26,7 +26,7 @@
     # Override vars for test portability.
     if win32:
       self.src_dir = 'c:\\fake_src'
-      self.default_config = 'c:\\fake_src\\tools-webrtc\\mb\\mb_config.pyl'
+      self.default_config = 'c:\\fake_src\\tools_webrtc\\mb\\mb_config.pyl'
       self.default_isolate_map = ('c:\\fake_src\\testing\\buildbot\\'
                                   'gn_isolate_map.pyl')
       self.platform = 'win32'
@@ -34,7 +34,7 @@
       self.sep = '\\'
     else:
       self.src_dir = '/fake_src'
-      self.default_config = '/fake_src/tools-webrtc/mb/mb_config.pyl'
+      self.default_config = '/fake_src/tools_webrtc/mb/mb_config.pyl'
       self.default_isolate_map = '/fake_src/testing/buildbot/gn_isolate_map.pyl'
       self.executable = '/usr/bin/python'
       self.platform = 'linux2'
@@ -442,12 +442,12 @@
     self.assertEqual(files, [
         '../../testing/test_env.py',
         '../../third_party/gtest-parallel/gtest-parallel',
-        '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '../../tools_webrtc/gtest-parallel-wrapper.py',
         'base_unittests',
     ])
     self.assertEqual(command, [
         '../../testing/test_env.py',
-        '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '../../tools_webrtc/gtest-parallel-wrapper.py',
         '--output_dir=${ISOLATED_OUTDIR}/test_logs',
         '--gtest_color=no',
         '--timeout=900',
@@ -490,13 +490,13 @@
         '../../testing/test_env.py',
         '../../testing/xvfb.py',
         '../../third_party/gtest-parallel/gtest-parallel',
-        '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '../../tools_webrtc/gtest-parallel-wrapper.py',
         'base_unittests',
         'some_resource_file',
     ])
     self.assertEqual(command, [
         '../../testing/xvfb.py',
-        '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '../../tools_webrtc/gtest-parallel-wrapper.py',
         '--output_dir=${ISOLATED_OUTDIR}/test_logs',
         '--gtest_color=no',
         '--timeout=900',
@@ -539,13 +539,13 @@
     self.assertEqual(files, [
         '../../testing/test_env.py',
         '../../third_party/gtest-parallel/gtest-parallel',
-        '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '../../tools_webrtc/gtest-parallel-wrapper.py',
         'some_dependency',
         'unittests.exe',
     ])
     self.assertEqual(command, [
         '../../testing/test_env.py',
-        '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '../../tools_webrtc/gtest-parallel-wrapper.py',
         '--output_dir=${ISOLATED_OUTDIR}\\test_logs',
         '--gtest_color=no',
         '--timeout=900',
@@ -585,12 +585,12 @@
     self.assertEqual(files, [
         '../../testing/test_env.py',
         '../../third_party/gtest-parallel/gtest-parallel',
-        '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '../../tools_webrtc/gtest-parallel-wrapper.py',
         'base_unittests',
     ])
     self.assertEqual(command, [
         '../../testing/test_env.py',
-        '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '../../tools_webrtc/gtest-parallel-wrapper.py',
         '--output_dir=${ISOLATED_OUTDIR}/test_logs',
         '--gtest_color=no',
         '--timeout=900',
@@ -615,7 +615,7 @@
       '/fake_src/out/Release/base_unittests.runtime_deps': (
           "base_unittests\n"
           "lots_of_memcheck_dependencies\n"
-          "../../tools-webrtc/valgrind/webrtc_tests.sh\n"
+          "../../tools_webrtc/valgrind/webrtc_tests.sh\n"
       ),
     }
     mbw = self.check(['gen', '-c', 'gn_memcheck_bot', '//out/Release',
@@ -631,14 +631,14 @@
 
     self.assertEqual(files, [
         '../../testing/test_env.py',
-        '../../tools-webrtc/valgrind/webrtc_tests.sh',
+        '../../tools_webrtc/valgrind/webrtc_tests.sh',
         'base_unittests',
         'lots_of_memcheck_dependencies',
     ])
     self.assertEqual(command, [
         '../../testing/test_env.py',
         'bash',
-        '../../tools-webrtc/valgrind/webrtc_tests.sh',
+        '../../tools_webrtc/valgrind/webrtc_tests.sh',
         '--tool',
         'memcheck',
         '--target',
diff --git a/tools-webrtc/msan/OWNERS b/tools_webrtc/msan/OWNERS
similarity index 100%
rename from tools-webrtc/msan/OWNERS
rename to tools_webrtc/msan/OWNERS
diff --git a/tools-webrtc/msan/blacklist.txt b/tools_webrtc/msan/blacklist.txt
similarity index 100%
rename from tools-webrtc/msan/blacklist.txt
rename to tools_webrtc/msan/blacklist.txt
diff --git a/tools-webrtc/network_emulator/config.py b/tools_webrtc/network_emulator/config.py
similarity index 100%
rename from tools-webrtc/network_emulator/config.py
rename to tools_webrtc/network_emulator/config.py
diff --git a/tools-webrtc/network_emulator/emulate.py b/tools_webrtc/network_emulator/emulate.py
similarity index 100%
rename from tools-webrtc/network_emulator/emulate.py
rename to tools_webrtc/network_emulator/emulate.py
diff --git a/tools-webrtc/network_emulator/network_emulator.py b/tools_webrtc/network_emulator/network_emulator.py
similarity index 100%
rename from tools-webrtc/network_emulator/network_emulator.py
rename to tools_webrtc/network_emulator/network_emulator.py
diff --git a/tools-webrtc/sancov/README b/tools_webrtc/sancov/README
similarity index 100%
rename from tools-webrtc/sancov/README
rename to tools_webrtc/sancov/README
diff --git a/tools-webrtc/sancov/blacklist.txt b/tools_webrtc/sancov/blacklist.txt
similarity index 100%
rename from tools-webrtc/sancov/blacklist.txt
rename to tools_webrtc/sancov/blacklist.txt
diff --git a/tools-webrtc/sanitizers/OWNERS b/tools_webrtc/sanitizers/OWNERS
similarity index 100%
rename from tools-webrtc/sanitizers/OWNERS
rename to tools_webrtc/sanitizers/OWNERS
diff --git a/tools-webrtc/sanitizers/README b/tools_webrtc/sanitizers/README
similarity index 100%
rename from tools-webrtc/sanitizers/README
rename to tools_webrtc/sanitizers/README
diff --git a/tools-webrtc/sanitizers/lsan_suppressions_webrtc.cc b/tools_webrtc/sanitizers/lsan_suppressions_webrtc.cc
similarity index 100%
rename from tools-webrtc/sanitizers/lsan_suppressions_webrtc.cc
rename to tools_webrtc/sanitizers/lsan_suppressions_webrtc.cc
diff --git a/tools-webrtc/sanitizers/tsan_suppressions_webrtc.cc b/tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc
similarity index 100%
rename from tools-webrtc/sanitizers/tsan_suppressions_webrtc.cc
rename to tools_webrtc/sanitizers/tsan_suppressions_webrtc.cc
diff --git a/tools-webrtc/sslroots/generate_sslroots.py b/tools_webrtc/sslroots/generate_sslroots.py
similarity index 100%
rename from tools-webrtc/sslroots/generate_sslroots.py
rename to tools_webrtc/sslroots/generate_sslroots.py
diff --git a/tools-webrtc/testdata/all_build_files/BUILD.gn b/tools_webrtc/testdata/all_build_files/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/all_build_files/BUILD.gn
rename to tools_webrtc/testdata/all_build_files/BUILD.gn
diff --git a/tools-webrtc/testdata/all_build_files/expected.pyl b/tools_webrtc/testdata/all_build_files/expected.pyl
similarity index 100%
rename from tools-webrtc/testdata/all_build_files/expected.pyl
rename to tools_webrtc/testdata/all_build_files/expected.pyl
diff --git a/tools-webrtc/testdata/all_build_files/subpackage1/BUILD.gn b/tools_webrtc/testdata/all_build_files/subpackage1/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/all_build_files/subpackage1/BUILD.gn
rename to tools_webrtc/testdata/all_build_files/subpackage1/BUILD.gn
diff --git a/tools-webrtc/testdata/all_build_files/subpackage1/subsubpackage1/BUILD.gn b/tools_webrtc/testdata/all_build_files/subpackage1/subsubpackage1/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/all_build_files/subpackage1/subsubpackage1/BUILD.gn
rename to tools_webrtc/testdata/all_build_files/subpackage1/subsubpackage1/BUILD.gn
diff --git a/tools-webrtc/testdata/all_build_files/subpackage2/BUILD.gn b/tools_webrtc/testdata/all_build_files/subpackage2/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/all_build_files/subpackage2/BUILD.gn
rename to tools_webrtc/testdata/all_build_files/subpackage2/BUILD.gn
diff --git a/tools-webrtc/testdata/all_build_files/subpackage2/subsubpackage2/BUILD.gn b/tools_webrtc/testdata/all_build_files/subpackage2/subsubpackage2/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/all_build_files/subpackage2/subsubpackage2/BUILD.gn
rename to tools_webrtc/testdata/all_build_files/subpackage2/subsubpackage2/BUILD.gn
diff --git a/tools-webrtc/testdata/common_prefix/BUILD.gn b/tools_webrtc/testdata/common_prefix/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/common_prefix/BUILD.gn
rename to tools_webrtc/testdata/common_prefix/BUILD.gn
diff --git a/tools-webrtc/testdata/common_prefix/call/BUILD.gn b/tools_webrtc/testdata/common_prefix/call/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/common_prefix/call/BUILD.gn
rename to tools_webrtc/testdata/common_prefix/call/BUILD.gn
diff --git a/tools-webrtc/testdata/common_prefix/expected.pyl b/tools_webrtc/testdata/common_prefix/expected.pyl
similarity index 100%
rename from tools-webrtc/testdata/common_prefix/expected.pyl
rename to tools_webrtc/testdata/common_prefix/expected.pyl
diff --git a/tools-webrtc/testdata/multiple_errors_multiple_targets/BUILD.gn b/tools_webrtc/testdata/multiple_errors_multiple_targets/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/multiple_errors_multiple_targets/BUILD.gn
rename to tools_webrtc/testdata/multiple_errors_multiple_targets/BUILD.gn
diff --git a/tools-webrtc/testdata/multiple_errors_multiple_targets/expected.pyl b/tools_webrtc/testdata/multiple_errors_multiple_targets/expected.pyl
similarity index 100%
rename from tools-webrtc/testdata/multiple_errors_multiple_targets/expected.pyl
rename to tools_webrtc/testdata/multiple_errors_multiple_targets/expected.pyl
diff --git a/tools-webrtc/testdata/multiple_errors_multiple_targets/subpackage1/BUILD.gn b/tools_webrtc/testdata/multiple_errors_multiple_targets/subpackage1/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/multiple_errors_multiple_targets/subpackage1/BUILD.gn
rename to tools_webrtc/testdata/multiple_errors_multiple_targets/subpackage1/BUILD.gn
diff --git a/tools-webrtc/testdata/multiple_errors_multiple_targets/subpackage2/BUILD.gn b/tools_webrtc/testdata/multiple_errors_multiple_targets/subpackage2/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/multiple_errors_multiple_targets/subpackage2/BUILD.gn
rename to tools_webrtc/testdata/multiple_errors_multiple_targets/subpackage2/BUILD.gn
diff --git a/tools-webrtc/testdata/multiple_errors_single_target/BUILD.gn b/tools_webrtc/testdata/multiple_errors_single_target/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/multiple_errors_single_target/BUILD.gn
rename to tools_webrtc/testdata/multiple_errors_single_target/BUILD.gn
diff --git a/tools-webrtc/testdata/multiple_errors_single_target/expected.pyl b/tools_webrtc/testdata/multiple_errors_single_target/expected.pyl
similarity index 100%
rename from tools-webrtc/testdata/multiple_errors_single_target/expected.pyl
rename to tools_webrtc/testdata/multiple_errors_single_target/expected.pyl
diff --git a/tools-webrtc/testdata/multiple_errors_single_target/subpackage/BUILD.gn b/tools_webrtc/testdata/multiple_errors_single_target/subpackage/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/multiple_errors_single_target/subpackage/BUILD.gn
rename to tools_webrtc/testdata/multiple_errors_single_target/subpackage/BUILD.gn
diff --git a/tools-webrtc/testdata/no_errors/BUILD.gn b/tools_webrtc/testdata/no_errors/BUILD.gn
similarity index 100%
rename from tools-webrtc/testdata/no_errors/BUILD.gn
rename to tools_webrtc/testdata/no_errors/BUILD.gn
diff --git a/tools-webrtc/testdata/no_errors/expected.pyl b/tools_webrtc/testdata/no_errors/expected.pyl
similarity index 100%
rename from tools-webrtc/testdata/no_errors/expected.pyl
rename to tools_webrtc/testdata/no_errors/expected.pyl
diff --git a/tools-webrtc/ubsan/OWNERS b/tools_webrtc/ubsan/OWNERS
similarity index 100%
rename from tools-webrtc/ubsan/OWNERS
rename to tools_webrtc/ubsan/OWNERS
diff --git a/tools-webrtc/ubsan/blacklist.txt b/tools_webrtc/ubsan/blacklist.txt
similarity index 100%
rename from tools-webrtc/ubsan/blacklist.txt
rename to tools_webrtc/ubsan/blacklist.txt
diff --git a/tools-webrtc/ubsan/vptr_blacklist.txt b/tools_webrtc/ubsan/vptr_blacklist.txt
similarity index 100%
rename from tools-webrtc/ubsan/vptr_blacklist.txt
rename to tools_webrtc/ubsan/vptr_blacklist.txt
diff --git a/tools-webrtc/valgrind/gtest_exclude/OWNERS b/tools_webrtc/valgrind/gtest_exclude/OWNERS
similarity index 100%
rename from tools-webrtc/valgrind/gtest_exclude/OWNERS
rename to tools_webrtc/valgrind/gtest_exclude/OWNERS
diff --git a/tools-webrtc/valgrind/gtest_exclude/modules_tests.gtest-memcheck.txt b/tools_webrtc/valgrind/gtest_exclude/modules_tests.gtest-memcheck.txt
similarity index 100%
rename from tools-webrtc/valgrind/gtest_exclude/modules_tests.gtest-memcheck.txt
rename to tools_webrtc/valgrind/gtest_exclude/modules_tests.gtest-memcheck.txt
diff --git a/tools-webrtc/valgrind/gtest_exclude/modules_unittests.gtest-memcheck.txt b/tools_webrtc/valgrind/gtest_exclude/modules_unittests.gtest-memcheck.txt
similarity index 100%
rename from tools-webrtc/valgrind/gtest_exclude/modules_unittests.gtest-memcheck.txt
rename to tools_webrtc/valgrind/gtest_exclude/modules_unittests.gtest-memcheck.txt
diff --git a/tools-webrtc/valgrind/gtest_exclude/ortc_unittests.gtest-memcheck.txt b/tools_webrtc/valgrind/gtest_exclude/ortc_unittests.gtest-memcheck.txt
similarity index 100%
rename from tools-webrtc/valgrind/gtest_exclude/ortc_unittests.gtest-memcheck.txt
rename to tools_webrtc/valgrind/gtest_exclude/ortc_unittests.gtest-memcheck.txt
diff --git a/tools-webrtc/valgrind/gtest_exclude/peerconnection_unittests.gtest-memcheck.txt b/tools_webrtc/valgrind/gtest_exclude/peerconnection_unittests.gtest-memcheck.txt
similarity index 100%
rename from tools-webrtc/valgrind/gtest_exclude/peerconnection_unittests.gtest-memcheck.txt
rename to tools_webrtc/valgrind/gtest_exclude/peerconnection_unittests.gtest-memcheck.txt
diff --git a/tools-webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck.txt b/tools_webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck.txt
similarity index 100%
rename from tools-webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck.txt
rename to tools_webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck.txt
diff --git a/tools-webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck_mac.txt b/tools_webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck_mac.txt
similarity index 100%
rename from tools-webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck_mac.txt
rename to tools_webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck_mac.txt
diff --git a/tools-webrtc/valgrind/gtest_exclude/rtc_pc_unittests.gtest-memcheck.txt b/tools_webrtc/valgrind/gtest_exclude/rtc_pc_unittests.gtest-memcheck.txt
similarity index 100%
rename from tools-webrtc/valgrind/gtest_exclude/rtc_pc_unittests.gtest-memcheck.txt
rename to tools_webrtc/valgrind/gtest_exclude/rtc_pc_unittests.gtest-memcheck.txt
diff --git a/tools-webrtc/valgrind/gtest_exclude/rtc_unittests.gtest-memcheck.txt b/tools_webrtc/valgrind/gtest_exclude/rtc_unittests.gtest-memcheck.txt
similarity index 100%
rename from tools-webrtc/valgrind/gtest_exclude/rtc_unittests.gtest-memcheck.txt
rename to tools_webrtc/valgrind/gtest_exclude/rtc_unittests.gtest-memcheck.txt
diff --git a/tools-webrtc/valgrind/gtest_exclude/video_engine_tests.gtest-memcheck.txt b/tools_webrtc/valgrind/gtest_exclude/video_engine_tests.gtest-memcheck.txt
similarity index 100%
rename from tools-webrtc/valgrind/gtest_exclude/video_engine_tests.gtest-memcheck.txt
rename to tools_webrtc/valgrind/gtest_exclude/video_engine_tests.gtest-memcheck.txt
diff --git a/tools-webrtc/valgrind/gtest_exclude/webrtc_nonparallel_tests.gtest-memcheck.txt b/tools_webrtc/valgrind/gtest_exclude/webrtc_nonparallel_tests.gtest-memcheck.txt
similarity index 100%
rename from tools-webrtc/valgrind/gtest_exclude/webrtc_nonparallel_tests.gtest-memcheck.txt
rename to tools_webrtc/valgrind/gtest_exclude/webrtc_nonparallel_tests.gtest-memcheck.txt
diff --git a/tools-webrtc/valgrind/memcheck/OWNERS b/tools_webrtc/valgrind/memcheck/OWNERS
similarity index 100%
rename from tools-webrtc/valgrind/memcheck/OWNERS
rename to tools_webrtc/valgrind/memcheck/OWNERS
diff --git a/tools-webrtc/valgrind/memcheck/PRESUBMIT.py b/tools_webrtc/valgrind/memcheck/PRESUBMIT.py
similarity index 100%
rename from tools-webrtc/valgrind/memcheck/PRESUBMIT.py
rename to tools_webrtc/valgrind/memcheck/PRESUBMIT.py
diff --git a/tools-webrtc/valgrind/memcheck/suppressions.txt b/tools_webrtc/valgrind/memcheck/suppressions.txt
similarity index 100%
rename from tools-webrtc/valgrind/memcheck/suppressions.txt
rename to tools_webrtc/valgrind/memcheck/suppressions.txt
diff --git a/tools-webrtc/valgrind/memcheck/suppressions_mac.txt b/tools_webrtc/valgrind/memcheck/suppressions_mac.txt
similarity index 100%
rename from tools-webrtc/valgrind/memcheck/suppressions_mac.txt
rename to tools_webrtc/valgrind/memcheck/suppressions_mac.txt
diff --git a/tools-webrtc/valgrind/memcheck/suppressions_win32.txt b/tools_webrtc/valgrind/memcheck/suppressions_win32.txt
similarity index 100%
rename from tools-webrtc/valgrind/memcheck/suppressions_win32.txt
rename to tools_webrtc/valgrind/memcheck/suppressions_win32.txt
diff --git a/tools-webrtc/valgrind/python-google.gni b/tools_webrtc/valgrind/python-google.gni
similarity index 100%
rename from tools-webrtc/valgrind/python-google.gni
rename to tools_webrtc/valgrind/python-google.gni
diff --git a/tools-webrtc/valgrind/valgrind-binaries.gni b/tools_webrtc/valgrind/valgrind-binaries.gni
similarity index 100%
rename from tools-webrtc/valgrind/valgrind-binaries.gni
rename to tools_webrtc/valgrind/valgrind-binaries.gni
diff --git a/tools-webrtc/valgrind/valgrind-webrtc.gni b/tools_webrtc/valgrind/valgrind-webrtc.gni
similarity index 61%
rename from tools-webrtc/valgrind/valgrind-webrtc.gni
rename to tools_webrtc/valgrind/valgrind-webrtc.gni
index cf9f2a8..02802de 100644
--- a/tools-webrtc/valgrind/valgrind-webrtc.gni
+++ b/tools_webrtc/valgrind/valgrind-webrtc.gni
@@ -15,20 +15,20 @@
 import("valgrind.gni")
 
 valgrind_webrtc_dependencies = [
-                                 "../../tools-webrtc/valgrind/gtest_exclude/modules_tests.gtest-memcheck.txt",
-                                 "../../tools-webrtc/valgrind/gtest_exclude/modules_unittests.gtest-memcheck.txt",
-                                 "../../tools-webrtc/valgrind/gtest_exclude/ortc_unittests.gtest-memcheck.txt",
-                                 "../../tools-webrtc/valgrind/gtest_exclude/peerconnection_unittests.gtest-memcheck.txt",
-                                 "../../tools-webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck.txt",
-                                 "../../tools-webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck_mac.txt",
-                                 "../../tools-webrtc/valgrind/gtest_exclude/rtc_pc_unittests.gtest-memcheck.txt",
-                                 "../../tools-webrtc/valgrind/gtest_exclude/rtc_unittests.gtest-memcheck.txt",
-                                 "../../tools-webrtc/valgrind/gtest_exclude/video_engine_tests.gtest-memcheck.txt",
-                                 "../../tools-webrtc/valgrind/gtest_exclude/webrtc_nonparallel_tests.gtest-memcheck.txt",
-                                 "../../tools-webrtc/valgrind/memcheck/suppressions.txt",
-                                 "../../tools-webrtc/valgrind/memcheck/suppressions_mac.txt",
-                                 "../../tools-webrtc/valgrind/memcheck/suppressions_win32.txt",
-                                 "../../tools-webrtc/valgrind/webrtc_tests.py",
-                                 "../../tools-webrtc/valgrind/webrtc_tests.sh",
+                                 "../../tools_webrtc/valgrind/gtest_exclude/modules_tests.gtest-memcheck.txt",
+                                 "../../tools_webrtc/valgrind/gtest_exclude/modules_unittests.gtest-memcheck.txt",
+                                 "../../tools_webrtc/valgrind/gtest_exclude/ortc_unittests.gtest-memcheck.txt",
+                                 "../../tools_webrtc/valgrind/gtest_exclude/peerconnection_unittests.gtest-memcheck.txt",
+                                 "../../tools_webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck.txt",
+                                 "../../tools_webrtc/valgrind/gtest_exclude/rtc_media_unittests.gtest-memcheck_mac.txt",
+                                 "../../tools_webrtc/valgrind/gtest_exclude/rtc_pc_unittests.gtest-memcheck.txt",
+                                 "../../tools_webrtc/valgrind/gtest_exclude/rtc_unittests.gtest-memcheck.txt",
+                                 "../../tools_webrtc/valgrind/gtest_exclude/video_engine_tests.gtest-memcheck.txt",
+                                 "../../tools_webrtc/valgrind/gtest_exclude/webrtc_nonparallel_tests.gtest-memcheck.txt",
+                                 "../../tools_webrtc/valgrind/memcheck/suppressions.txt",
+                                 "../../tools_webrtc/valgrind/memcheck/suppressions_mac.txt",
+                                 "../../tools_webrtc/valgrind/memcheck/suppressions_win32.txt",
+                                 "../../tools_webrtc/valgrind/webrtc_tests.py",
+                                 "../../tools_webrtc/valgrind/webrtc_tests.sh",
                                ] + valgrind_dependencies + valgrind_binaries +
                                python_google
diff --git a/tools-webrtc/valgrind/valgrind.gni b/tools_webrtc/valgrind/valgrind.gni
similarity index 100%
rename from tools-webrtc/valgrind/valgrind.gni
rename to tools_webrtc/valgrind/valgrind.gni
diff --git a/tools-webrtc/valgrind/webrtc_tests.py b/tools_webrtc/valgrind/webrtc_tests.py
similarity index 100%
rename from tools-webrtc/valgrind/webrtc_tests.py
rename to tools_webrtc/valgrind/webrtc_tests.py
diff --git a/tools-webrtc/valgrind/webrtc_tests.sh b/tools_webrtc/valgrind/webrtc_tests.sh
similarity index 96%
rename from tools-webrtc/valgrind/webrtc_tests.sh
rename to tools_webrtc/valgrind/webrtc_tests.sh
index d7708ff..57884a6 100755
--- a/tools-webrtc/valgrind/webrtc_tests.sh
+++ b/tools_webrtc/valgrind/webrtc_tests.sh
@@ -24,9 +24,9 @@
 ARGV_COPY="$@"
 
 # We need to set CHROME_VALGRIND iff using Memcheck:
-#   tools-webrtc/valgrind/webrtc_tests.sh --tool memcheck
+#   tools_webrtc/valgrind/webrtc_tests.sh --tool memcheck
 # or
-#   tools-webrtc/valgrind/webrtc_tests.sh --tool=memcheck
+#   tools_webrtc/valgrind/webrtc_tests.sh --tool=memcheck
 tool="memcheck"  # Default to memcheck.
 while (( "$#" ))
 do
diff --git a/tools-webrtc/video_quality_toolchain/README b/tools_webrtc/video_quality_toolchain/README
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/README
rename to tools_webrtc/video_quality_toolchain/README
diff --git a/tools-webrtc/video_quality_toolchain/linux/ffmpeg.sha1 b/tools_webrtc/video_quality_toolchain/linux/ffmpeg.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/linux/ffmpeg.sha1
rename to tools_webrtc/video_quality_toolchain/linux/ffmpeg.sha1
diff --git a/tools-webrtc/video_quality_toolchain/linux/zxing.sha1 b/tools_webrtc/video_quality_toolchain/linux/zxing.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/linux/zxing.sha1
rename to tools_webrtc/video_quality_toolchain/linux/zxing.sha1
diff --git a/tools-webrtc/video_quality_toolchain/mac/ffmpeg.sha1 b/tools_webrtc/video_quality_toolchain/mac/ffmpeg.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/mac/ffmpeg.sha1
rename to tools_webrtc/video_quality_toolchain/mac/ffmpeg.sha1
diff --git a/tools-webrtc/video_quality_toolchain/mac/zxing.sha1 b/tools_webrtc/video_quality_toolchain/mac/zxing.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/mac/zxing.sha1
rename to tools_webrtc/video_quality_toolchain/mac/zxing.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygEMF-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygEMF-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygEMF-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygEMF-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygICE-6.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygICE-6.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygICE-6.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygICE-6.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygMagick++-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygMagick++-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygMagick++-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygMagick++-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygMagick++-5.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygMagick++-5.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygMagick++-5.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygMagick++-5.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygMagickCore-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygMagickCore-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygMagickCore-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygMagickCore-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygMagickCore-5.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygMagickCore-5.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygMagickCore-5.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygMagickCore-5.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygMagickWand-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygMagickWand-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygMagickWand-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygMagickWand-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygMagickWand-5.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygMagickWand-5.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygMagickWand-5.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygMagickWand-5.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygSM-6.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygSM-6.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygSM-6.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygSM-6.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygX11-6.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygX11-6.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygX11-6.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygX11-6.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygXau-6.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygXau-6.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygXau-6.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygXau-6.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygXaw-7.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygXaw-7.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygXaw-7.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygXaw-7.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygXdmcp-6.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygXdmcp-6.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygXdmcp-6.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygXdmcp-6.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygXext-6.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygXext-6.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygXext-6.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygXext-6.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygXft-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygXft-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygXft-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygXft-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygXmu-6.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygXmu-6.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygXmu-6.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygXmu-6.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygXpm-4.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygXpm-4.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygXpm-4.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygXpm-4.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygXrender-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygXrender-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygXrender-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygXrender-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygXt-6.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygXt-6.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygXt-6.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygXt-6.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygattr-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygattr-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygattr-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygattr-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygautotrace-3.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygautotrace-3.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygautotrace-3.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygautotrace-3.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygbz2-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygbz2-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygbz2-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygbz2-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygcairo-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygcairo-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygcairo-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygcairo-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygcairo-gobject-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygcairo-gobject-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygcairo-gobject-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygcairo-gobject-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygcairo-script-interpreter-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygcairo-script-interpreter-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygcairo-script-interpreter-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygcairo-script-interpreter-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygcharset-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygcharset-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygcharset-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygcharset-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygcroco-0.6-3.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygcroco-0.6-3.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygcroco-0.6-3.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygcroco-0.6-3.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygcrypt-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygcrypt-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygcrypt-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygcrypt-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygcrypto-0.9.8.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygcrypto-0.9.8.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygcrypto-0.9.8.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygcrypto-0.9.8.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygcrypto-1.0.0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygcrypto-1.0.0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygcrypto-1.0.0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygcrypto-1.0.0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygdatrie-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygdatrie-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygdatrie-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygdatrie-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygdb-4.5.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygdb-4.5.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygdb-4.5.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygdb-4.5.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygdb_cxx-4.5.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygdb_cxx-4.5.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygdb_cxx-4.5.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygdb_cxx-4.5.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygdbus-1-3.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygdbus-1-3.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygdbus-1-3.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygdbus-1-3.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygexpat-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygexpat-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygexpat-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygexpat-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygfam-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygfam-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygfam-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygfam-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygffi-4.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygffi-4.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygffi-4.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygffi-4.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygfftw3-3.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygfftw3-3.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygfftw3-3.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygfftw3-3.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygfftw3_threads-3.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygfftw3_threads-3.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygfftw3_threads-3.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygfftw3_threads-3.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygfftw3f-3.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygfftw3f-3.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygfftw3f-3.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygfftw3f-3.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygfftw3f_threads-3.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygfftw3f_threads-3.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygfftw3f_threads-3.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygfftw3f_threads-3.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygfontconfig-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygfontconfig-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygfontconfig-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygfontconfig-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygform-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygform-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygform-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygform-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygformw-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygformw-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygformw-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygformw-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygfpx-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygfpx-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygfpx-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygfpx-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygfreetype-6.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygfreetype-6.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygfreetype-6.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygfreetype-6.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggcc_s-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggcc_s-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggcc_s-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggcc_s-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggd-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggd-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggd-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggd-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggdbm-4.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggdbm-4.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggdbm-4.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggdbm-4.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggdbm_compat-4.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggdbm_compat-4.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggdbm_compat-4.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggdbm_compat-4.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggdk_pixbuf-2.0-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggdk_pixbuf-2.0-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggdk_pixbuf-2.0-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggdk_pixbuf-2.0-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggif-4.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggif-4.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggif-4.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggif-4.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggio-2.0-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggio-2.0-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggio-2.0-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggio-2.0-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygglib-2.0-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygglib-2.0-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygglib-2.0-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygglib-2.0-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggmodule-2.0-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggmodule-2.0-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggmodule-2.0-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggmodule-2.0-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggmp-3.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggmp-3.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggmp-3.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggmp-3.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggobject-2.0-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggobject-2.0-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggobject-2.0-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggobject-2.0-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggomp-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggomp-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggomp-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggomp-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggraphite2-3.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggraphite2-3.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggraphite2-3.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggraphite2-3.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggs-9.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggs-9.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggs-9.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggs-9.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyggthread-2.0-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyggthread-2.0-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyggthread-2.0-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyggthread-2.0-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygharfbuzz-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygharfbuzz-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygharfbuzz-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygharfbuzz-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyghistory7.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyghistory7.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyghistory7.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyghistory7.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicons-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicons-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicons-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicons-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygiconv-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygiconv-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygiconv-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygiconv-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicudata.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicudata.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicudata.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicudata.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicudata48.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicudata48.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicudata48.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicudata48.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicui18n.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicui18n.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicui18n.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicui18n.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicui18n48.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicui18n48.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicui18n48.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicui18n48.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicuio.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicuio.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicuio.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicuio.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicuio48.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicuio48.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicuio48.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicuio48.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicule.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicule.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicule.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicule.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicule48.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicule48.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicule48.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicule48.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygiculx.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygiculx.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygiculx.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygiculx.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygiculx48.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygiculx48.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygiculx48.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygiculx48.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicutest.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicutest.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicutest.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicutest.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicutest48.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicutest48.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicutest48.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicutest48.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicuuc.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicuuc.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicuuc.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicuuc.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygicuuc48.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygicuuc48.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygicuuc48.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygicuuc48.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygidn-11.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygidn-11.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygidn-11.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygidn-11.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygintl-3.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygintl-3.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygintl-3.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygintl-3.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygintl-8.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygintl-8.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygintl-8.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygintl-8.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygjasper-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygjasper-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygjasper-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygjasper-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygjbig-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygjbig-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygjbig-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygjbig-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygjpeg-7.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygjpeg-7.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygjpeg-7.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygjpeg-7.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygjpeg-8.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygjpeg-8.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygjpeg-8.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygjpeg-8.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyglcms-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyglcms-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyglcms-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyglcms-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyglcms2-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyglcms2-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyglcms2-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyglcms2-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyglsa.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyglsa.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyglsa.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyglsa.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyglsa64.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyglsa64.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyglsa64.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyglsa64.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygltdl-7.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygltdl-7.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygltdl-7.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygltdl-7.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyglzma-5.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyglzma-5.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyglzma-5.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyglzma-5.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygmagic-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygmagic-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygmagic-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygmagic-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygmenu-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygmenu-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygmenu-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygmenu-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygmenuw-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygmenuw-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygmenuw-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygmenuw-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygming-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygming-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygming-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygming-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygmp-3.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygmp-3.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygmp-3.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygmp-3.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygncurses++-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygncurses++-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygncurses++-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygncurses++-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygncurses++w-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygncurses++w-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygncurses++w-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygncurses++w-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygncurses-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygncurses-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygncurses-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygncurses-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygncursesw-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygncursesw-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygncursesw-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygncursesw-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpanel-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpanel-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpanel-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpanel-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpanelw-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpanelw-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpanelw-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpanelw-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpango-1.0-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpango-1.0-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpango-1.0-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpango-1.0-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpangocairo-1.0-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpangocairo-1.0-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpangocairo-1.0-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpangocairo-1.0-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpangoft2-1.0-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpangoft2-1.0-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpangoft2-1.0-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpangoft2-1.0-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpangoxft-1.0-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpangoxft-1.0-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpangoxft-1.0-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpangoxft-1.0-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpaper-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpaper-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpaper-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpaper-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpcre-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpcre-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpcre-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpcre-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpcre-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpcre-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpcre-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpcre-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygperl5_14.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygperl5_14.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygperl5_14.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygperl5_14.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpixman-1-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpixman-1-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpixman-1-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpixman-1-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygplotter-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygplotter-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygplotter-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygplotter-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpng12.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpng12.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpng12.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpng12.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpng14-14.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpng14-14.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpng14-14.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpng14-14.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpng15-15.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpng15-15.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpng15-15.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpng15-15.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpopt-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpopt-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpopt-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpopt-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygpstoedit-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygpstoedit-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygpstoedit-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygpstoedit-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygreadline7.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygreadline7.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygreadline7.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygreadline7.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygrsvg-2-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygrsvg-2-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygrsvg-2-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygrsvg-2-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygsigsegv-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygsigsegv-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygsigsegv-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygsigsegv-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygsqlite3-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygsqlite3-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygsqlite3-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygsqlite3-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygssl-0.9.8.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygssl-0.9.8.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygssl-0.9.8.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygssl-0.9.8.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygssl-1.0.0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygssl-1.0.0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygssl-1.0.0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygssl-1.0.0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygssp-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygssp-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygssp-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygssp-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygstdc++-6.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygstdc++-6.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygstdc++-6.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygstdc++-6.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygthai-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygthai-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygthai-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygthai-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygtic-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygtic-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygtic-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygtic-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygticw-10.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygticw-10.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygticw-10.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygticw-10.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygtiff-5.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygtiff-5.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygtiff-5.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygtiff-5.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygtiffxx-5.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygtiffxx-5.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygtiffxx-5.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygtiffxx-5.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cyguuid-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cyguuid-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cyguuid-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cyguuid-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygwin1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygwin1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygwin1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygwin1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygxcb-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygxcb-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygxcb-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygxcb-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygxcb-render-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygxcb-render-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygxcb-render-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygxcb-render-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygxcb-shm-0.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygxcb-shm-0.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygxcb-shm-0.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygxcb-shm-0.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygxml2-2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygxml2-2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygxml2-2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygxml2-2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/cygz.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/cygz.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/cygz.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/cygz.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/ffmpeg.exe.sha1 b/tools_webrtc/video_quality_toolchain/win/ffmpeg.exe.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/ffmpeg.exe.sha1
rename to tools_webrtc/video_quality_toolchain/win/ffmpeg.exe.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/libgomp-1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/libgomp-1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/libgomp-1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/libgomp-1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/pthreadgc2.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/pthreadgc2.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/pthreadgc2.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/pthreadgc2.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/zlib1.dll.sha1 b/tools_webrtc/video_quality_toolchain/win/zlib1.dll.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/zlib1.dll.sha1
rename to tools_webrtc/video_quality_toolchain/win/zlib1.dll.sha1
diff --git a/tools-webrtc/video_quality_toolchain/win/zxing.exe.sha1 b/tools_webrtc/video_quality_toolchain/win/zxing.exe.sha1
similarity index 100%
rename from tools-webrtc/video_quality_toolchain/win/zxing.exe.sha1
rename to tools_webrtc/video_quality_toolchain/win/zxing.exe.sha1
diff --git a/tools-webrtc/vim/webrtc.ycm_extra_conf.py b/tools_webrtc/vim/webrtc.ycm_extra_conf.py
similarity index 99%
rename from tools-webrtc/vim/webrtc.ycm_extra_conf.py
rename to tools_webrtc/vim/webrtc.ycm_extra_conf.py
index e954639..fcc38fe 100644
--- a/tools-webrtc/vim/webrtc.ycm_extra_conf.py
+++ b/tools_webrtc/vim/webrtc.ycm_extra_conf.py
@@ -18,7 +18,7 @@
 #      directory above your WebRTC checkout (i.e. next to your .gclient file).
 #
 #          cd src
-#          ln -rs tools-webrtc/vim/webrtc.ycm_extra_conf.py \
+#          ln -rs tools_webrtc/vim/webrtc.ycm_extra_conf.py \
 #          ../.ycm_extra_conf.py
 #
 #   3. (optional) Whitelist the .ycm_extra_conf.py from step #2 by adding the
diff --git a/tools-webrtc/whitespace.txt b/tools_webrtc/whitespace.txt
similarity index 100%
rename from tools-webrtc/whitespace.txt
rename to tools_webrtc/whitespace.txt
diff --git a/webrtc/audio/test/low_bandwidth_audio_test.py b/webrtc/audio/test/low_bandwidth_audio_test.py
index 8815daa..3606e68 100755
--- a/webrtc/audio/test/low_bandwidth_audio_test.py
+++ b/webrtc/audio/test/low_bandwidth_audio_test.py
@@ -57,7 +57,7 @@
 
 
 def _DownloadTools():
-  tools_dir = os.path.join(SRC_DIR, 'tools-webrtc')
+  tools_dir = os.path.join(SRC_DIR, 'tools_webrtc')
   toolchain_dir = os.path.join(tools_dir, 'audio_quality')
 
   # Download PESQ and POLQA.
diff --git a/webrtc/examples/androidtests/video_quality_loopback_test.py b/webrtc/examples/androidtests/video_quality_loopback_test.py
index a62d31c..2500057 100755
--- a/webrtc/examples/androidtests/video_quality_loopback_test.py
+++ b/webrtc/examples/androidtests/video_quality_loopback_test.py
@@ -104,7 +104,7 @@
     _RunCommand(['gn', 'gen', build_dir_x86])
     _RunCommand(['ninja', '-C', build_dir_x86, 'frame_analyzer'])
 
-  tools_dir = os.path.join(SRC_DIR, 'tools-webrtc')
+  tools_dir = os.path.join(SRC_DIR, 'tools_webrtc')
   toolchain_dir = os.path.join(tools_dir, 'video_quality_toolchain')
 
   # Download ffmpeg and zxing.
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index 4682b7d..aa6f322 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -12,7 +12,7 @@
   import("//build/config/android/rules.gni")
 }
 if (rtc_use_memcheck) {
-  import("//tools-webrtc/valgrind/valgrind-webrtc.gni")
+  import("//tools_webrtc/valgrind/valgrind-webrtc.gni")
 }
 
 group("test") {