252 files changed, 45 insertions, 45 deletions

diff --git a/Makefile b/Makefile
index 270747e06..69b66368e 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 ifdef NSS_DISABLE_GTESTS
-DIRS := $(filter-out external_tests,$(DIRS))
+DIRS := $(filter-out gtests,$(DIRS))
 endif
 
 #######################################################################
diff --git a/automation/taskcluster/scripts/run_clang_format.sh b/automation/taskcluster/scripts/run_clang_format.sh
index 230b3a073..c13a1553d 100755
--- a/automation/taskcluster/scripts/run_clang_format.sh
+++ b/automation/taskcluster/scripts/run_clang_format.sh
@@ -40,11 +40,11 @@ else
          "$top/lib/ssl" \
          "$top/lib/sysinit" \
          "$top/lib/util" \
-         "$top/external_tests/common" \
-         "$top/external_tests/der_gtest" \
-         "$top/external_tests/pk11_gtest" \
-         "$top/external_tests/ssl_gtest" \
-         "$top/external_tests/util_gtest" \
+         "$top/gtests/common" \
+         "$top/gtests/der_gtest" \
+         "$top/gtests/pk11_gtest" \
+         "$top/gtests/ssl_gtest" \
+         "$top/gtests/util_gtest" \
     )
 fi
 
diff --git a/external_tests/.clang-format b/gtests/.clang-format
index 06e3c5115..06e3c5115 100644
--- a/external_tests/.clang-format
+++ b/gtests/.clang-format
diff --git a/external_tests/Makefile b/gtests/Makefile
index 2b5492506..2b5492506 100644
--- a/external_tests/Makefile
+++ b/gtests/Makefile
diff --git a/external_tests/README b/gtests/README
index 75c452fd9..75c452fd9 100644
--- a/external_tests/README
+++ b/gtests/README
diff --git a/external_tests/common/Makefile b/gtests/common/Makefile
index e17bc282c..e17bc282c 100644
--- a/external_tests/common/Makefile
+++ b/gtests/common/Makefile
diff --git a/external_tests/common/common.gyp b/gtests/common/common.gyp
index fa10aba20..274033ad5 100644
--- a/external_tests/common/common.gyp
+++ b/gtests/common/common.gyp
@@ -19,15 +19,15 @@
         '<(DEPTH)/lib/util/util.gyp:nssutil3',
         '<(DEPTH)/lib/smime/smime.gyp:smime3',
         '<(DEPTH)/lib/ssl/ssl.gyp:ssl3',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
         '<(DEPTH)/cmd/lib/lib.gyp:sectool'
       ]
     }
   ],
   'target_defaults': {
     'include_dirs': [
-      '../../external_tests/google_test/gtest/include',
-      '../../external_tests/common'
+      '../../gtests/google_test/gtest/include',
+      '../../gtests/common'
     ],
   },
   'variables': {
diff --git a/external_tests/common/gtest.gypi b/gtests/common/gtest.gypi
index c3bac327b..c3bac327b 100644
--- a/external_tests/common/gtest.gypi
+++ b/gtests/common/gtest.gypi
diff --git a/external_tests/common/gtest.mk b/gtests/common/gtest.mk
index ecb324e67..ecb324e67 100644
--- a/external_tests/common/gtest.mk
+++ b/gtests/common/gtest.mk
diff --git a/external_tests/common/gtests.cc b/gtests/common/gtests.cc
index c51437cb4..c51437cb4 100644
--- a/external_tests/common/gtests.cc
+++ b/gtests/common/gtests.cc
diff --git a/external_tests/common/manifest.mn b/gtests/common/manifest.mn
index bf45ebc0a..9834e42a0 100644
--- a/external_tests/common/manifest.mn
+++ b/gtests/common/manifest.mn
@@ -10,12 +10,12 @@ CPPSRCS = \
       gtests.cc \
       $(NULL)
 
-INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
-            -I$(CORE_DEPTH)/external_tests/common
+INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \
+            -I$(CORE_DEPTH)/gtests/common
 
 REQUIRES = gtest
 
 EXTRA_LIBS = $(DIST)/lib/$(LIB_PREFIX)gtest.$(LIB_SUFFIX)
 
 # NOTE: this is not actually used but required to build gtests.o
-PROGRAM = gtests
\ No newline at end of file
+PROGRAM = gtests
diff --git a/external_tests/common/scoped_ptrs.h b/gtests/common/scoped_ptrs.h
index a4272153d..a4272153d 100644
--- a/external_tests/common/scoped_ptrs.h
+++ b/gtests/common/scoped_ptrs.h
diff --git a/external_tests/der_gtest/Makefile b/gtests/der_gtest/Makefile
index 0d547e080..0d547e080 100644
--- a/external_tests/der_gtest/Makefile
+++ b/gtests/der_gtest/Makefile
diff --git a/external_tests/der_gtest/der_getint_unittest.cc b/gtests/der_gtest/der_getint_unittest.cc
index e4b225e5c..e4b225e5c 100644
--- a/external_tests/der_gtest/der_getint_unittest.cc
+++ b/gtests/der_gtest/der_getint_unittest.cc
diff --git a/external_tests/der_gtest/der_gtest.gyp b/gtests/der_gtest/der_gtest.gyp
index 2d60bb6ac..1851a706e 100644
--- a/external_tests/der_gtest/der_gtest.gyp
+++ b/gtests/der_gtest/der_gtest.gyp
@@ -12,18 +12,18 @@
       'type': 'executable',
       'sources': [
         'der_getint_unittest.cc',
-        '<(DEPTH)/external_tests/common/gtests.cc'
+        '<(DEPTH)/gtests/common/gtests.cc'
       ],
       'dependencies': [
         '<(DEPTH)/exports.gyp:nss_exports',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
       ]
     }
   ],
   'target_defaults': {
     'include_dirs': [
-      '../../external_tests/google_test/gtest/include',
-      '../../external_tests/common'
+      '../../gtests/google_test/gtest/include',
+      '../../gtests/common'
     ]
   },
   'variables': {
diff --git a/external_tests/der_gtest/der_private_key_import_unittest.cc b/gtests/der_gtest/der_private_key_import_unittest.cc
index 836cc7876..836cc7876 100644
--- a/external_tests/der_gtest/der_private_key_import_unittest.cc
+++ b/gtests/der_gtest/der_private_key_import_unittest.cc
diff --git a/external_tests/der_gtest/manifest.mn b/gtests/der_gtest/manifest.mn
index 31f840f39..862692f56 100644
--- a/external_tests/der_gtest/manifest.mn
+++ b/gtests/der_gtest/manifest.mn
@@ -11,8 +11,8 @@ CPPSRCS = \
       der_private_key_import_unittest.cc \
       $(NULL)
 
-INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
-            -I$(CORE_DEPTH)/external_tests/common
+INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \
+            -I$(CORE_DEPTH)/gtests/common
 
 REQUIRES = nspr nss libdbm gtest
 
diff --git a/external_tests/google_test/Makefile b/gtests/google_test/Makefile
index 21fef55ac..21fef55ac 100644
--- a/external_tests/google_test/Makefile
+++ b/gtests/google_test/Makefile
diff --git a/external_tests/google_test/google_test.gyp b/gtests/google_test/google_test.gyp
index e309ba25a..e309ba25a 100644
--- a/external_tests/google_test/google_test.gyp
+++ b/gtests/google_test/google_test.gyp
diff --git a/external_tests/google_test/gtest/CHANGES b/gtests/google_test/gtest/CHANGES
index 055213242..055213242 100644
--- a/external_tests/google_test/gtest/CHANGES
+++ b/gtests/google_test/gtest/CHANGES
diff --git a/external_tests/google_test/gtest/CMakeLists.txt b/gtests/google_test/gtest/CMakeLists.txt
index bd78cfe67..bd78cfe67 100644
--- a/external_tests/google_test/gtest/CMakeLists.txt
+++ b/gtests/google_test/gtest/CMakeLists.txt
diff --git a/external_tests/google_test/gtest/CONTRIBUTORS b/gtests/google_test/gtest/CONTRIBUTORS
index feae2fc04..feae2fc04 100644
--- a/external_tests/google_test/gtest/CONTRIBUTORS
+++ b/gtests/google_test/gtest/CONTRIBUTORS
diff --git a/external_tests/google_test/gtest/LICENSE b/gtests/google_test/gtest/LICENSE
index 1941a11f8..1941a11f8 100644
--- a/external_tests/google_test/gtest/LICENSE
+++ b/gtests/google_test/gtest/LICENSE
diff --git a/external_tests/google_test/gtest/Makefile.am b/gtests/google_test/gtest/Makefile.am
index 9c96b4257..9c96b4257 100644
--- a/external_tests/google_test/gtest/Makefile.am
+++ b/gtests/google_test/gtest/Makefile.am
diff --git a/external_tests/google_test/gtest/README b/gtests/google_test/gtest/README
index 404bf3b83..404bf3b83 100644
--- a/external_tests/google_test/gtest/README
+++ b/gtests/google_test/gtest/README
diff --git a/external_tests/google_test/gtest/build-aux/.keep b/gtests/google_test/gtest/build-aux/.keep
index e69de29bb..e69de29bb 100644
--- a/external_tests/google_test/gtest/build-aux/.keep
+++ b/gtests/google_test/gtest/build-aux/.keep
diff --git a/external_tests/google_test/gtest/cmake/internal_utils.cmake b/gtests/google_test/gtest/cmake/internal_utils.cmake
index 93e6dbb7c..93e6dbb7c 100644
--- a/external_tests/google_test/gtest/cmake/internal_utils.cmake
+++ b/gtests/google_test/gtest/cmake/internal_utils.cmake
diff --git a/external_tests/google_test/gtest/codegear/gtest.cbproj b/gtests/google_test/gtest/codegear/gtest.cbproj
index 95c3054b8..95c3054b8 100644
--- a/external_tests/google_test/gtest/codegear/gtest.cbproj
+++ b/gtests/google_test/gtest/codegear/gtest.cbproj
diff --git a/external_tests/google_test/gtest/codegear/gtest.groupproj b/gtests/google_test/gtest/codegear/gtest.groupproj
index faf31cab6..faf31cab6 100644
--- a/external_tests/google_test/gtest/codegear/gtest.groupproj
+++ b/gtests/google_test/gtest/codegear/gtest.groupproj
diff --git a/external_tests/google_test/gtest/codegear/gtest_all.cc b/gtests/google_test/gtest/codegear/gtest_all.cc
index 121b2d80e..121b2d80e 100644
--- a/external_tests/google_test/gtest/codegear/gtest_all.cc
+++ b/gtests/google_test/gtest/codegear/gtest_all.cc
diff --git a/external_tests/google_test/gtest/codegear/gtest_link.cc b/gtests/google_test/gtest/codegear/gtest_link.cc
index 918eccd19..918eccd19 100644
--- a/external_tests/google_test/gtest/codegear/gtest_link.cc
+++ b/gtests/google_test/gtest/codegear/gtest_link.cc
diff --git a/external_tests/google_test/gtest/codegear/gtest_main.cbproj b/gtests/google_test/gtest/codegear/gtest_main.cbproj
index d76ce1398..d76ce1398 100644
--- a/external_tests/google_test/gtest/codegear/gtest_main.cbproj
+++ b/gtests/google_test/gtest/codegear/gtest_main.cbproj
diff --git a/external_tests/google_test/gtest/codegear/gtest_unittest.cbproj b/gtests/google_test/gtest/codegear/gtest_unittest.cbproj
index dc5db8e4d..dc5db8e4d 100644
--- a/external_tests/google_test/gtest/codegear/gtest_unittest.cbproj
+++ b/gtests/google_test/gtest/codegear/gtest_unittest.cbproj
diff --git a/external_tests/google_test/gtest/configure.ac b/gtests/google_test/gtest/configure.ac
index cc592e158..cc592e158 100644
--- a/external_tests/google_test/gtest/configure.ac
+++ b/gtests/google_test/gtest/configure.ac
diff --git a/external_tests/google_test/gtest/include/gtest/gtest-death-test.h b/gtests/google_test/gtest/include/gtest/gtest-death-test.h
index 957a69c6a..957a69c6a 100644
--- a/external_tests/google_test/gtest/include/gtest/gtest-death-test.h
+++ b/gtests/google_test/gtest/include/gtest/gtest-death-test.h
diff --git a/external_tests/google_test/gtest/include/gtest/gtest-message.h b/gtests/google_test/gtest/include/gtest/gtest-message.h
index fe879bca7..fe879bca7 100644
--- a/external_tests/google_test/gtest/include/gtest/gtest-message.h
+++ b/gtests/google_test/gtest/include/gtest/gtest-message.h
diff --git a/external_tests/google_test/gtest/include/gtest/gtest-param-test.h b/gtests/google_test/gtest/include/gtest/gtest-param-test.h
index d6702c8f1..d6702c8f1 100644
--- a/external_tests/google_test/gtest/include/gtest/gtest-param-test.h
+++ b/gtests/google_test/gtest/include/gtest/gtest-param-test.h
diff --git a/external_tests/google_test/gtest/include/gtest/gtest-param-test.h.pump b/gtests/google_test/gtest/include/gtest/gtest-param-test.h.pump
index 2dc9303b5..2dc9303b5 100644
--- a/external_tests/google_test/gtest/include/gtest/gtest-param-test.h.pump
+++ b/gtests/google_test/gtest/include/gtest/gtest-param-test.h.pump
diff --git a/external_tests/google_test/gtest/include/gtest/gtest-printers.h b/gtests/google_test/gtest/include/gtest/gtest-printers.h
index 18ee7bc64..18ee7bc64 100644
--- a/external_tests/google_test/gtest/include/gtest/gtest-printers.h
+++ b/gtests/google_test/gtest/include/gtest/gtest-printers.h
diff --git a/external_tests/google_test/gtest/include/gtest/gtest-spi.h b/gtests/google_test/gtest/include/gtest/gtest-spi.h
index f63fa9a1b..f63fa9a1b 100644
--- a/external_tests/google_test/gtest/include/gtest/gtest-spi.h
+++ b/gtests/google_test/gtest/include/gtest/gtest-spi.h
diff --git a/external_tests/google_test/gtest/include/gtest/gtest-test-part.h b/gtests/google_test/gtest/include/gtest/gtest-test-part.h
index 77eb84483..77eb84483 100644
--- a/external_tests/google_test/gtest/include/gtest/gtest-test-part.h
+++ b/gtests/google_test/gtest/include/gtest/gtest-test-part.h
diff --git a/external_tests/google_test/gtest/include/gtest/gtest-typed-test.h b/gtests/google_test/gtest/include/gtest/gtest-typed-test.h
index fe1e83b27..fe1e83b27 100644
--- a/external_tests/google_test/gtest/include/gtest/gtest-typed-test.h
+++ b/gtests/google_test/gtest/include/gtest/gtest-typed-test.h
diff --git a/external_tests/google_test/gtest/include/gtest/gtest.h b/gtests/google_test/gtest/include/gtest/gtest.h
index 38ca3e976..38ca3e976 100644
--- a/external_tests/google_test/gtest/include/gtest/gtest.h
+++ b/gtests/google_test/gtest/include/gtest/gtest.h
diff --git a/external_tests/google_test/gtest/include/gtest/gtest_pred_impl.h b/gtests/google_test/gtest/include/gtest/gtest_pred_impl.h
index 30ae712f5..30ae712f5 100644
--- a/external_tests/google_test/gtest/include/gtest/gtest_pred_impl.h
+++ b/gtests/google_test/gtest/include/gtest/gtest_pred_impl.h
diff --git a/external_tests/google_test/gtest/include/gtest/gtest_prod.h b/gtests/google_test/gtest/include/gtest/gtest_prod.h
index da80ddc6c..da80ddc6c 100644
--- a/external_tests/google_test/gtest/include/gtest/gtest_prod.h
+++ b/gtests/google_test/gtest/include/gtest/gtest_prod.h
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h b/gtests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h
index 2b3a78f5b..2b3a78f5b 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-filepath.h b/gtests/google_test/gtest/include/gtest/internal/gtest-filepath.h
index 7a13b4b0d..7a13b4b0d 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-filepath.h
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-filepath.h
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h b/gtests/google_test/gtest/include/gtest/internal/gtest-internal.h
index 21a0f567b..21a0f567b 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-internal.h
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h b/gtests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h
index b1362cd00..b1362cd00 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h b/gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h
index 6dbaf4b7a..6dbaf4b7a 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump b/gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
index 801a2fc7d..801a2fc7d 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util.h b/gtests/google_test/gtest/include/gtest/internal/gtest-param-util.h
index d5e1028b0..d5e1028b0 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-param-util.h
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-param-util.h
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-port.h b/gtests/google_test/gtest/include/gtest/internal/gtest-port.h
index f376dfa00..f376dfa00 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-port.h
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-port.h
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-string.h b/gtests/google_test/gtest/include/gtest/internal/gtest-string.h
index 97f1a7fdd..97f1a7fdd 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-string.h
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-string.h
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h b/gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h
index e9b405340..e9b405340 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump b/gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump
index 429ddfeec..429ddfeec 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h b/gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h
index e46f7cfcb..e46f7cfcb 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h
diff --git a/external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump b/gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump
index 251fdf025..251fdf025 100644
--- a/external_tests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump
+++ b/gtests/google_test/gtest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/external_tests/google_test/gtest/m4/acx_pthread.m4 b/gtests/google_test/gtest/m4/acx_pthread.m4
index 2cf20de14..2cf20de14 100644
--- a/external_tests/google_test/gtest/m4/acx_pthread.m4
+++ b/gtests/google_test/gtest/m4/acx_pthread.m4
diff --git a/external_tests/google_test/gtest/m4/gtest.m4 b/gtests/google_test/gtest/m4/gtest.m4
index 6598ba75a..6598ba75a 100644
--- a/external_tests/google_test/gtest/m4/gtest.m4
+++ b/gtests/google_test/gtest/m4/gtest.m4
diff --git a/external_tests/google_test/gtest/make/Makefile b/gtests/google_test/gtest/make/Makefile
index 9ac74493b..9ac74493b 100644
--- a/external_tests/google_test/gtest/make/Makefile
+++ b/gtests/google_test/gtest/make/Makefile
diff --git a/external_tests/google_test/gtest/msvc/gtest-md.sln b/gtests/google_test/gtest/msvc/gtest-md.sln
index f7908da11..f7908da11 100644
--- a/external_tests/google_test/gtest/msvc/gtest-md.sln
+++ b/gtests/google_test/gtest/msvc/gtest-md.sln
diff --git a/external_tests/google_test/gtest/msvc/gtest-md.vcproj b/gtests/google_test/gtest/msvc/gtest-md.vcproj
index 1c35c3a5e..1c35c3a5e 100644
--- a/external_tests/google_test/gtest/msvc/gtest-md.vcproj
+++ b/gtests/google_test/gtest/msvc/gtest-md.vcproj
diff --git a/external_tests/google_test/gtest/msvc/gtest.sln b/gtests/google_test/gtest/msvc/gtest.sln
index ef4b057ff..ef4b057ff 100644
--- a/external_tests/google_test/gtest/msvc/gtest.sln
+++ b/gtests/google_test/gtest/msvc/gtest.sln
diff --git a/external_tests/google_test/gtest/msvc/gtest.vcproj b/gtests/google_test/gtest/msvc/gtest.vcproj
index a8373ce9a..a8373ce9a 100644
--- a/external_tests/google_test/gtest/msvc/gtest.vcproj
+++ b/gtests/google_test/gtest/msvc/gtest.vcproj
diff --git a/external_tests/google_test/gtest/msvc/gtest_main-md.vcproj b/gtests/google_test/gtest/msvc/gtest_main-md.vcproj
index b5379fe61..b5379fe61 100644
--- a/external_tests/google_test/gtest/msvc/gtest_main-md.vcproj
+++ b/gtests/google_test/gtest/msvc/gtest_main-md.vcproj
diff --git a/external_tests/google_test/gtest/msvc/gtest_main.vcproj b/gtests/google_test/gtest/msvc/gtest_main.vcproj
index e8b763c56..e8b763c56 100644
--- a/external_tests/google_test/gtest/msvc/gtest_main.vcproj
+++ b/gtests/google_test/gtest/msvc/gtest_main.vcproj
diff --git a/external_tests/google_test/gtest/msvc/gtest_prod_test-md.vcproj b/gtests/google_test/gtest/msvc/gtest_prod_test-md.vcproj
index 05b05d9ed..05b05d9ed 100644
--- a/external_tests/google_test/gtest/msvc/gtest_prod_test-md.vcproj
+++ b/gtests/google_test/gtest/msvc/gtest_prod_test-md.vcproj
diff --git a/external_tests/google_test/gtest/msvc/gtest_prod_test.vcproj b/gtests/google_test/gtest/msvc/gtest_prod_test.vcproj
index 6d7a2f021..6d7a2f021 100644
--- a/external_tests/google_test/gtest/msvc/gtest_prod_test.vcproj
+++ b/gtests/google_test/gtest/msvc/gtest_prod_test.vcproj
diff --git a/external_tests/google_test/gtest/msvc/gtest_unittest-md.vcproj b/gtests/google_test/gtest/msvc/gtest_unittest-md.vcproj
index 38a5e5663..38a5e5663 100644
--- a/external_tests/google_test/gtest/msvc/gtest_unittest-md.vcproj
+++ b/gtests/google_test/gtest/msvc/gtest_unittest-md.vcproj
diff --git a/external_tests/google_test/gtest/msvc/gtest_unittest.vcproj b/gtests/google_test/gtest/msvc/gtest_unittest.vcproj
index cb1f52b1f..cb1f52b1f 100644
--- a/external_tests/google_test/gtest/msvc/gtest_unittest.vcproj
+++ b/gtests/google_test/gtest/msvc/gtest_unittest.vcproj
diff --git a/external_tests/google_test/gtest/samples/prime_tables.h b/gtests/google_test/gtest/samples/prime_tables.h
index 92ce16a01..92ce16a01 100644
--- a/external_tests/google_test/gtest/samples/prime_tables.h
+++ b/gtests/google_test/gtest/samples/prime_tables.h
diff --git a/external_tests/google_test/gtest/samples/sample1.cc b/gtests/google_test/gtest/samples/sample1.cc
index f171e2609..f171e2609 100644
--- a/external_tests/google_test/gtest/samples/sample1.cc
+++ b/gtests/google_test/gtest/samples/sample1.cc
diff --git a/external_tests/google_test/gtest/samples/sample1.h b/gtests/google_test/gtest/samples/sample1.h
index 3dfeb98c4..3dfeb98c4 100644
--- a/external_tests/google_test/gtest/samples/sample1.h
+++ b/gtests/google_test/gtest/samples/sample1.h
diff --git a/external_tests/google_test/gtest/samples/sample10_unittest.cc b/gtests/google_test/gtest/samples/sample10_unittest.cc
index 0051cd5dc..0051cd5dc 100644
--- a/external_tests/google_test/gtest/samples/sample10_unittest.cc
+++ b/gtests/google_test/gtest/samples/sample10_unittest.cc
diff --git a/external_tests/google_test/gtest/samples/sample1_unittest.cc b/gtests/google_test/gtest/samples/sample1_unittest.cc
index aefc4f1d8..aefc4f1d8 100644
--- a/external_tests/google_test/gtest/samples/sample1_unittest.cc
+++ b/gtests/google_test/gtest/samples/sample1_unittest.cc
diff --git a/external_tests/google_test/gtest/samples/sample2.cc b/gtests/google_test/gtest/samples/sample2.cc
index 5f763b9bd..5f763b9bd 100644
--- a/external_tests/google_test/gtest/samples/sample2.cc
+++ b/gtests/google_test/gtest/samples/sample2.cc
diff --git a/external_tests/google_test/gtest/samples/sample2.h b/gtests/google_test/gtest/samples/sample2.h
index cb485c70f..cb485c70f 100644
--- a/external_tests/google_test/gtest/samples/sample2.h
+++ b/gtests/google_test/gtest/samples/sample2.h
diff --git a/external_tests/google_test/gtest/samples/sample2_unittest.cc b/gtests/google_test/gtest/samples/sample2_unittest.cc
index 4fa19b71c..4fa19b71c 100644
--- a/external_tests/google_test/gtest/samples/sample2_unittest.cc
+++ b/gtests/google_test/gtest/samples/sample2_unittest.cc
diff --git a/external_tests/google_test/gtest/samples/sample3-inl.h b/gtests/google_test/gtest/samples/sample3-inl.h
index 7e3084d63..7e3084d63 100644
--- a/external_tests/google_test/gtest/samples/sample3-inl.h
+++ b/gtests/google_test/gtest/samples/sample3-inl.h
diff --git a/external_tests/google_test/gtest/samples/sample3_unittest.cc b/gtests/google_test/gtest/samples/sample3_unittest.cc
index bf3877d01..bf3877d01 100644
--- a/external_tests/google_test/gtest/samples/sample3_unittest.cc
+++ b/gtests/google_test/gtest/samples/sample3_unittest.cc
diff --git a/external_tests/google_test/gtest/samples/sample4.cc b/gtests/google_test/gtest/samples/sample4.cc
index ae44bda6f..ae44bda6f 100644
--- a/external_tests/google_test/gtest/samples/sample4.cc
+++ b/gtests/google_test/gtest/samples/sample4.cc
diff --git a/external_tests/google_test/gtest/samples/sample4.h b/gtests/google_test/gtest/samples/sample4.h
index cd60f0dd2..cd60f0dd2 100644
--- a/external_tests/google_test/gtest/samples/sample4.h
+++ b/gtests/google_test/gtest/samples/sample4.h
diff --git a/external_tests/google_test/gtest/samples/sample4_unittest.cc b/gtests/google_test/gtest/samples/sample4_unittest.cc
index fa5afc7d5..fa5afc7d5 100644
--- a/external_tests/google_test/gtest/samples/sample4_unittest.cc
+++ b/gtests/google_test/gtest/samples/sample4_unittest.cc
diff --git a/external_tests/google_test/gtest/samples/sample5_unittest.cc b/gtests/google_test/gtest/samples/sample5_unittest.cc
index 43d8e5777..43d8e5777 100644
--- a/external_tests/google_test/gtest/samples/sample5_unittest.cc
+++ b/gtests/google_test/gtest/samples/sample5_unittest.cc
diff --git a/external_tests/google_test/gtest/samples/sample6_unittest.cc b/gtests/google_test/gtest/samples/sample6_unittest.cc
index 8f2036a51..8f2036a51 100644
--- a/external_tests/google_test/gtest/samples/sample6_unittest.cc
+++ b/gtests/google_test/gtest/samples/sample6_unittest.cc
diff --git a/external_tests/google_test/gtest/samples/sample7_unittest.cc b/gtests/google_test/gtest/samples/sample7_unittest.cc
index 1b651a21d..1b651a21d 100644
--- a/external_tests/google_test/gtest/samples/sample7_unittest.cc
+++ b/gtests/google_test/gtest/samples/sample7_unittest.cc
diff --git a/external_tests/google_test/gtest/samples/sample8_unittest.cc b/gtests/google_test/gtest/samples/sample8_unittest.cc
index 727433406..727433406 100644
--- a/external_tests/google_test/gtest/samples/sample8_unittest.cc
+++ b/gtests/google_test/gtest/samples/sample8_unittest.cc
diff --git a/external_tests/google_test/gtest/samples/sample9_unittest.cc b/gtests/google_test/gtest/samples/sample9_unittest.cc
index b2e2079bf..b2e2079bf 100644
--- a/external_tests/google_test/gtest/samples/sample9_unittest.cc
+++ b/gtests/google_test/gtest/samples/sample9_unittest.cc
diff --git a/external_tests/google_test/gtest/scripts/common.py b/gtests/google_test/gtest/scripts/common.py
index 3c0347a75..3c0347a75 100644
--- a/external_tests/google_test/gtest/scripts/common.py
+++ b/gtests/google_test/gtest/scripts/common.py
diff --git a/external_tests/google_test/gtest/scripts/fuse_gtest_files.py b/gtests/google_test/gtest/scripts/fuse_gtest_files.py
index 57ef72f0e..57ef72f0e 100755
--- a/external_tests/google_test/gtest/scripts/fuse_gtest_files.py
+++ b/gtests/google_test/gtest/scripts/fuse_gtest_files.py
diff --git a/external_tests/google_test/gtest/scripts/gen_gtest_pred_impl.py b/gtests/google_test/gtest/scripts/gen_gtest_pred_impl.py
index 3e7ab042e..3e7ab042e 100755
--- a/external_tests/google_test/gtest/scripts/gen_gtest_pred_impl.py
+++ b/gtests/google_test/gtest/scripts/gen_gtest_pred_impl.py
diff --git a/external_tests/google_test/gtest/scripts/gtest-config.in b/gtests/google_test/gtest/scripts/gtest-config.in
index 780f8432e..780f8432e 100755
--- a/external_tests/google_test/gtest/scripts/gtest-config.in
+++ b/gtests/google_test/gtest/scripts/gtest-config.in
diff --git a/external_tests/google_test/gtest/scripts/pump.py b/gtests/google_test/gtest/scripts/pump.py
index 5efb653c2..5efb653c2 100755
--- a/external_tests/google_test/gtest/scripts/pump.py
+++ b/gtests/google_test/gtest/scripts/pump.py
diff --git a/external_tests/google_test/gtest/scripts/release_docs.py b/gtests/google_test/gtest/scripts/release_docs.py
index 1291347f6..1291347f6 100755
--- a/external_tests/google_test/gtest/scripts/release_docs.py
+++ b/gtests/google_test/gtest/scripts/release_docs.py
diff --git a/external_tests/google_test/gtest/scripts/test/Makefile b/gtests/google_test/gtest/scripts/test/Makefile
index cdff58463..cdff58463 100644
--- a/external_tests/google_test/gtest/scripts/test/Makefile
+++ b/gtests/google_test/gtest/scripts/test/Makefile
diff --git a/external_tests/google_test/gtest/scripts/upload.py b/gtests/google_test/gtest/scripts/upload.py
index 6e6f9a147..6e6f9a147 100755
--- a/external_tests/google_test/gtest/scripts/upload.py
+++ b/gtests/google_test/gtest/scripts/upload.py
diff --git a/external_tests/google_test/gtest/scripts/upload_gtest.py b/gtests/google_test/gtest/scripts/upload_gtest.py
index be19ae809..be19ae809 100755
--- a/external_tests/google_test/gtest/scripts/upload_gtest.py
+++ b/gtests/google_test/gtest/scripts/upload_gtest.py
diff --git a/external_tests/google_test/gtest/src/gtest-all.cc b/gtests/google_test/gtest/src/gtest-all.cc
index 0a9cee522..0a9cee522 100644
--- a/external_tests/google_test/gtest/src/gtest-all.cc
+++ b/gtests/google_test/gtest/src/gtest-all.cc
diff --git a/external_tests/google_test/gtest/src/gtest-death-test.cc b/gtests/google_test/gtest/src/gtest-death-test.cc
index a0a8c7baf..a0a8c7baf 100644
--- a/external_tests/google_test/gtest/src/gtest-death-test.cc
+++ b/gtests/google_test/gtest/src/gtest-death-test.cc
diff --git a/external_tests/google_test/gtest/src/gtest-filepath.cc b/gtests/google_test/gtest/src/gtest-filepath.cc
index 0292dc119..0292dc119 100644
--- a/external_tests/google_test/gtest/src/gtest-filepath.cc
+++ b/gtests/google_test/gtest/src/gtest-filepath.cc
diff --git a/external_tests/google_test/gtest/src/gtest-internal-inl.h b/gtests/google_test/gtest/src/gtest-internal-inl.h
index 0ac7a109b..0ac7a109b 100644
--- a/external_tests/google_test/gtest/src/gtest-internal-inl.h
+++ b/gtests/google_test/gtest/src/gtest-internal-inl.h
diff --git a/external_tests/google_test/gtest/src/gtest-port.cc b/gtests/google_test/gtest/src/gtest-port.cc
index b032745b4..b032745b4 100644
--- a/external_tests/google_test/gtest/src/gtest-port.cc
+++ b/gtests/google_test/gtest/src/gtest-port.cc
diff --git a/external_tests/google_test/gtest/src/gtest-printers.cc b/gtests/google_test/gtest/src/gtest-printers.cc
index a2df412f8..a2df412f8 100644
--- a/external_tests/google_test/gtest/src/gtest-printers.cc
+++ b/gtests/google_test/gtest/src/gtest-printers.cc
diff --git a/external_tests/google_test/gtest/src/gtest-test-part.cc b/gtests/google_test/gtest/src/gtest-test-part.cc
index fb0e35425..fb0e35425 100644
--- a/external_tests/google_test/gtest/src/gtest-test-part.cc
+++ b/gtests/google_test/gtest/src/gtest-test-part.cc
diff --git a/external_tests/google_test/gtest/src/gtest-typed-test.cc b/gtests/google_test/gtest/src/gtest-typed-test.cc
index f0079f407..f0079f407 100644
--- a/external_tests/google_test/gtest/src/gtest-typed-test.cc
+++ b/gtests/google_test/gtest/src/gtest-typed-test.cc
diff --git a/external_tests/google_test/gtest/src/gtest.cc b/gtests/google_test/gtest/src/gtest.cc
index e4f3df3ea..e4f3df3ea 100644
--- a/external_tests/google_test/gtest/src/gtest.cc
+++ b/gtests/google_test/gtest/src/gtest.cc
diff --git a/external_tests/google_test/gtest/src/gtest_main.cc b/gtests/google_test/gtest/src/gtest_main.cc
index f30282255..f30282255 100644
--- a/external_tests/google_test/gtest/src/gtest_main.cc
+++ b/gtests/google_test/gtest/src/gtest_main.cc
diff --git a/external_tests/google_test/gtest/test/gtest-death-test_ex_test.cc b/gtests/google_test/gtest/test/gtest-death-test_ex_test.cc
index b50a13d5e..b50a13d5e 100644
--- a/external_tests/google_test/gtest/test/gtest-death-test_ex_test.cc
+++ b/gtests/google_test/gtest/test/gtest-death-test_ex_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-death-test_test.cc b/gtests/google_test/gtest/test/gtest-death-test_test.cc
index b25bc2296..b25bc2296 100644
--- a/external_tests/google_test/gtest/test/gtest-death-test_test.cc
+++ b/gtests/google_test/gtest/test/gtest-death-test_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-filepath_test.cc b/gtests/google_test/gtest/test/gtest-filepath_test.cc
index ae9f55a0c..ae9f55a0c 100644
--- a/external_tests/google_test/gtest/test/gtest-filepath_test.cc
+++ b/gtests/google_test/gtest/test/gtest-filepath_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-linked_ptr_test.cc b/gtests/google_test/gtest/test/gtest-linked_ptr_test.cc
index 6fcf5124a..6fcf5124a 100644
--- a/external_tests/google_test/gtest/test/gtest-linked_ptr_test.cc
+++ b/gtests/google_test/gtest/test/gtest-linked_ptr_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-listener_test.cc b/gtests/google_test/gtest/test/gtest-listener_test.cc
index 99662cff3..99662cff3 100644
--- a/external_tests/google_test/gtest/test/gtest-listener_test.cc
+++ b/gtests/google_test/gtest/test/gtest-listener_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-message_test.cc b/gtests/google_test/gtest/test/gtest-message_test.cc
index 175238ef4..175238ef4 100644
--- a/external_tests/google_test/gtest/test/gtest-message_test.cc
+++ b/gtests/google_test/gtest/test/gtest-message_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-options_test.cc b/gtests/google_test/gtest/test/gtest-options_test.cc
index 5586dc3b1..5586dc3b1 100644
--- a/external_tests/google_test/gtest/test/gtest-options_test.cc
+++ b/gtests/google_test/gtest/test/gtest-options_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-param-test2_test.cc b/gtests/google_test/gtest/test/gtest-param-test2_test.cc
index 4a782fe70..4a782fe70 100644
--- a/external_tests/google_test/gtest/test/gtest-param-test2_test.cc
+++ b/gtests/google_test/gtest/test/gtest-param-test2_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-param-test_test.cc b/gtests/google_test/gtest/test/gtest-param-test_test.cc
index cc1dc65fb..cc1dc65fb 100644
--- a/external_tests/google_test/gtest/test/gtest-param-test_test.cc
+++ b/gtests/google_test/gtest/test/gtest-param-test_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-param-test_test.h b/gtests/google_test/gtest/test/gtest-param-test_test.h
index 26ea122b1..26ea122b1 100644
--- a/external_tests/google_test/gtest/test/gtest-param-test_test.h
+++ b/gtests/google_test/gtest/test/gtest-param-test_test.h
diff --git a/external_tests/google_test/gtest/test/gtest-port_test.cc b/gtests/google_test/gtest/test/gtest-port_test.cc
index 370c952b2..370c952b2 100644
--- a/external_tests/google_test/gtest/test/gtest-port_test.cc
+++ b/gtests/google_test/gtest/test/gtest-port_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-printers_test.cc b/gtests/google_test/gtest/test/gtest-printers_test.cc
index 7b07fd105..7b07fd105 100644
--- a/external_tests/google_test/gtest/test/gtest-printers_test.cc
+++ b/gtests/google_test/gtest/test/gtest-printers_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-test-part_test.cc b/gtests/google_test/gtest/test/gtest-test-part_test.cc
index ca8ba933a..ca8ba933a 100644
--- a/external_tests/google_test/gtest/test/gtest-test-part_test.cc
+++ b/gtests/google_test/gtest/test/gtest-test-part_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-tuple_test.cc b/gtests/google_test/gtest/test/gtest-tuple_test.cc
index bfaa3e0ac..bfaa3e0ac 100644
--- a/external_tests/google_test/gtest/test/gtest-tuple_test.cc
+++ b/gtests/google_test/gtest/test/gtest-tuple_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-typed-test2_test.cc b/gtests/google_test/gtest/test/gtest-typed-test2_test.cc
index c284700b0..c284700b0 100644
--- a/external_tests/google_test/gtest/test/gtest-typed-test2_test.cc
+++ b/gtests/google_test/gtest/test/gtest-typed-test2_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-typed-test_test.cc b/gtests/google_test/gtest/test/gtest-typed-test_test.cc
index c3e66c2db..c3e66c2db 100644
--- a/external_tests/google_test/gtest/test/gtest-typed-test_test.cc
+++ b/gtests/google_test/gtest/test/gtest-typed-test_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest-typed-test_test.h b/gtests/google_test/gtest/test/gtest-typed-test_test.h
index 41d75704c..41d75704c 100644
--- a/external_tests/google_test/gtest/test/gtest-typed-test_test.h
+++ b/gtests/google_test/gtest/test/gtest-typed-test_test.h
diff --git a/external_tests/google_test/gtest/test/gtest-unittest-api_test.cc b/gtests/google_test/gtest/test/gtest-unittest-api_test.cc
index b1f51688a..b1f51688a 100644
--- a/external_tests/google_test/gtest/test/gtest-unittest-api_test.cc
+++ b/gtests/google_test/gtest/test/gtest-unittest-api_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest_all_test.cc b/gtests/google_test/gtest/test/gtest_all_test.cc
index 955aa6282..955aa6282 100644
--- a/external_tests/google_test/gtest/test/gtest_all_test.cc
+++ b/gtests/google_test/gtest/test/gtest_all_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest_break_on_failure_unittest.py b/gtests/google_test/gtest/test/gtest_break_on_failure_unittest.py
index 78f3e0f53..78f3e0f53 100755
--- a/external_tests/google_test/gtest/test/gtest_break_on_failure_unittest.py
+++ b/gtests/google_test/gtest/test/gtest_break_on_failure_unittest.py
diff --git a/external_tests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc b/gtests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc
index dd07478c0..dd07478c0 100644
--- a/external_tests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc
+++ b/gtests/google_test/gtest/test/gtest_break_on_failure_unittest_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_catch_exceptions_test.py b/gtests/google_test/gtest/test/gtest_catch_exceptions_test.py
index e6fc22fd1..e6fc22fd1 100755
--- a/external_tests/google_test/gtest/test/gtest_catch_exceptions_test.py
+++ b/gtests/google_test/gtest/test/gtest_catch_exceptions_test.py
diff --git a/external_tests/google_test/gtest/test/gtest_catch_exceptions_test_.cc b/gtests/google_test/gtest/test/gtest_catch_exceptions_test_.cc
index d0fc82c99..d0fc82c99 100644
--- a/external_tests/google_test/gtest/test/gtest_catch_exceptions_test_.cc
+++ b/gtests/google_test/gtest/test/gtest_catch_exceptions_test_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_color_test.py b/gtests/google_test/gtest/test/gtest_color_test.py
index d02a53ed8..d02a53ed8 100755
--- a/external_tests/google_test/gtest/test/gtest_color_test.py
+++ b/gtests/google_test/gtest/test/gtest_color_test.py
diff --git a/external_tests/google_test/gtest/test/gtest_color_test_.cc b/gtests/google_test/gtest/test/gtest_color_test_.cc
index f61ebb89b..f61ebb89b 100644
--- a/external_tests/google_test/gtest/test/gtest_color_test_.cc
+++ b/gtests/google_test/gtest/test/gtest_color_test_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_env_var_test.py b/gtests/google_test/gtest/test/gtest_env_var_test.py
index ac24337fa..ac24337fa 100755
--- a/external_tests/google_test/gtest/test/gtest_env_var_test.py
+++ b/gtests/google_test/gtest/test/gtest_env_var_test.py
diff --git a/external_tests/google_test/gtest/test/gtest_env_var_test_.cc b/gtests/google_test/gtest/test/gtest_env_var_test_.cc
index 539afc968..539afc968 100644
--- a/external_tests/google_test/gtest/test/gtest_env_var_test_.cc
+++ b/gtests/google_test/gtest/test/gtest_env_var_test_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_environment_test.cc b/gtests/google_test/gtest/test/gtest_environment_test.cc
index 3cff19e70..3cff19e70 100644
--- a/external_tests/google_test/gtest/test/gtest_environment_test.cc
+++ b/gtests/google_test/gtest/test/gtest_environment_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest_filter_unittest.py b/gtests/google_test/gtest/test/gtest_filter_unittest.py
index 0d1a77005..0d1a77005 100755
--- a/external_tests/google_test/gtest/test/gtest_filter_unittest.py
+++ b/gtests/google_test/gtest/test/gtest_filter_unittest.py
diff --git a/external_tests/google_test/gtest/test/gtest_filter_unittest_.cc b/gtests/google_test/gtest/test/gtest_filter_unittest_.cc
index 77deffc38..77deffc38 100644
--- a/external_tests/google_test/gtest/test/gtest_filter_unittest_.cc
+++ b/gtests/google_test/gtest/test/gtest_filter_unittest_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_help_test.py b/gtests/google_test/gtest/test/gtest_help_test.py
index 093c838d9..093c838d9 100755
--- a/external_tests/google_test/gtest/test/gtest_help_test.py
+++ b/gtests/google_test/gtest/test/gtest_help_test.py
diff --git a/external_tests/google_test/gtest/test/gtest_help_test_.cc b/gtests/google_test/gtest/test/gtest_help_test_.cc
index 31f78c244..31f78c244 100644
--- a/external_tests/google_test/gtest/test/gtest_help_test_.cc
+++ b/gtests/google_test/gtest/test/gtest_help_test_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_list_tests_unittest.py b/gtests/google_test/gtest/test/gtest_list_tests_unittest.py
index 925b09d9c..925b09d9c 100755
--- a/external_tests/google_test/gtest/test/gtest_list_tests_unittest.py
+++ b/gtests/google_test/gtest/test/gtest_list_tests_unittest.py
diff --git a/external_tests/google_test/gtest/test/gtest_list_tests_unittest_.cc b/gtests/google_test/gtest/test/gtest_list_tests_unittest_.cc
index 907c176ba..907c176ba 100644
--- a/external_tests/google_test/gtest/test/gtest_list_tests_unittest_.cc
+++ b/gtests/google_test/gtest/test/gtest_list_tests_unittest_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_main_unittest.cc b/gtests/google_test/gtest/test/gtest_main_unittest.cc
index ecd9bb876..ecd9bb876 100644
--- a/external_tests/google_test/gtest/test/gtest_main_unittest.cc
+++ b/gtests/google_test/gtest/test/gtest_main_unittest.cc
diff --git a/external_tests/google_test/gtest/test/gtest_no_test_unittest.cc b/gtests/google_test/gtest/test/gtest_no_test_unittest.cc
index 292599af8..292599af8 100644
--- a/external_tests/google_test/gtest/test/gtest_no_test_unittest.cc
+++ b/gtests/google_test/gtest/test/gtest_no_test_unittest.cc
diff --git a/external_tests/google_test/gtest/test/gtest_output_test.py b/gtests/google_test/gtest/test/gtest_output_test.py
index fa1a31172..fa1a31172 100755
--- a/external_tests/google_test/gtest/test/gtest_output_test.py
+++ b/gtests/google_test/gtest/test/gtest_output_test.py
diff --git a/external_tests/google_test/gtest/test/gtest_output_test_.cc b/gtests/google_test/gtest/test/gtest_output_test_.cc
index 5361d8d87..5361d8d87 100644
--- a/external_tests/google_test/gtest/test/gtest_output_test_.cc
+++ b/gtests/google_test/gtest/test/gtest_output_test_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_output_test_golden_lin.txt b/gtests/google_test/gtest/test/gtest_output_test_golden_lin.txt
index da541700e..da541700e 100644
--- a/external_tests/google_test/gtest/test/gtest_output_test_golden_lin.txt
+++ b/gtests/google_test/gtest/test/gtest_output_test_golden_lin.txt
diff --git a/external_tests/google_test/gtest/test/gtest_pred_impl_unittest.cc b/gtests/google_test/gtest/test/gtest_pred_impl_unittest.cc
index a84eff860..a84eff860 100644
--- a/external_tests/google_test/gtest/test/gtest_pred_impl_unittest.cc
+++ b/gtests/google_test/gtest/test/gtest_pred_impl_unittest.cc
diff --git a/external_tests/google_test/gtest/test/gtest_premature_exit_test.cc b/gtests/google_test/gtest/test/gtest_premature_exit_test.cc
index c1ed96866..c1ed96866 100644
--- a/external_tests/google_test/gtest/test/gtest_premature_exit_test.cc
+++ b/gtests/google_test/gtest/test/gtest_premature_exit_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest_prod_test.cc b/gtests/google_test/gtest/test/gtest_prod_test.cc
index 060abce18..060abce18 100644
--- a/external_tests/google_test/gtest/test/gtest_prod_test.cc
+++ b/gtests/google_test/gtest/test/gtest_prod_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest_repeat_test.cc b/gtests/google_test/gtest/test/gtest_repeat_test.cc
index 481012adc..481012adc 100644
--- a/external_tests/google_test/gtest/test/gtest_repeat_test.cc
+++ b/gtests/google_test/gtest/test/gtest_repeat_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest_shuffle_test.py b/gtests/google_test/gtest/test/gtest_shuffle_test.py
index 30d0303d1..30d0303d1 100755
--- a/external_tests/google_test/gtest/test/gtest_shuffle_test.py
+++ b/gtests/google_test/gtest/test/gtest_shuffle_test.py
diff --git a/external_tests/google_test/gtest/test/gtest_shuffle_test_.cc b/gtests/google_test/gtest/test/gtest_shuffle_test_.cc
index 6fb441bd4..6fb441bd4 100644
--- a/external_tests/google_test/gtest/test/gtest_shuffle_test_.cc
+++ b/gtests/google_test/gtest/test/gtest_shuffle_test_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_sole_header_test.cc b/gtests/google_test/gtest/test/gtest_sole_header_test.cc
index ccd091a28..ccd091a28 100644
--- a/external_tests/google_test/gtest/test/gtest_sole_header_test.cc
+++ b/gtests/google_test/gtest/test/gtest_sole_header_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest_stress_test.cc b/gtests/google_test/gtest/test/gtest_stress_test.cc
index e7daa430d..e7daa430d 100644
--- a/external_tests/google_test/gtest/test/gtest_stress_test.cc
+++ b/gtests/google_test/gtest/test/gtest_stress_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest_test_utils.py b/gtests/google_test/gtest/test/gtest_test_utils.py
index 7e3cbcafd..7e3cbcafd 100755
--- a/external_tests/google_test/gtest/test/gtest_test_utils.py
+++ b/gtests/google_test/gtest/test/gtest_test_utils.py
diff --git a/external_tests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc b/gtests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc
index 8d46c76f1..8d46c76f1 100644
--- a/external_tests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc
+++ b/gtests/google_test/gtest/test/gtest_throw_on_failure_ex_test.cc
diff --git a/external_tests/google_test/gtest/test/gtest_throw_on_failure_test.py b/gtests/google_test/gtest/test/gtest_throw_on_failure_test.py
index 5678ffeaf..5678ffeaf 100755
--- a/external_tests/google_test/gtest/test/gtest_throw_on_failure_test.py
+++ b/gtests/google_test/gtest/test/gtest_throw_on_failure_test.py
diff --git a/external_tests/google_test/gtest/test/gtest_throw_on_failure_test_.cc b/gtests/google_test/gtest/test/gtest_throw_on_failure_test_.cc
index 2b88fe3d9..2b88fe3d9 100644
--- a/external_tests/google_test/gtest/test/gtest_throw_on_failure_test_.cc
+++ b/gtests/google_test/gtest/test/gtest_throw_on_failure_test_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_uninitialized_test.py b/gtests/google_test/gtest/test/gtest_uninitialized_test.py
index 6ae57eeed..6ae57eeed 100755
--- a/external_tests/google_test/gtest/test/gtest_uninitialized_test.py
+++ b/gtests/google_test/gtest/test/gtest_uninitialized_test.py
diff --git a/external_tests/google_test/gtest/test/gtest_uninitialized_test_.cc b/gtests/google_test/gtest/test/gtest_uninitialized_test_.cc
index 44316987f..44316987f 100644
--- a/external_tests/google_test/gtest/test/gtest_uninitialized_test_.cc
+++ b/gtests/google_test/gtest/test/gtest_uninitialized_test_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_unittest.cc b/gtests/google_test/gtest/test/gtest_unittest.cc
index 9625fa4e8..9625fa4e8 100644
--- a/external_tests/google_test/gtest/test/gtest_unittest.cc
+++ b/gtests/google_test/gtest/test/gtest_unittest.cc
diff --git a/external_tests/google_test/gtest/test/gtest_xml_outfile1_test_.cc b/gtests/google_test/gtest/test/gtest_xml_outfile1_test_.cc
index 531ced49d..531ced49d 100644
--- a/external_tests/google_test/gtest/test/gtest_xml_outfile1_test_.cc
+++ b/gtests/google_test/gtest/test/gtest_xml_outfile1_test_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_xml_outfile2_test_.cc b/gtests/google_test/gtest/test/gtest_xml_outfile2_test_.cc
index 7b400b276..7b400b276 100644
--- a/external_tests/google_test/gtest/test/gtest_xml_outfile2_test_.cc
+++ b/gtests/google_test/gtest/test/gtest_xml_outfile2_test_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_xml_outfiles_test.py b/gtests/google_test/gtest/test/gtest_xml_outfiles_test.py
index 524e437e6..524e437e6 100755
--- a/external_tests/google_test/gtest/test/gtest_xml_outfiles_test.py
+++ b/gtests/google_test/gtest/test/gtest_xml_outfiles_test.py
diff --git a/external_tests/google_test/gtest/test/gtest_xml_output_unittest.py b/gtests/google_test/gtest/test/gtest_xml_output_unittest.py
index f605d4ee2..f605d4ee2 100755
--- a/external_tests/google_test/gtest/test/gtest_xml_output_unittest.py
+++ b/gtests/google_test/gtest/test/gtest_xml_output_unittest.py
diff --git a/external_tests/google_test/gtest/test/gtest_xml_output_unittest_.cc b/gtests/google_test/gtest/test/gtest_xml_output_unittest_.cc
index 48b8771b5..48b8771b5 100644
--- a/external_tests/google_test/gtest/test/gtest_xml_output_unittest_.cc
+++ b/gtests/google_test/gtest/test/gtest_xml_output_unittest_.cc
diff --git a/external_tests/google_test/gtest/test/gtest_xml_test_utils.py b/gtests/google_test/gtest/test/gtest_xml_test_utils.py
index 3d0c3b2c2..3d0c3b2c2 100755
--- a/external_tests/google_test/gtest/test/gtest_xml_test_utils.py
+++ b/gtests/google_test/gtest/test/gtest_xml_test_utils.py
diff --git a/external_tests/google_test/gtest/test/production.cc b/gtests/google_test/gtest/test/production.cc
index 8b8a40b44..8b8a40b44 100644
--- a/external_tests/google_test/gtest/test/production.cc
+++ b/gtests/google_test/gtest/test/production.cc
diff --git a/external_tests/google_test/gtest/test/production.h b/gtests/google_test/gtest/test/production.h
index 98fd5e476..98fd5e476 100644
--- a/external_tests/google_test/gtest/test/production.h
+++ b/gtests/google_test/gtest/test/production.h
diff --git a/external_tests/google_test/gtest/xcode/Config/DebugProject.xcconfig b/gtests/google_test/gtest/xcode/Config/DebugProject.xcconfig
index 3d68157d5..3d68157d5 100644
--- a/external_tests/google_test/gtest/xcode/Config/DebugProject.xcconfig
+++ b/gtests/google_test/gtest/xcode/Config/DebugProject.xcconfig
diff --git a/external_tests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig b/gtests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig
index 357b1c8fb..357b1c8fb 100644
--- a/external_tests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig
+++ b/gtests/google_test/gtest/xcode/Config/FrameworkTarget.xcconfig
diff --git a/external_tests/google_test/gtest/xcode/Config/General.xcconfig b/gtests/google_test/gtest/xcode/Config/General.xcconfig
index f23e32227..f23e32227 100644
--- a/external_tests/google_test/gtest/xcode/Config/General.xcconfig
+++ b/gtests/google_test/gtest/xcode/Config/General.xcconfig
diff --git a/external_tests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig b/gtests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig
index 5349f0a04..5349f0a04 100644
--- a/external_tests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig
+++ b/gtests/google_test/gtest/xcode/Config/ReleaseProject.xcconfig
diff --git a/external_tests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig b/gtests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig
index 3922fa51d..3922fa51d 100644
--- a/external_tests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig
+++ b/gtests/google_test/gtest/xcode/Config/StaticLibraryTarget.xcconfig
diff --git a/external_tests/google_test/gtest/xcode/Config/TestTarget.xcconfig b/gtests/google_test/gtest/xcode/Config/TestTarget.xcconfig
index e6652ba85..e6652ba85 100644
--- a/external_tests/google_test/gtest/xcode/Config/TestTarget.xcconfig
+++ b/gtests/google_test/gtest/xcode/Config/TestTarget.xcconfig
diff --git a/external_tests/google_test/gtest/xcode/Resources/Info.plist b/gtests/google_test/gtest/xcode/Resources/Info.plist
index 9dd28ea14..9dd28ea14 100644
--- a/external_tests/google_test/gtest/xcode/Resources/Info.plist
+++ b/gtests/google_test/gtest/xcode/Resources/Info.plist
diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist
index f3852edea..f3852edea 100644
--- a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist
+++ b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/Info.plist
diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
index 497617eb6..497617eb6 100644
--- a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
+++ b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh
index 4a0d413e5..4a0d413e5 100644
--- a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh
+++ b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/runtests.sh
diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc
index bfc4e7fcf..bfc4e7fcf 100644
--- a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc
+++ b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.cc
diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h
index 0c55cdc8c..0c55cdc8c 100644
--- a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h
+++ b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget.h
diff --git a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc
index 872599421..872599421 100644
--- a/external_tests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc
+++ b/gtests/google_test/gtest/xcode/Samples/FrameworkSample/widget_test.cc
diff --git a/external_tests/google_test/gtest/xcode/Scripts/runtests.sh b/gtests/google_test/gtest/xcode/Scripts/runtests.sh
index 3fc229f1d..3fc229f1d 100644
--- a/external_tests/google_test/gtest/xcode/Scripts/runtests.sh
+++ b/gtests/google_test/gtest/xcode/Scripts/runtests.sh
diff --git a/external_tests/google_test/gtest/xcode/Scripts/versiongenerate.py b/gtests/google_test/gtest/xcode/Scripts/versiongenerate.py
index 81de8c96a..81de8c96a 100644
--- a/external_tests/google_test/gtest/xcode/Scripts/versiongenerate.py
+++ b/gtests/google_test/gtest/xcode/Scripts/versiongenerate.py
diff --git a/external_tests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj b/gtests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj
index 0452a63d0..0452a63d0 100644
--- a/external_tests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj
+++ b/gtests/google_test/gtest/xcode/gtest.xcodeproj/project.pbxproj
diff --git a/external_tests/google_test/manifest.mn b/gtests/google_test/manifest.mn
index 70e33e6cf..70e33e6cf 100644
--- a/external_tests/google_test/manifest.mn
+++ b/gtests/google_test/manifest.mn
diff --git a/external_tests/manifest.mn b/gtests/manifest.mn
index 149e24b26..149e24b26 100644
--- a/external_tests/manifest.mn
+++ b/gtests/manifest.mn
diff --git a/external_tests/nss_bogo_shim/Makefile b/gtests/nss_bogo_shim/Makefile
index fd6426d89..fd6426d89 100644
--- a/external_tests/nss_bogo_shim/Makefile
+++ b/gtests/nss_bogo_shim/Makefile
diff --git a/external_tests/nss_bogo_shim/config.cc b/gtests/nss_bogo_shim/config.cc
index 2e6f7f775..2e6f7f775 100644
--- a/external_tests/nss_bogo_shim/config.cc
+++ b/gtests/nss_bogo_shim/config.cc
diff --git a/external_tests/nss_bogo_shim/config.h b/gtests/nss_bogo_shim/config.h
index 3764783bc..3764783bc 100644
--- a/external_tests/nss_bogo_shim/config.h
+++ b/gtests/nss_bogo_shim/config.h
diff --git a/external_tests/nss_bogo_shim/config.json b/gtests/nss_bogo_shim/config.json
index 48283f942..48283f942 100644
--- a/external_tests/nss_bogo_shim/config.json
+++ b/gtests/nss_bogo_shim/config.json
diff --git a/external_tests/nss_bogo_shim/manifest.mn b/gtests/nss_bogo_shim/manifest.mn
index 2d60ddea3..2d60ddea3 100644
--- a/external_tests/nss_bogo_shim/manifest.mn
+++ b/gtests/nss_bogo_shim/manifest.mn
diff --git a/external_tests/nss_bogo_shim/nss_bogo_shim.cc b/gtests/nss_bogo_shim/nss_bogo_shim.cc
index 7d80ee816..7d80ee816 100644
--- a/external_tests/nss_bogo_shim/nss_bogo_shim.cc
+++ b/gtests/nss_bogo_shim/nss_bogo_shim.cc
diff --git a/external_tests/nss_bogo_shim/nss_bogo_shim.gyp b/gtests/nss_bogo_shim/nss_bogo_shim.gyp
index c5f1ab34f..f4f94e94b 100644
--- a/external_tests/nss_bogo_shim/nss_bogo_shim.gyp
+++ b/gtests/nss_bogo_shim/nss_bogo_shim.gyp
@@ -18,7 +18,7 @@
         '<(DEPTH)/exports.gyp:nss_exports',
         '<(DEPTH)/lib/util/util.gyp:nssutil3',
         '<(DEPTH)/lib/sqlite/sqlite.gyp:sqlite3',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
         '<(DEPTH)/lib/softoken/softoken.gyp:softokn',
         '<(DEPTH)/lib/smime/smime.gyp:smime',
         '<(DEPTH)/lib/ssl/ssl.gyp:ssl',
diff --git a/external_tests/nss_bogo_shim/nsskeys.cc b/gtests/nss_bogo_shim/nsskeys.cc
index 1b5e15bee..1b5e15bee 100644
--- a/external_tests/nss_bogo_shim/nsskeys.cc
+++ b/gtests/nss_bogo_shim/nsskeys.cc
diff --git a/external_tests/nss_bogo_shim/nsskeys.h b/gtests/nss_bogo_shim/nsskeys.h
index 45e56c353..45e56c353 100644
--- a/external_tests/nss_bogo_shim/nsskeys.h
+++ b/gtests/nss_bogo_shim/nsskeys.h
diff --git a/external_tests/pk11_gtest/Makefile b/gtests/pk11_gtest/Makefile
index 0d547e080..0d547e080 100644
--- a/external_tests/pk11_gtest/Makefile
+++ b/gtests/pk11_gtest/Makefile
diff --git a/external_tests/pk11_gtest/manifest.mn b/gtests/pk11_gtest/manifest.mn
index 514e4a7dd..934d4cf33 100644
--- a/external_tests/pk11_gtest/manifest.mn
+++ b/gtests/pk11_gtest/manifest.mn
@@ -16,8 +16,8 @@ CPPSRCS = \
       pk11_rsapss_unittest.cc \
       $(NULL)
 
-INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
-            -I$(CORE_DEPTH)/external_tests/common
+INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \
+            -I$(CORE_DEPTH)/gtests/common
 
 REQUIRES = nspr nss libdbm gtest
 
diff --git a/external_tests/pk11_gtest/pk11_aeskeywrap_unittest.cc b/gtests/pk11_gtest/pk11_aeskeywrap_unittest.cc
index a0226e6df..a0226e6df 100644
--- a/external_tests/pk11_gtest/pk11_aeskeywrap_unittest.cc
+++ b/gtests/pk11_gtest/pk11_aeskeywrap_unittest.cc
diff --git a/external_tests/pk11_gtest/pk11_chacha20poly1305_unittest.cc b/gtests/pk11_gtest/pk11_chacha20poly1305_unittest.cc
index 1d6ff0118..1d6ff0118 100644
--- a/external_tests/pk11_gtest/pk11_chacha20poly1305_unittest.cc
+++ b/gtests/pk11_gtest/pk11_chacha20poly1305_unittest.cc
diff --git a/external_tests/pk11_gtest/pk11_export_unittest.cc b/gtests/pk11_gtest/pk11_export_unittest.cc
index e5d5ae8e9..e5d5ae8e9 100644
--- a/external_tests/pk11_gtest/pk11_export_unittest.cc
+++ b/gtests/pk11_gtest/pk11_export_unittest.cc
diff --git a/external_tests/pk11_gtest/pk11_gtest.gyp b/gtests/pk11_gtest/pk11_gtest.gyp
index c08189c7e..09bce728d 100644
--- a/external_tests/pk11_gtest/pk11_gtest.gyp
+++ b/gtests/pk11_gtest/pk11_gtest.gyp
@@ -17,19 +17,19 @@
         'pk11_prf_unittest.cc',
         'pk11_prng_unittest.cc',
         'pk11_rsapss_unittest.cc',
-        '<(DEPTH)/external_tests/common/gtests.cc'
+        '<(DEPTH)/gtests/common/gtests.cc'
       ],
       'dependencies': [
         '<(DEPTH)/exports.gyp:nss_exports',
         '<(DEPTH)/lib/freebl/freebl.gyp:<(freebl_name)',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
       ],
     }
   ],
   'target_defaults': {
     'include_dirs': [
-      '../../external_tests/google_test/gtest/include',
-      '../../external_tests/common'
+      '../../gtests/google_test/gtest/include',
+      '../../gtests/common'
     ]
   },
   'variables': {
diff --git a/external_tests/pk11_gtest/pk11_pbkdf2_unittest.cc b/gtests/pk11_gtest/pk11_pbkdf2_unittest.cc
index d72f94c2c..d72f94c2c 100644
--- a/external_tests/pk11_gtest/pk11_pbkdf2_unittest.cc
+++ b/gtests/pk11_gtest/pk11_pbkdf2_unittest.cc
diff --git a/external_tests/pk11_gtest/pk11_prf_unittest.cc b/gtests/pk11_gtest/pk11_prf_unittest.cc
index f2d4cf3b7..f2d4cf3b7 100644
--- a/external_tests/pk11_gtest/pk11_prf_unittest.cc
+++ b/gtests/pk11_gtest/pk11_prf_unittest.cc
diff --git a/external_tests/pk11_gtest/pk11_prng_unittest.cc b/gtests/pk11_gtest/pk11_prng_unittest.cc
index fd2865169..fd2865169 100644
--- a/external_tests/pk11_gtest/pk11_prng_unittest.cc
+++ b/gtests/pk11_gtest/pk11_prng_unittest.cc
diff --git a/external_tests/pk11_gtest/pk11_rsapss_unittest.cc b/gtests/pk11_gtest/pk11_rsapss_unittest.cc
index 3e860a549..3e860a549 100644
--- a/external_tests/pk11_gtest/pk11_rsapss_unittest.cc
+++ b/gtests/pk11_gtest/pk11_rsapss_unittest.cc
diff --git a/external_tests/ssl_gtest/Makefile b/gtests/ssl_gtest/Makefile
index dfb8df943..dfb8df943 100644
--- a/external_tests/ssl_gtest/Makefile
+++ b/gtests/ssl_gtest/Makefile
diff --git a/external_tests/ssl_gtest/databuffer.h b/gtests/ssl_gtest/databuffer.h
index cb96c59d5..cb96c59d5 100644
--- a/external_tests/ssl_gtest/databuffer.h
+++ b/gtests/ssl_gtest/databuffer.h
diff --git a/external_tests/ssl_gtest/gtest_utils.h b/gtests/ssl_gtest/gtest_utils.h
index 3ecd96cbe..3ecd96cbe 100644
--- a/external_tests/ssl_gtest/gtest_utils.h
+++ b/gtests/ssl_gtest/gtest_utils.h
diff --git a/external_tests/ssl_gtest/libssl_internals.c b/gtests/ssl_gtest/libssl_internals.c
index e922162b7..e922162b7 100644
--- a/external_tests/ssl_gtest/libssl_internals.c
+++ b/gtests/ssl_gtest/libssl_internals.c
diff --git a/external_tests/ssl_gtest/libssl_internals.h b/gtests/ssl_gtest/libssl_internals.h
index bc8b296f8..bc8b296f8 100644
--- a/external_tests/ssl_gtest/libssl_internals.h
+++ b/gtests/ssl_gtest/libssl_internals.h
diff --git a/external_tests/ssl_gtest/manifest.mn b/gtests/ssl_gtest/manifest.mn
index 540f518b0..4dc735861 100644
--- a/external_tests/ssl_gtest/manifest.mn
+++ b/gtests/ssl_gtest/manifest.mn
@@ -40,8 +40,8 @@ CPPSRCS = \
       tls_parser.cc \
       $(NULL)
 
-INCLUDES += -I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
-            -I$(CORE_DEPTH)/external_tests/common
+INCLUDES += -I$(CORE_DEPTH)/gtests/google_test/gtest/include \
+            -I$(CORE_DEPTH)/gtests/common
 
 REQUIRES = nspr nss libdbm gtest
 
diff --git a/external_tests/ssl_gtest/ssl_0rtt_unittest.cc b/gtests/ssl_gtest/ssl_0rtt_unittest.cc
index 4a57c19f5..4a57c19f5 100644
--- a/external_tests/ssl_gtest/ssl_0rtt_unittest.cc
+++ b/gtests/ssl_gtest/ssl_0rtt_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_agent_unittest.cc b/gtests/ssl_gtest/ssl_agent_unittest.cc
index 160b412fb..160b412fb 100644
--- a/external_tests/ssl_gtest/ssl_agent_unittest.cc
+++ b/gtests/ssl_gtest/ssl_agent_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_auth_unittest.cc b/gtests/ssl_gtest/ssl_auth_unittest.cc
index 5f3575307..5f3575307 100644
--- a/external_tests/ssl_gtest/ssl_auth_unittest.cc
+++ b/gtests/ssl_gtest/ssl_auth_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_cert_ext_unittest.cc b/gtests/ssl_gtest/ssl_cert_ext_unittest.cc
index b59c480c6..b59c480c6 100644
--- a/external_tests/ssl_gtest/ssl_cert_ext_unittest.cc
+++ b/gtests/ssl_gtest/ssl_cert_ext_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_ciphersuite_unittest.cc b/gtests/ssl_gtest/ssl_ciphersuite_unittest.cc
index ab10a84a0..ab10a84a0 100644
--- a/external_tests/ssl_gtest/ssl_ciphersuite_unittest.cc
+++ b/gtests/ssl_gtest/ssl_ciphersuite_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_damage_unittest.cc b/gtests/ssl_gtest/ssl_damage_unittest.cc
index 9dadcbdf6..9dadcbdf6 100644
--- a/external_tests/ssl_gtest/ssl_damage_unittest.cc
+++ b/gtests/ssl_gtest/ssl_damage_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_dhe_unittest.cc b/gtests/ssl_gtest/ssl_dhe_unittest.cc
index 9a5a46ce8..9a5a46ce8 100644
--- a/external_tests/ssl_gtest/ssl_dhe_unittest.cc
+++ b/gtests/ssl_gtest/ssl_dhe_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_drop_unittest.cc b/gtests/ssl_gtest/ssl_drop_unittest.cc
index 89ca28e97..89ca28e97 100644
--- a/external_tests/ssl_gtest/ssl_drop_unittest.cc
+++ b/gtests/ssl_gtest/ssl_drop_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_ecdh_unittest.cc b/gtests/ssl_gtest/ssl_ecdh_unittest.cc
index 0c71ece45..0c71ece45 100644
--- a/external_tests/ssl_gtest/ssl_ecdh_unittest.cc
+++ b/gtests/ssl_gtest/ssl_ecdh_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_ems_unittest.cc b/gtests/ssl_gtest/ssl_ems_unittest.cc
index b9c725b36..b9c725b36 100644
--- a/external_tests/ssl_gtest/ssl_ems_unittest.cc
+++ b/gtests/ssl_gtest/ssl_ems_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_extension_unittest.cc b/gtests/ssl_gtest/ssl_extension_unittest.cc
index 04a1d976a..04a1d976a 100644
--- a/external_tests/ssl_gtest/ssl_extension_unittest.cc
+++ b/gtests/ssl_gtest/ssl_extension_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_gtest.cc b/gtests/ssl_gtest/ssl_gtest.cc
index 2d08dd865..2d08dd865 100644
--- a/external_tests/ssl_gtest/ssl_gtest.cc
+++ b/gtests/ssl_gtest/ssl_gtest.cc
diff --git a/external_tests/ssl_gtest/ssl_gtest.gyp b/gtests/ssl_gtest/ssl_gtest.gyp
index 08242e077..1c7e97ee5 100644
--- a/external_tests/ssl_gtest/ssl_gtest.gyp
+++ b/gtests/ssl_gtest/ssl_gtest.gyp
@@ -43,7 +43,7 @@
         '<(DEPTH)/exports.gyp:nss_exports',
         '<(DEPTH)/lib/util/util.gyp:nssutil3',
         '<(DEPTH)/lib/sqlite/sqlite.gyp:sqlite3',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
         '<(DEPTH)/lib/softoken/softoken.gyp:softokn',
         '<(DEPTH)/lib/smime/smime.gyp:smime',
         '<(DEPTH)/lib/ssl/ssl.gyp:ssl',
@@ -91,8 +91,8 @@
   ],
   'target_defaults': {
     'include_dirs': [
-      '../../external_tests/google_test/gtest/include',
-      '../../external_tests/common',
+      '../../gtests/google_test/gtest/include',
+      '../../gtests/common',
       '../../lib/ssl'
     ],
     'defines': [
diff --git a/external_tests/ssl_gtest/ssl_hrr_unittest.cc b/gtests/ssl_gtest/ssl_hrr_unittest.cc
index edb8ac917..edb8ac917 100644
--- a/external_tests/ssl_gtest/ssl_hrr_unittest.cc
+++ b/gtests/ssl_gtest/ssl_hrr_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_loopback_unittest.cc b/gtests/ssl_gtest/ssl_loopback_unittest.cc
index ef8f067f5..ef8f067f5 100644
--- a/external_tests/ssl_gtest/ssl_loopback_unittest.cc
+++ b/gtests/ssl_gtest/ssl_loopback_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_record_unittest.cc b/gtests/ssl_gtest/ssl_record_unittest.cc
index ef81b222c..ef81b222c 100644
--- a/external_tests/ssl_gtest/ssl_record_unittest.cc
+++ b/gtests/ssl_gtest/ssl_record_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_resumption_unittest.cc b/gtests/ssl_gtest/ssl_resumption_unittest.cc
index e5b0cf806..e5b0cf806 100644
--- a/external_tests/ssl_gtest/ssl_resumption_unittest.cc
+++ b/gtests/ssl_gtest/ssl_resumption_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_skip_unittest.cc b/gtests/ssl_gtest/ssl_skip_unittest.cc
index 523a37499..523a37499 100644
--- a/external_tests/ssl_gtest/ssl_skip_unittest.cc
+++ b/gtests/ssl_gtest/ssl_skip_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_staticrsa_unittest.cc b/gtests/ssl_gtest/ssl_staticrsa_unittest.cc
index baf24ed9c..baf24ed9c 100644
--- a/external_tests/ssl_gtest/ssl_staticrsa_unittest.cc
+++ b/gtests/ssl_gtest/ssl_staticrsa_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_v2_client_hello_unittest.cc b/gtests/ssl_gtest/ssl_v2_client_hello_unittest.cc
index 8b586beae..8b586beae 100644
--- a/external_tests/ssl_gtest/ssl_v2_client_hello_unittest.cc
+++ b/gtests/ssl_gtest/ssl_v2_client_hello_unittest.cc
diff --git a/external_tests/ssl_gtest/ssl_version_unittest.cc b/gtests/ssl_gtest/ssl_version_unittest.cc
index b3538497e..b3538497e 100644
--- a/external_tests/ssl_gtest/ssl_version_unittest.cc
+++ b/gtests/ssl_gtest/ssl_version_unittest.cc
diff --git a/external_tests/ssl_gtest/test_io.cc b/gtests/ssl_gtest/test_io.cc
index 646c5a577..646c5a577 100644
--- a/external_tests/ssl_gtest/test_io.cc
+++ b/gtests/ssl_gtest/test_io.cc
diff --git a/external_tests/ssl_gtest/test_io.h b/gtests/ssl_gtest/test_io.h
index 9ea444c41..9ea444c41 100644
--- a/external_tests/ssl_gtest/test_io.h
+++ b/gtests/ssl_gtest/test_io.h
diff --git a/external_tests/ssl_gtest/tls_agent.cc b/gtests/ssl_gtest/tls_agent.cc
index 53ead7e5b..53ead7e5b 100644
--- a/external_tests/ssl_gtest/tls_agent.cc
+++ b/gtests/ssl_gtest/tls_agent.cc
diff --git a/external_tests/ssl_gtest/tls_agent.h b/gtests/ssl_gtest/tls_agent.h
index 707cb8db0..707cb8db0 100644
--- a/external_tests/ssl_gtest/tls_agent.h
+++ b/gtests/ssl_gtest/tls_agent.h
diff --git a/external_tests/ssl_gtest/tls_connect.cc b/gtests/ssl_gtest/tls_connect.cc
index 30df367ca..30df367ca 100644
--- a/external_tests/ssl_gtest/tls_connect.cc
+++ b/gtests/ssl_gtest/tls_connect.cc
diff --git a/external_tests/ssl_gtest/tls_connect.h b/gtests/ssl_gtest/tls_connect.h
index efeb73c70..efeb73c70 100644
--- a/external_tests/ssl_gtest/tls_connect.h
+++ b/gtests/ssl_gtest/tls_connect.h
diff --git a/external_tests/ssl_gtest/tls_filter.cc b/gtests/ssl_gtest/tls_filter.cc
index 60c71fab7..60c71fab7 100644
--- a/external_tests/ssl_gtest/tls_filter.cc
+++ b/gtests/ssl_gtest/tls_filter.cc
diff --git a/external_tests/ssl_gtest/tls_filter.h b/gtests/ssl_gtest/tls_filter.h
index 4261b54a7..4261b54a7 100644
--- a/external_tests/ssl_gtest/tls_filter.h
+++ b/gtests/ssl_gtest/tls_filter.h
diff --git a/external_tests/ssl_gtest/tls_hkdf_unittest.cc b/gtests/ssl_gtest/tls_hkdf_unittest.cc
index 202520e69..202520e69 100644
--- a/external_tests/ssl_gtest/tls_hkdf_unittest.cc
+++ b/gtests/ssl_gtest/tls_hkdf_unittest.cc
diff --git a/external_tests/ssl_gtest/tls_parser.cc b/gtests/ssl_gtest/tls_parser.cc
index e4c06aa91..e4c06aa91 100644
--- a/external_tests/ssl_gtest/tls_parser.cc
+++ b/gtests/ssl_gtest/tls_parser.cc
diff --git a/external_tests/ssl_gtest/tls_parser.h b/gtests/ssl_gtest/tls_parser.h
index c79d45a7e..c79d45a7e 100644
--- a/external_tests/ssl_gtest/tls_parser.h
+++ b/gtests/ssl_gtest/tls_parser.h
diff --git a/external_tests/util_gtest/Makefile b/gtests/util_gtest/Makefile
index 996669782..996669782 100644
--- a/external_tests/util_gtest/Makefile
+++ b/gtests/util_gtest/Makefile
diff --git a/external_tests/util_gtest/manifest.mn b/gtests/util_gtest/manifest.mn
index 41e7edc0b..fd4925142 100644
--- a/external_tests/util_gtest/manifest.mn
+++ b/gtests/util_gtest/manifest.mn
@@ -11,8 +11,8 @@ CPPSRCS = \
 	$(NULL)
 
 INCLUDES += \
-	-I$(CORE_DEPTH)/external_tests/google_test/gtest/include \
-	-I$(CORE_DEPTH)/external_tests/common \
+	-I$(CORE_DEPTH)/gtests/google_test/gtest/include \
+	-I$(CORE_DEPTH)/gtests/common \
 	$(NULL)
 
 REQUIRES = nspr gtest
diff --git a/external_tests/util_gtest/util_gtest.gyp b/gtests/util_gtest/util_gtest.gyp
index bd99b35da..9ad5cc6f6 100644
--- a/external_tests/util_gtest/util_gtest.gyp
+++ b/gtests/util_gtest/util_gtest.gyp
@@ -12,19 +12,19 @@
       'type': 'executable',
       'sources': [
         'util_utf8_unittest.cc',
-        '<(DEPTH)/external_tests/common/gtests.cc'
+        '<(DEPTH)/gtests/common/gtests.cc'
       ],
       'dependencies': [
         '<(DEPTH)/exports.gyp:nss_exports',
-        '<(DEPTH)/external_tests/google_test/google_test.gyp:gtest',
+        '<(DEPTH)/gtests/google_test/google_test.gyp:gtest',
         '<(DEPTH)/lib/util/util.gyp:nssutil',
       ]
     }
   ],
   'target_defaults': {
     'include_dirs': [
-      '../../external_tests/google_test/gtest/include',
-      '../../external_tests/common',
+      '../../gtests/google_test/gtest/include',
+      '../../gtests/common',
       '../../lib/util'
     ]
   },
diff --git a/external_tests/util_gtest/util_utf8_unittest.cc b/gtests/util_gtest/util_utf8_unittest.cc
index d57f01d22..d57f01d22 100644
--- a/external_tests/util_gtest/util_utf8_unittest.cc
+++ b/gtests/util_gtest/util_utf8_unittest.cc
diff --git a/manifest.mn b/manifest.mn
index 69fc19d6a..92415cde9 100644
--- a/manifest.mn
+++ b/manifest.mn
@@ -10,7 +10,7 @@ IMPORTS =	nspr20/v4.8 \
 
 RELEASE = nss
 
-DIRS = coreconf lib cmd external_tests
+DIRS = coreconf lib cmd gtests
 
 ifdef FUZZ
 DIRS += fuzz
diff --git a/nss.gyp b/nss.gyp
index 0a683f692..c9c5a3048 100644
--- a/nss.gyp
+++ b/nss.gyp
@@ -207,13 +207,13 @@
             'cmd/tstclnt/tstclnt.gyp:tstclnt',
             'cmd/vfychain/vfychain.gyp:vfychain',
             'cmd/vfyserv/vfyserv.gyp:vfyserv',
-            'external_tests/google_test/google_test.gyp:gtest1',
-            'external_tests/common/common.gyp:gtests',
-            'external_tests/der_gtest/der_gtest.gyp:der_gtest',
-            'external_tests/pk11_gtest/pk11_gtest.gyp:pk11_gtest',
-            'external_tests/ssl_gtest/ssl_gtest.gyp:ssl_gtest',
-            'external_tests/util_gtest/util_gtest.gyp:util_gtest',
-            'external_tests/nss_bogo_shim/nss_bogo_shim.gyp:nss_bogo_shim'
+            'gtests/google_test/google_test.gyp:gtest1',
+            'gtests/common/common.gyp:gtests',
+            'gtests/der_gtest/der_gtest.gyp:der_gtest',
+            'gtests/pk11_gtest/pk11_gtest.gyp:pk11_gtest',
+            'gtests/ssl_gtest/ssl_gtest.gyp:ssl_gtest',
+            'gtests/util_gtest/util_gtest.gyp:util_gtest',
+            'gtests/nss_bogo_shim/nss_bogo_shim.gyp:nss_bogo_shim'
           ],
           'conditions': [
             [ 'OS=="linux"', {
diff --git a/tests/bogo/bogo.sh b/tests/bogo/bogo.sh
index c5c9a6528..05f10c8d0 100755
--- a/tests/bogo/bogo.sh
+++ b/tests/bogo/bogo.sh
@@ -48,7 +48,7 @@ bogo_init
 (cd "$BORING"/ssl/test/runner;
  GOPATH="$PWD" go test -pipe -shim-path "${BINDIR}"/nss_bogo_shim \
 	 -loose-errors -allow-unimplemented \
-	 -shim-config "${SOURCE_DIR}/external_tests/nss_bogo_shim/config.json") \
+	 -shim-config "${SOURCE_DIR}/gtests/nss_bogo_shim/config.json") \
 	 2>bogo.errors | tee bogo.log
 html_msg "${PIPESTATUS[0]}" 0 "Bogo" "Run successfully"
 grep -i 'FAILED\|Assertion failure' bogo.errors