diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7f642b39a0..f102bb43b0 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -351,7 +351,7 @@ if(BUILD_TESTING)
 
   # add a bunch of standard build-and-test style tests
   ADD_TEST_MACRO(CommandLineTest CommandLineTest)
-  ADD_TEST_MACRO(FindPackageTest FindPackageTest)
+  ADD_TEST_MACRO(FindPackageCMakeTest FindPackageCMakeTest)
   ADD_TEST_MACRO(StringFileTest StringFileTest)
   ADD_TEST_MACRO(TryCompile TryCompile)
   ADD_TEST_MACRO(SystemInformation SystemInformation)
diff --git a/Tests/FindPackageTest/.gitignore b/Tests/FindPackageCMakeTest/.gitignore
similarity index 100%
rename from Tests/FindPackageTest/.gitignore
rename to Tests/FindPackageCMakeTest/.gitignore
diff --git a/Tests/FindPackageTest/A/wibble-config.cmake b/Tests/FindPackageCMakeTest/A/wibble-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/A/wibble-config.cmake
rename to Tests/FindPackageCMakeTest/A/wibble-config.cmake
diff --git a/Tests/FindPackageTest/B/wibble-config.cmake b/Tests/FindPackageCMakeTest/B/wibble-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/B/wibble-config.cmake
rename to Tests/FindPackageCMakeTest/B/wibble-config.cmake
diff --git a/Tests/FindPackageTest/Baz 1.1/BazConfig.cmake b/Tests/FindPackageCMakeTest/Baz 1.1/BazConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/Baz 1.1/BazConfig.cmake
rename to Tests/FindPackageCMakeTest/Baz 1.1/BazConfig.cmake
diff --git a/Tests/FindPackageTest/Baz 1.1/BazConfigVersion.cmake b/Tests/FindPackageCMakeTest/Baz 1.1/BazConfigVersion.cmake
similarity index 100%
rename from Tests/FindPackageTest/Baz 1.1/BazConfigVersion.cmake
rename to Tests/FindPackageCMakeTest/Baz 1.1/BazConfigVersion.cmake
diff --git a/Tests/FindPackageTest/Baz 1.2/CMake/BazConfig.cmake b/Tests/FindPackageCMakeTest/Baz 1.2/CMake/BazConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/Baz 1.2/CMake/BazConfig.cmake
rename to Tests/FindPackageCMakeTest/Baz 1.2/CMake/BazConfig.cmake
diff --git a/Tests/FindPackageTest/Baz 1.2/CMake/BazConfigVersion.cmake b/Tests/FindPackageCMakeTest/Baz 1.2/CMake/BazConfigVersion.cmake
similarity index 100%
rename from Tests/FindPackageTest/Baz 1.2/CMake/BazConfigVersion.cmake
rename to Tests/FindPackageCMakeTest/Baz 1.2/CMake/BazConfigVersion.cmake
diff --git a/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfig.cmake b/Tests/FindPackageCMakeTest/Baz 1.3/lib/cmake/Baz/BazConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfig.cmake
rename to Tests/FindPackageCMakeTest/Baz 1.3/lib/cmake/Baz/BazConfig.cmake
diff --git a/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake b/Tests/FindPackageCMakeTest/Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake
similarity index 100%
rename from Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake
rename to Tests/FindPackageCMakeTest/Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake
diff --git a/Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfig.cmake b/Tests/FindPackageCMakeTest/Baz 2.0/share/Baz 2/BazConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfig.cmake
rename to Tests/FindPackageCMakeTest/Baz 2.0/share/Baz 2/BazConfig.cmake
diff --git a/Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfigVersion.cmake b/Tests/FindPackageCMakeTest/Baz 2.0/share/Baz 2/BazConfigVersion.cmake
similarity index 100%
rename from Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfigVersion.cmake
rename to Tests/FindPackageCMakeTest/Baz 2.0/share/Baz 2/BazConfigVersion.cmake
diff --git a/Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfig.cmake b/Tests/FindPackageCMakeTest/Baz 2.1/lib/Baz 2/cmake/BazConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfig.cmake
rename to Tests/FindPackageCMakeTest/Baz 2.1/lib/Baz 2/cmake/BazConfig.cmake
diff --git a/Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfigVersion.cmake b/Tests/FindPackageCMakeTest/Baz 2.1/lib/Baz 2/cmake/BazConfigVersion.cmake
similarity index 100%
rename from Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfigVersion.cmake
rename to Tests/FindPackageCMakeTest/Baz 2.1/lib/Baz 2/cmake/BazConfigVersion.cmake
diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageCMakeTest/CMakeLists.txt
similarity index 97%
rename from Tests/FindPackageTest/CMakeLists.txt
rename to Tests/FindPackageCMakeTest/CMakeLists.txt
index 46940a33e7..772be08014 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageCMakeTest/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
-project(FindPackageTest)
+project(FindPackageCMakeTest)
 
 # Protect tests from running inside the default install prefix.
 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix")
@@ -22,7 +22,7 @@ find_package(NotAPackage QUIET)
 # Look for a package that has an advanced find module.
 find_package(Boost QUIET)
 
-add_executable(FindPackageTest FindPackageTest.cxx)
+add_executable(FindPackageCMakeTest FindPackageTest.cxx)
 
 # test behavior of cmFindBase wrt. the CMAKE_PREFIX_PATH variable
 # foo.h should be found in ${CMAKE_CURRENT_SOURCE_DIR}/include:
@@ -67,9 +67,9 @@ endif()
 set(CMakeTestSystemPackage "")
 if(WIN32 AND NOT CYGWIN)
   # Try writing a value to the system package registry.
-  set(_data "${FindPackageTest_SOURCE_DIR}/SystemPackage")
+  set(_data "${FindPackageCMakeTest_SOURCE_DIR}/SystemPackage")
   set(_key "HKLM\\Software\\Kitware\\CMake\\Packages\\CMakeTestSystemPackage")
-  set(_file "${FindPackageTest_BINARY_DIR}/CMakeTestSystemPackage.data")
+  set(_file "${FindPackageCMakeTest_BINARY_DIR}/CMakeTestSystemPackage.data")
   file(WRITE ${_file} "${_data}\n")
   execute_process(
     COMMAND ${CMAKE_COMMAND} -E md5sum ${_file}
@@ -383,8 +383,8 @@ string(APPEND version ".${v}")
 
 message(STATUS "Preparing export(PACKAGE) test project")
 try_compile(EXPORTER_COMPILED
-  ${FindPackageTest_BINARY_DIR}/Exporter-build
-  ${FindPackageTest_SOURCE_DIR}/Exporter
+  ${FindPackageCMakeTest_BINARY_DIR}/Exporter-build
+  ${FindPackageCMakeTest_SOURCE_DIR}/Exporter
   CMakeTestExportPackage dummy
   CMAKE_FLAGS "-UCMAKE_EXPORT_NO_PACKAGE_REGISTRY"
     "-DCMAKE_POLICY_DEFAULT_CMP0090:STRING=OLD"
@@ -434,15 +434,15 @@ unset(CMAKE_FIND_USE_PACKAGE_REGISTRY)
 unset(CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY)
 
 message(STATUS "Remove export(PACKAGE) test project")
-file(REMOVE_RECURSE ${FindPackageTest_BINARY_DIR}/Exporter-build)
+file(REMOVE_RECURSE ${FindPackageCMakeTest_BINARY_DIR}/Exporter-build)
 set(CMakeTestExportPackage_DIR "" CACHE FILEPATH
   "Wipe out find results for testing." FORCE)
 find_package(CMakeTestExportPackage QUIET) # Should clean the user package cache
 #
 message(STATUS "Preparing export(PACKAGE) test project with CMAKE_EXPORT_NO_PACKAGE_REGISTRY=TRUE")
 try_compile(EXPORTER_COMPILED
-  ${FindPackageTest_BINARY_DIR}/Exporter-build
-  ${FindPackageTest_SOURCE_DIR}/Exporter
+  ${FindPackageCMakeTest_BINARY_DIR}/Exporter-build
+  ${FindPackageCMakeTest_SOURCE_DIR}/Exporter
   CMakeTestExportPackage dummy
   CMAKE_FLAGS "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY:BOOL=TRUE"
     -Dversion=${version}
@@ -454,12 +454,12 @@ if(CMakeTestExportPackage_FOUND)
 endif()
 
 message(STATUS "Remove export(PACKAGE) test project")
-file(REMOVE_RECURSE ${FindPackageTest_BINARY_DIR}/Exporter-build)
+file(REMOVE_RECURSE ${FindPackageCMakeTest_BINARY_DIR}/Exporter-build)
 
 message(STATUS "Preparing export(PACKAGE) test project with POLICY CMP0090=NEW")
 try_compile(EXPORTER_COMPILED
-  ${FindPackageTest_BINARY_DIR}/Exporter-build
-  ${FindPackageTest_SOURCE_DIR}/Exporter
+  ${FindPackageCMakeTest_BINARY_DIR}/Exporter-build
+  ${FindPackageCMakeTest_SOURCE_DIR}/Exporter
   CMakeTestExportPackage dummy
   CMAKE_FLAGS
    "-DCMAKE_POLICY_DEFAULT_CMP0090:STRING=NEW"
diff --git a/Tests/FindPackageTest/Exporter/CMakeLists.txt b/Tests/FindPackageCMakeTest/Exporter/CMakeLists.txt
similarity index 100%
rename from Tests/FindPackageTest/Exporter/CMakeLists.txt
rename to Tests/FindPackageCMakeTest/Exporter/CMakeLists.txt
diff --git a/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfig.cmake.in b/Tests/FindPackageCMakeTest/Exporter/CMakeTestExportPackageConfig.cmake.in
similarity index 100%
rename from Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfig.cmake.in
rename to Tests/FindPackageCMakeTest/Exporter/CMakeTestExportPackageConfig.cmake.in
diff --git a/Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in b/Tests/FindPackageCMakeTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in
similarity index 100%
rename from Tests/FindPackageTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in
rename to Tests/FindPackageCMakeTest/Exporter/CMakeTestExportPackageConfigVersion.cmake.in
diff --git a/Tests/FindPackageTest/Exporter/dummy.c b/Tests/FindPackageCMakeTest/Exporter/dummy.c
similarity index 100%
rename from Tests/FindPackageTest/Exporter/dummy.c
rename to Tests/FindPackageCMakeTest/Exporter/dummy.c
diff --git a/Tests/FindPackageTest/FindLotsOfComponents.cmake b/Tests/FindPackageCMakeTest/FindLotsOfComponents.cmake
similarity index 100%
rename from Tests/FindPackageTest/FindLotsOfComponents.cmake
rename to Tests/FindPackageCMakeTest/FindLotsOfComponents.cmake
diff --git a/Tests/FindPackageTest/FindPackageHandleStandardArgs.cmake b/Tests/FindPackageCMakeTest/FindPackageHandleStandardArgs.cmake
similarity index 100%
rename from Tests/FindPackageTest/FindPackageHandleStandardArgs.cmake
rename to Tests/FindPackageCMakeTest/FindPackageHandleStandardArgs.cmake
diff --git a/Tests/FindPackageTest/FindPackageTest.cxx b/Tests/FindPackageCMakeTest/FindPackageTest.cxx
similarity index 100%
rename from Tests/FindPackageTest/FindPackageTest.cxx
rename to Tests/FindPackageCMakeTest/FindPackageTest.cxx
diff --git a/Tests/FindPackageTest/FindRecursiveA.cmake b/Tests/FindPackageCMakeTest/FindRecursiveA.cmake
similarity index 100%
rename from Tests/FindPackageTest/FindRecursiveA.cmake
rename to Tests/FindPackageCMakeTest/FindRecursiveA.cmake
diff --git a/Tests/FindPackageTest/FindRecursiveB.cmake b/Tests/FindPackageCMakeTest/FindRecursiveB.cmake
similarity index 100%
rename from Tests/FindPackageTest/FindRecursiveB.cmake
rename to Tests/FindPackageCMakeTest/FindRecursiveB.cmake
diff --git a/Tests/FindPackageTest/FindRecursiveC.cmake b/Tests/FindPackageCMakeTest/FindRecursiveC.cmake
similarity index 100%
rename from Tests/FindPackageTest/FindRecursiveC.cmake
rename to Tests/FindPackageCMakeTest/FindRecursiveC.cmake
diff --git a/Tests/FindPackageTest/FindSomePackage.cmake b/Tests/FindPackageCMakeTest/FindSomePackage.cmake
similarity index 100%
rename from Tests/FindPackageTest/FindSomePackage.cmake
rename to Tests/FindPackageCMakeTest/FindSomePackage.cmake
diff --git a/Tests/FindPackageTest/FindUpperCasePackage.cmake b/Tests/FindPackageCMakeTest/FindUpperCasePackage.cmake
similarity index 100%
rename from Tests/FindPackageTest/FindUpperCasePackage.cmake
rename to Tests/FindPackageCMakeTest/FindUpperCasePackage.cmake
diff --git a/Tests/FindPackageTest/FindVersionTestA.cmake b/Tests/FindPackageCMakeTest/FindVersionTestA.cmake
similarity index 100%
rename from Tests/FindPackageTest/FindVersionTestA.cmake
rename to Tests/FindPackageCMakeTest/FindVersionTestA.cmake
diff --git a/Tests/FindPackageTest/FindVersionTestB.cmake b/Tests/FindPackageCMakeTest/FindVersionTestB.cmake
similarity index 100%
rename from Tests/FindPackageTest/FindVersionTestB.cmake
rename to Tests/FindPackageCMakeTest/FindVersionTestB.cmake
diff --git a/Tests/FindPackageTest/FindVersionTestC.cmake b/Tests/FindPackageCMakeTest/FindVersionTestC.cmake
similarity index 100%
rename from Tests/FindPackageTest/FindVersionTestC.cmake
rename to Tests/FindPackageCMakeTest/FindVersionTestC.cmake
diff --git a/Tests/FindPackageTest/FindVersionTestD.cmake b/Tests/FindPackageCMakeTest/FindVersionTestD.cmake
similarity index 100%
rename from Tests/FindPackageTest/FindVersionTestD.cmake
rename to Tests/FindPackageCMakeTest/FindVersionTestD.cmake
diff --git a/Tests/FindPackageTest/PreferConfig/ABCConfig.cmake b/Tests/FindPackageCMakeTest/PreferConfig/ABCConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/PreferConfig/ABCConfig.cmake
rename to Tests/FindPackageCMakeTest/PreferConfig/ABCConfig.cmake
diff --git a/Tests/FindPackageTest/PreferConfig/FindABC.cmake b/Tests/FindPackageCMakeTest/PreferConfig/FindABC.cmake
similarity index 100%
rename from Tests/FindPackageTest/PreferConfig/FindABC.cmake
rename to Tests/FindPackageCMakeTest/PreferConfig/FindABC.cmake
diff --git a/Tests/FindPackageTest/PreferConfigOnlyModule/FindACME.cmake b/Tests/FindPackageCMakeTest/PreferConfigOnlyModule/FindACME.cmake
similarity index 100%
rename from Tests/FindPackageTest/PreferConfigOnlyModule/FindACME.cmake
rename to Tests/FindPackageCMakeTest/PreferConfigOnlyModule/FindACME.cmake
diff --git a/Tests/FindPackageTest/PreferConfigRecurse/ACMEConfig.cmake b/Tests/FindPackageCMakeTest/PreferConfigRecurse/ACMEConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/PreferConfigRecurse/ACMEConfig.cmake
rename to Tests/FindPackageCMakeTest/PreferConfigRecurse/ACMEConfig.cmake
diff --git a/Tests/FindPackageTest/PreferConfigRecurse/FindACME.cmake b/Tests/FindPackageCMakeTest/PreferConfigRecurse/FindACME.cmake
similarity index 100%
rename from Tests/FindPackageTest/PreferConfigRecurse/FindACME.cmake
rename to Tests/FindPackageCMakeTest/PreferConfigRecurse/FindACME.cmake
diff --git a/Tests/FindPackageTest/RelocatableConfig.cmake.in b/Tests/FindPackageCMakeTest/RelocatableConfig.cmake.in
similarity index 100%
rename from Tests/FindPackageTest/RelocatableConfig.cmake.in
rename to Tests/FindPackageCMakeTest/RelocatableConfig.cmake.in
diff --git a/Tests/FindPackageTest/SortFramework.framework/Versions/3.1.1/Resources/CMake/SortFrameworkConfig.cmake b/Tests/FindPackageCMakeTest/SortFramework.framework/Versions/3.1.1/Resources/CMake/SortFrameworkConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/SortFramework.framework/Versions/3.1.1/Resources/CMake/SortFrameworkConfig.cmake
rename to Tests/FindPackageCMakeTest/SortFramework.framework/Versions/3.1.1/Resources/CMake/SortFrameworkConfig.cmake
diff --git a/Tests/FindPackageTest/SortFramework.framework/Versions/3.1.1/Resources/CMake/SortFrameworkConfigVersion.cmake b/Tests/FindPackageCMakeTest/SortFramework.framework/Versions/3.1.1/Resources/CMake/SortFrameworkConfigVersion.cmake
similarity index 100%
rename from Tests/FindPackageTest/SortFramework.framework/Versions/3.1.1/Resources/CMake/SortFrameworkConfigVersion.cmake
rename to Tests/FindPackageCMakeTest/SortFramework.framework/Versions/3.1.1/Resources/CMake/SortFrameworkConfigVersion.cmake
diff --git a/Tests/FindPackageTest/SortFramework.framework/Versions/3.10.1/Resources/CMake/SortFrameworkConfig.cmake b/Tests/FindPackageCMakeTest/SortFramework.framework/Versions/3.10.1/Resources/CMake/SortFrameworkConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/SortFramework.framework/Versions/3.10.1/Resources/CMake/SortFrameworkConfig.cmake
rename to Tests/FindPackageCMakeTest/SortFramework.framework/Versions/3.10.1/Resources/CMake/SortFrameworkConfig.cmake
diff --git a/Tests/FindPackageTest/SortFramework.framework/Versions/3.10.1/Resources/CMake/SortFrameworkConfigVersion.cmake b/Tests/FindPackageCMakeTest/SortFramework.framework/Versions/3.10.1/Resources/CMake/SortFrameworkConfigVersion.cmake
similarity index 100%
rename from Tests/FindPackageTest/SortFramework.framework/Versions/3.10.1/Resources/CMake/SortFrameworkConfigVersion.cmake
rename to Tests/FindPackageCMakeTest/SortFramework.framework/Versions/3.10.1/Resources/CMake/SortFrameworkConfigVersion.cmake
diff --git a/Tests/FindPackageTest/SortLib-3.1.1/SortLibConfig.cmake b/Tests/FindPackageCMakeTest/SortLib-3.1.1/SortLibConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/SortLib-3.1.1/SortLibConfig.cmake
rename to Tests/FindPackageCMakeTest/SortLib-3.1.1/SortLibConfig.cmake
diff --git a/Tests/FindPackageTest/SortLib-3.1.1/SortLibConfigVersion.cmake b/Tests/FindPackageCMakeTest/SortLib-3.1.1/SortLibConfigVersion.cmake
similarity index 100%
rename from Tests/FindPackageTest/SortLib-3.1.1/SortLibConfigVersion.cmake
rename to Tests/FindPackageCMakeTest/SortLib-3.1.1/SortLibConfigVersion.cmake
diff --git a/Tests/FindPackageTest/SortLib-3.10.1/SortLibConfig.cmake b/Tests/FindPackageCMakeTest/SortLib-3.10.1/SortLibConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/SortLib-3.10.1/SortLibConfig.cmake
rename to Tests/FindPackageCMakeTest/SortLib-3.10.1/SortLibConfig.cmake
diff --git a/Tests/FindPackageTest/SortLib-3.10.1/SortLibConfigVersion.cmake b/Tests/FindPackageCMakeTest/SortLib-3.10.1/SortLibConfigVersion.cmake
similarity index 100%
rename from Tests/FindPackageTest/SortLib-3.10.1/SortLibConfigVersion.cmake
rename to Tests/FindPackageCMakeTest/SortLib-3.10.1/SortLibConfigVersion.cmake
diff --git a/Tests/FindPackageTest/SystemPackage/CMakeTestSystemPackageConfig.cmake b/Tests/FindPackageCMakeTest/SystemPackage/CMakeTestSystemPackageConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/SystemPackage/CMakeTestSystemPackageConfig.cmake
rename to Tests/FindPackageCMakeTest/SystemPackage/CMakeTestSystemPackageConfig.cmake
diff --git a/Tests/FindPackageTest/TApp.app/Contents/Resources/TAppConfig.cmake b/Tests/FindPackageCMakeTest/TApp.app/Contents/Resources/TAppConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/TApp.app/Contents/Resources/TAppConfig.cmake
rename to Tests/FindPackageCMakeTest/TApp.app/Contents/Resources/TAppConfig.cmake
diff --git a/Tests/FindPackageTest/TApp.app/Contents/Resources/cmake/tapp-config.cmake b/Tests/FindPackageCMakeTest/TApp.app/Contents/Resources/cmake/tapp-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/TApp.app/Contents/Resources/cmake/tapp-config.cmake
rename to Tests/FindPackageCMakeTest/TApp.app/Contents/Resources/cmake/tapp-config.cmake
diff --git a/Tests/FindPackageTest/TFramework.framework/Versions/A/Resources/CMake/TFrameworkConfig.cmake b/Tests/FindPackageCMakeTest/TFramework.framework/Versions/A/Resources/CMake/TFrameworkConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/TFramework.framework/Versions/A/Resources/CMake/TFrameworkConfig.cmake
rename to Tests/FindPackageCMakeTest/TFramework.framework/Versions/A/Resources/CMake/TFrameworkConfig.cmake
diff --git a/Tests/FindPackageTest/TFramework.framework/Versions/A/Resources/tframework-config.cmake b/Tests/FindPackageCMakeTest/TFramework.framework/Versions/A/Resources/tframework-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/TFramework.framework/Versions/A/Resources/tframework-config.cmake
rename to Tests/FindPackageCMakeTest/TFramework.framework/Versions/A/Resources/tframework-config.cmake
diff --git a/Tests/FindPackageTest/cmake/SetFoundFALSEConfig.cmake b/Tests/FindPackageCMakeTest/cmake/SetFoundFALSEConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/cmake/SetFoundFALSEConfig.cmake
rename to Tests/FindPackageCMakeTest/cmake/SetFoundFALSEConfig.cmake
diff --git a/Tests/FindPackageTest/cmake/SetFoundResolvedConfig.cmake b/Tests/FindPackageCMakeTest/cmake/SetFoundResolvedConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/cmake/SetFoundResolvedConfig.cmake
rename to Tests/FindPackageCMakeTest/cmake/SetFoundResolvedConfig.cmake
diff --git a/Tests/FindPackageTest/cmake/SetFoundTRUEConfig.cmake b/Tests/FindPackageCMakeTest/cmake/SetFoundTRUEConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/cmake/SetFoundTRUEConfig.cmake
rename to Tests/FindPackageCMakeTest/cmake/SetFoundTRUEConfig.cmake
diff --git a/Tests/FindPackageTest/include/foo.h b/Tests/FindPackageCMakeTest/include/foo.h
similarity index 100%
rename from Tests/FindPackageTest/include/foo.h
rename to Tests/FindPackageCMakeTest/include/foo.h
diff --git a/Tests/FindPackageTest/lib/Bar/BarConfig.cmake b/Tests/FindPackageCMakeTest/lib/Bar/BarConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/Bar/BarConfig.cmake
rename to Tests/FindPackageCMakeTest/lib/Bar/BarConfig.cmake
diff --git a/Tests/FindPackageTest/lib/Bar/cmake/bar-config.cmake b/Tests/FindPackageCMakeTest/lib/Bar/cmake/bar-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/Bar/cmake/bar-config.cmake
rename to Tests/FindPackageCMakeTest/lib/Bar/cmake/bar-config.cmake
diff --git a/Tests/FindPackageTest/lib/Blub/BlubConfig.cmake b/Tests/FindPackageCMakeTest/lib/Blub/BlubConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/Blub/BlubConfig.cmake
rename to Tests/FindPackageCMakeTest/lib/Blub/BlubConfig.cmake
diff --git a/Tests/FindPackageTest/lib/RecursiveA/recursivea-config.cmake b/Tests/FindPackageCMakeTest/lib/RecursiveA/recursivea-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/RecursiveA/recursivea-config.cmake
rename to Tests/FindPackageCMakeTest/lib/RecursiveA/recursivea-config.cmake
diff --git a/Tests/FindPackageTest/lib/SortLib-4.0.0/SortLibConfig.cmake b/Tests/FindPackageCMakeTest/lib/SortLib-4.0.0/SortLibConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/SortLib-4.0.0/SortLibConfig.cmake
rename to Tests/FindPackageCMakeTest/lib/SortLib-4.0.0/SortLibConfig.cmake
diff --git a/Tests/FindPackageTest/lib/SortLib-4.0.0/SortLibConfigVersion.cmake b/Tests/FindPackageCMakeTest/lib/SortLib-4.0.0/SortLibConfigVersion.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/SortLib-4.0.0/SortLibConfigVersion.cmake
rename to Tests/FindPackageCMakeTest/lib/SortLib-4.0.0/SortLibConfigVersion.cmake
diff --git a/Tests/FindPackageTest/lib/TApp/TAppConfig.cmake b/Tests/FindPackageCMakeTest/lib/TApp/TAppConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/TApp/TAppConfig.cmake
rename to Tests/FindPackageCMakeTest/lib/TApp/TAppConfig.cmake
diff --git a/Tests/FindPackageTest/lib/arch/Bar/BarConfig.cmake b/Tests/FindPackageCMakeTest/lib/arch/Bar/BarConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/arch/Bar/BarConfig.cmake
rename to Tests/FindPackageCMakeTest/lib/arch/Bar/BarConfig.cmake
diff --git a/Tests/FindPackageTest/lib/arch/cmake/zot-4.0/zot-config-version.cmake b/Tests/FindPackageCMakeTest/lib/arch/cmake/zot-4.0/zot-config-version.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/arch/cmake/zot-4.0/zot-config-version.cmake
rename to Tests/FindPackageCMakeTest/lib/arch/cmake/zot-4.0/zot-config-version.cmake
diff --git a/Tests/FindPackageTest/lib/arch/cmake/zot-4.0/zot-config.cmake b/Tests/FindPackageCMakeTest/lib/arch/cmake/zot-4.0/zot-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/arch/cmake/zot-4.0/zot-config.cmake
rename to Tests/FindPackageCMakeTest/lib/arch/cmake/zot-4.0/zot-config.cmake
diff --git a/Tests/FindPackageTest/lib/arch/foo-1.2/CMake/FooConfig.cmake b/Tests/FindPackageCMakeTest/lib/arch/foo-1.2/CMake/FooConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/arch/foo-1.2/CMake/FooConfig.cmake
rename to Tests/FindPackageCMakeTest/lib/arch/foo-1.2/CMake/FooConfig.cmake
diff --git a/Tests/FindPackageTest/lib/arch/zot-3.1/zot-config-version.cmake b/Tests/FindPackageCMakeTest/lib/arch/zot-3.1/zot-config-version.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/arch/zot-3.1/zot-config-version.cmake
rename to Tests/FindPackageCMakeTest/lib/arch/zot-3.1/zot-config-version.cmake
diff --git a/Tests/FindPackageTest/lib/arch/zot-3.1/zot-config.cmake b/Tests/FindPackageCMakeTest/lib/arch/zot-3.1/zot-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/arch/zot-3.1/zot-config.cmake
rename to Tests/FindPackageCMakeTest/lib/arch/zot-3.1/zot-config.cmake
diff --git a/Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config-version.cmake b/Tests/FindPackageCMakeTest/lib/cmake/zot-3.1/zot-config-version.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config-version.cmake
rename to Tests/FindPackageCMakeTest/lib/cmake/zot-3.1/zot-config-version.cmake
diff --git a/Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config.cmake b/Tests/FindPackageCMakeTest/lib/cmake/zot-3.1/zot-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/cmake/zot-3.1/zot-config.cmake
rename to Tests/FindPackageCMakeTest/lib/cmake/zot-3.1/zot-config.cmake
diff --git a/Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config-version.cmake b/Tests/FindPackageCMakeTest/lib/cmake/zot-4.0/zot-config-version.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config-version.cmake
rename to Tests/FindPackageCMakeTest/lib/cmake/zot-4.0/zot-config-version.cmake
diff --git a/Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config.cmake b/Tests/FindPackageCMakeTest/lib/cmake/zot-4.0/zot-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config.cmake
rename to Tests/FindPackageCMakeTest/lib/cmake/zot-4.0/zot-config.cmake
diff --git a/Tests/FindPackageTest/lib/foo-1.2/CMake/FooConfig.cmake b/Tests/FindPackageCMakeTest/lib/foo-1.2/CMake/FooConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/foo-1.2/CMake/FooConfig.cmake
rename to Tests/FindPackageCMakeTest/lib/foo-1.2/CMake/FooConfig.cmake
diff --git a/Tests/FindPackageTest/lib/foo-1.2/foo-config.cmake b/Tests/FindPackageCMakeTest/lib/foo-1.2/foo-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/foo-1.2/foo-config.cmake
rename to Tests/FindPackageCMakeTest/lib/foo-1.2/foo-config.cmake
diff --git a/Tests/FindPackageTest/lib/suffix/test/SuffixTestConfig.cmake b/Tests/FindPackageCMakeTest/lib/suffix/test/SuffixTestConfig.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/suffix/test/SuffixTestConfig.cmake
rename to Tests/FindPackageCMakeTest/lib/suffix/test/SuffixTestConfig.cmake
diff --git a/Tests/FindPackageTest/lib/suffix/test/SuffixTestConfigVersion.cmake b/Tests/FindPackageCMakeTest/lib/suffix/test/SuffixTestConfigVersion.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/suffix/test/SuffixTestConfigVersion.cmake
rename to Tests/FindPackageCMakeTest/lib/suffix/test/SuffixTestConfigVersion.cmake
diff --git a/Tests/FindPackageTest/lib/zot-1.0/zot-config.cmake b/Tests/FindPackageCMakeTest/lib/zot-1.0/zot-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/zot-1.0/zot-config.cmake
rename to Tests/FindPackageCMakeTest/lib/zot-1.0/zot-config.cmake
diff --git a/Tests/FindPackageTest/lib/zot-2.0/zot-config-version.cmake b/Tests/FindPackageCMakeTest/lib/zot-2.0/zot-config-version.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/zot-2.0/zot-config-version.cmake
rename to Tests/FindPackageCMakeTest/lib/zot-2.0/zot-config-version.cmake
diff --git a/Tests/FindPackageTest/lib/zot-2.0/zot-config.cmake b/Tests/FindPackageCMakeTest/lib/zot-2.0/zot-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/zot-2.0/zot-config.cmake
rename to Tests/FindPackageCMakeTest/lib/zot-2.0/zot-config.cmake
diff --git a/Tests/FindPackageTest/lib/zot-3.0/zot-config-version.cmake b/Tests/FindPackageCMakeTest/lib/zot-3.0/zot-config-version.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/zot-3.0/zot-config-version.cmake
rename to Tests/FindPackageCMakeTest/lib/zot-3.0/zot-config-version.cmake
diff --git a/Tests/FindPackageTest/lib/zot-3.0/zot-config.cmake b/Tests/FindPackageCMakeTest/lib/zot-3.0/zot-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/zot-3.0/zot-config.cmake
rename to Tests/FindPackageCMakeTest/lib/zot-3.0/zot-config.cmake
diff --git a/Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake b/Tests/FindPackageCMakeTest/lib/zot-3.1/zot-config-version.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake
rename to Tests/FindPackageCMakeTest/lib/zot-3.1/zot-config-version.cmake
diff --git a/Tests/FindPackageTest/lib/zot-3.1/zot-config.cmake b/Tests/FindPackageCMakeTest/lib/zot-3.1/zot-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/zot-3.1/zot-config.cmake
rename to Tests/FindPackageCMakeTest/lib/zot-3.1/zot-config.cmake
diff --git a/Tests/FindPackageTest/lib/zot/zot-config-version.cmake b/Tests/FindPackageCMakeTest/lib/zot/zot-config-version.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/zot/zot-config-version.cmake
rename to Tests/FindPackageCMakeTest/lib/zot/zot-config-version.cmake
diff --git a/Tests/FindPackageTest/lib/zot/zot-config.cmake b/Tests/FindPackageCMakeTest/lib/zot/zot-config.cmake
similarity index 100%
rename from Tests/FindPackageTest/lib/zot/zot-config.cmake
rename to Tests/FindPackageCMakeTest/lib/zot/zot-config.cmake