diff --git a/tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-memcheck.txt b/tools/valgrind-webrtc/gtest_exclude/modules_tests.gtest-memcheck.txt
similarity index 100%
rename from tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-memcheck.txt
rename to tools/valgrind-webrtc/gtest_exclude/modules_tests.gtest-memcheck.txt
diff --git a/tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-tsan.txt b/tools/valgrind-webrtc/gtest_exclude/modules_tests.gtest-tsan.txt
similarity index 100%
rename from tools/valgrind-webrtc/gtest_exclude/modules_integrationtests.gtest-tsan.txt
rename to tools/valgrind-webrtc/gtest_exclude/modules_tests.gtest-tsan.txt
diff --git a/webrtc/build/apk_tests.gyp b/webrtc/build/apk_tests.gyp
index f39384dde..33fb7f762 100644
--- a/webrtc/build/apk_tests.gyp
+++ b/webrtc/build/apk_tests.gyp
@@ -75,14 +75,14 @@
       ],
     },
     {
-      'target_name': 'modules_integrationtests_apk',
+      'target_name': 'modules_tests_apk',
       'type': 'none',
       'variables': {
-        'test_suite_name': 'modules_integrationtests',
-        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)modules_integrationtests<(SHARED_LIB_SUFFIX)',
+        'test_suite_name': 'modules_tests',
+        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)modules_tests<(SHARED_LIB_SUFFIX)',
       },
       'dependencies': [
-        '<(webrtc_root)/modules/modules.gyp:modules_integrationtests',
+        '<(webrtc_root)/modules/modules.gyp:modules_tests',
       ],
       'includes': [
         '../../../build/apk_test.gypi',
diff --git a/webrtc/build/apk_tests_noop.gyp b/webrtc/build/apk_tests_noop.gyp
index 2c51703b8..a86b159b2 100644
--- a/webrtc/build/apk_tests_noop.gyp
+++ b/webrtc/build/apk_tests_noop.gyp
@@ -26,7 +26,7 @@
       'type': 'none',
     },
     {
-      'target_name': 'modules_integrationtests_apk',
+      'target_name': 'modules_tests_apk',
       'type': 'none',
     },
     {
diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi
index a2463f64d..65f35052e 100644
--- a/webrtc/modules/audio_device/audio_device.gypi
+++ b/webrtc/modules/audio_device/audio_device.gypi
@@ -187,7 +187,7 @@
     ['include_tests==1', {
       'targets': [
         {
-          'target_name': 'audio_device_integrationtests',
+          'target_name': 'audio_device_tests',
          'type': 'executable',
          'dependencies': [
             'audio_device',
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index ed6197a6e..75bf7bf2b 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -257,7 +257,7 @@
           ],
         },
         {
-          'target_name': 'modules_integrationtests',
+          'target_name': 'modules_tests',
           'type': '<(gtest_target_type)',
           'dependencies': [
             'audio_coding_module',
@@ -326,10 +326,10 @@
               ],
             },
             {
-              'target_name': 'modules_integrationtests_apk_target',
+              'target_name': 'modules_tests_apk_target',
               'type': 'none',
               'dependencies': [
-                '<(apk_tests_path):modules_integrationtests_apk',
+                '<(apk_tests_path):modules_tests_apk',
               ],
             },
           ],
diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi
index 05f078b09..6086fb942 100644
--- a/webrtc/modules/video_capture/video_capture.gypi
+++ b/webrtc/modules/video_capture/video_capture.gypi
@@ -136,7 +136,7 @@
     ['include_tests==1', {
       'targets': [
         {
-          'target_name': 'video_capture_integrationtests',
+          'target_name': 'video_capture_tests',
           'type': 'executable',
           'dependencies': [
             'video_capture_module',
diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi
index 9f6d4864f..83802c036 100644
--- a/webrtc/modules/video_render/video_render.gypi
+++ b/webrtc/modules/video_render/video_render.gypi
@@ -160,7 +160,7 @@
     ['include_tests==1', {
       'targets': [
         {
-          'target_name': 'video_render_integrationtests',
+          'target_name': 'video_render_tests',
           'type': 'executable',
           'dependencies': [
             'video_render_module',
diff --git a/webrtc/video_engine/test/tests.gypi b/webrtc/video_engine/test/tests.gypi
index 1f89c7bdf..df0cad7bb 100644
--- a/webrtc/video_engine/test/tests.gypi
+++ b/webrtc/video_engine/test/tests.gypi
@@ -126,7 +126,7 @@
       ],
     },
     {
-      'target_name': 'video_full_stack',
+      'target_name': 'video_full_stack_tests',
       'type': 'executable',
       'sources': [
         'full_stack.cc',