diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-result.txt b/Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-result.txt
similarity index 100%
rename from Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-result.txt
rename to Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-result.txt
diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-stderr.txt b/Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-stderr.txt
similarity index 63%
rename from Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-stderr.txt
rename to Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-stderr.txt
index cddea3c18c..03a5a75c78 100644
--- a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-stderr.txt
+++ b/Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at CustomCommandDependencies-BadArgs.cmake:[0-9]+ \(add_custom_command\):
+CMake Error at CustomCommandDepends-BadArgs.cmake:[0-9]+ \(add_custom_command\):
   add_custom_command IMPLICIT_DEPENDS and DEPFILE can not both be specified.
 Call Stack \(most recent call first\):
   CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs.cmake b/Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs.cmake
similarity index 100%
rename from Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs.cmake
rename to Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs.cmake
diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-compiler-deps-legacy.cmake b/Tests/RunCMake/BuildDepends/CustomCommandDepends-compiler-deps-legacy.cmake
similarity index 100%
rename from Tests/RunCMake/BuildDepends/CustomCommandDependencies-compiler-deps-legacy.cmake
rename to Tests/RunCMake/BuildDepends/CustomCommandDepends-compiler-deps-legacy.cmake
diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies.cmake b/Tests/RunCMake/BuildDepends/CustomCommandDepends.cmake
similarity index 100%
rename from Tests/RunCMake/BuildDepends/CustomCommandDependencies.cmake
rename to Tests/RunCMake/BuildDepends/CustomCommandDepends.cmake
diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies.step1.cmake b/Tests/RunCMake/BuildDepends/CustomCommandDepends.step1.cmake
similarity index 100%
rename from Tests/RunCMake/BuildDepends/CustomCommandDependencies.step1.cmake
rename to Tests/RunCMake/BuildDepends/CustomCommandDepends.step1.cmake
diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies.step2.cmake b/Tests/RunCMake/BuildDepends/CustomCommandDepends.step2.cmake
similarity index 100%
rename from Tests/RunCMake/BuildDepends/CustomCommandDependencies.step2.cmake
rename to Tests/RunCMake/BuildDepends/CustomCommandDepends.step2.cmake
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
index 3df419a8b7..bc9d57f6f3 100644
--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
@@ -172,14 +172,14 @@ if ((RunCMake_GENERATOR STREQUAL "Unix Makefiles"
       AND MSVC_VERSION GREATER 1300
       AND CMAKE_C_COMPILER_ID STREQUAL "MSVC"))
   run_BuildDepends(CompileDepends)
-  run_BuildDepends(CustomCommandDependencies)
+  run_BuildDepends(CustomCommandDepends)
 endif()
 
 if (RunCMake_GENERATOR MATCHES "Makefiles")
-  run_cmake(CustomCommandDependencies-BadArgs)
-  run_cmake_with_options(CustomCommandDependencies-compiler-deps-legacy -DCMAKE_DEPENDS_USE_COMPILER=FALSE)
+  run_cmake(CustomCommandDepends-BadArgs)
+  run_cmake_with_options(CustomCommandDepends-compiler-deps-legacy -DCMAKE_DEPENDS_USE_COMPILER=FALSE)
   set(RunCMake_TEST_NO_CLEAN 1)
-  run_cmake_command(CustomCommandDependencies-compiler-deps-legacy ${CMAKE_COMMAND} --build . --config Debug)
+  run_cmake_command(CustomCommandDepends-compiler-deps-legacy ${CMAKE_COMMAND} --build . --config Debug)
   unset(RunCMake_TEST_NO_CLEAN)
 endif()