diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory(arcanist)
+add_subdirectory(source-control-tools)
 add_subdirectory(devtools)
 
 include(PackageHelper)
diff --git a/contrib/arcanist/CMakeLists.txt b/contrib/arcanist/CMakeLists.txt
deleted file mode 100644
--- a/contrib/arcanist/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2019 The Bitcoin developers
-
-add_custom_target(check-arcanist)
-
-find_program(BASH_EXECUTABLE bash)
-
-set(ARCANIST_TESTS
-  ./test/test-autopatch.sh
-)
-
-foreach(TEST ${ARCANIST_TESTS})
-  get_filename_component(FILENAME ${TEST} NAME)
-  set(TESTNAME "check-arcanist-${FILENAME}")
-  add_custom_target(${TESTNAME}
-    COMMAND
-      "${BASH_EXECUTABLE}"
-      "${CMAKE_CURRENT_SOURCE_DIR}/${TEST}"
-    )
-  add_dependencies(check-arcanist ${TESTNAME})
-endforeach()
-
-add_dependencies(check check-arcanist)
-add_dependencies(check-all check-arcanist)
diff --git a/contrib/source-control-tools/CMakeLists.txt b/contrib/source-control-tools/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/contrib/source-control-tools/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Copyright (c) 2019 The Bitcoin developers
+
+add_custom_target(check-source-control-tools)
+
+find_program(BASH_EXECUTABLE bash)
+
+set(SOURCE_CONTROL_TOOLS_TESTS
+  ./test/test-autopatch.sh
+)
+
+foreach(TEST ${SOURCE_CONTROL_TOOLS_TESTS})
+  get_filename_component(FILENAME ${TEST} NAME)
+  set(TESTNAME "check-source-control-tools-${FILENAME}")
+  add_custom_target(${TESTNAME}
+    COMMAND
+      "${BASH_EXECUTABLE}"
+      "${CMAKE_CURRENT_SOURCE_DIR}/${TEST}"
+    )
+  add_dependencies(check-source-control-tools ${TESTNAME})
+endforeach()
+
+add_dependencies(check check-source-control-tools)
+add_dependencies(check-all check-source-control-tools)
diff --git a/contrib/arcanist/autopatch.sh b/contrib/source-control-tools/autopatch.sh
rename from contrib/arcanist/autopatch.sh
rename to contrib/source-control-tools/autopatch.sh
diff --git a/contrib/source-control-tools/test/.gitignore b/contrib/source-control-tools/test/.gitignore
new file mode 100644
--- /dev/null
+++ b/contrib/source-control-tools/test/.gitignore
@@ -0,0 +1 @@
+!*.patch
diff --git a/contrib/arcanist/test/test-autopatch.sh b/contrib/source-control-tools/test/test-autopatch.sh
rename from contrib/arcanist/test/test-autopatch.sh
rename to contrib/source-control-tools/test/test-autopatch.sh
diff --git a/contrib/arcanist/test/test-commit-message.sh b/contrib/source-control-tools/test/test-commit-message.sh
rename from contrib/arcanist/test/test-commit-message.sh
rename to contrib/source-control-tools/test/test-commit-message.sh
diff --git a/contrib/arcanist/test/test-commit.patch b/contrib/source-control-tools/test/test-commit.patch
rename from contrib/arcanist/test/test-commit.patch
rename to contrib/source-control-tools/test/test-commit.patch