diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0bc6a7c..4c947b12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ if(BEMAN_USE_MODULES)
                 FILES
                     ${CMAKE_CURRENT_BINARY_DIR}/beman/execution/modules_export.hpp
     )
-    target_compile_definitions(beman_execution PUBLIC BEMAN_USE_MODULES)
+    # FIXME: target_compile_definitions(beman_execution PUBLIC BEMAN_HAS_MODULES)
 endif()
 
 if(BEMAN_USE_MODULES AND CMAKE_CXX_MODULE_STD)
diff --git a/cmake/cxx-modules-rules.cmake b/cmake/cxx-modules-rules.cmake
index b756b89f..71519fe0 100644
--- a/cmake/cxx-modules-rules.cmake
+++ b/cmake/cxx-modules-rules.cmake
@@ -91,7 +91,7 @@ endif()
 
 option(
     BEMAN_USE_STD_MODULE
-    "Check if 'import std;' is possible with the toolchain"
+    "Check if 'import std;' is possible with the toolchain?"
     OFF
 )
 message(STATUS "BEMAN_USE_STD_MODULE=${BEMAN_USE_STD_MODULE}")
@@ -110,7 +110,7 @@ if(BEMAN_USE_STD_MODULE)
         set(CMAKE_CXX_SCAN_FOR_MODULES ON)
         option(
             BEMAN_HAS_IMPORT_STD
-            "Build with import std; possible"
+            "Build with import std; is possible and used!"
             ${CMAKE_CXX_MODULE_STD}
         )
         message(STATUS "BEMAN_HAS_IMPORT_STD=${BEMAN_HAS_IMPORT_STD}")
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 807929fe..aadb6ccc 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -39,7 +39,8 @@ set(EXAMPLES
 )
 
 if(BEMAN_USE_MODULES)
-    # FIXME: not yet! list(APPEND EXAMPLES modules) # modules.cpp
+    # FIXME: not yet!
+    list(APPEND EXAMPLES modules) # modules.cpp
 endif()
 
 foreach(EXAMPLE ${EXAMPLES})
diff --git a/examples/modules.cpp b/examples/modules.cpp
index feab7927..a86f861c 100644
--- a/examples/modules.cpp
+++ b/examples/modules.cpp
@@ -1,10 +1,6 @@
 // examples/modules.cpp                                               -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef WIN32
-#undef BEMAN_HAS_IMPORT_STD
-#endif
-
 #ifdef BEMAN_HAS_IMPORT_STD
 import std;
 #else
@@ -18,21 +14,12 @@ import std;
 
 #endif
 
-#if defined(__cpp_modules) && __cpp_modules < 201907L
-
 #ifdef BEMAN_USE_MODULES
-#warning "__cpp_modules seems not usable!"
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
 #endif
 
-#else
-
-import beman.execution;
-
-#endif
-
 namespace ex = beman::execution;
 
 int main() {
diff --git a/tests/beman/execution/CMakeLists.txt b/tests/beman/execution/CMakeLists.txt
index 12a40d7a..53d5f332 100644
--- a/tests/beman/execution/CMakeLists.txt
+++ b/tests/beman/execution/CMakeLists.txt
@@ -124,7 +124,7 @@ foreach(test ${execution_tests})
     add_test(NAME ${TEST_EXE} COMMAND $<TARGET_FILE:${TEST_EXE}>)
 endforeach()
 
-if(BEMAN_EXECUTION_ENABLE_INSTALL)
+if(BEMAN_EXECUTION_ENABLE_INSTALL AND NOT CMAKE_SKIP_INSTALL_RULES)
     # test if the targets are usable from the install directory
     add_test(
         NAME install-to-stagedir
diff --git a/tests/beman/execution/exec-affine-on.test.cpp b/tests/beman/execution/exec-affine-on.test.cpp
index 781e0f39..0d790799 100644
--- a/tests/beman/execution/exec-affine-on.test.cpp
+++ b/tests/beman/execution/exec-affine-on.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-affine-on.test.cpp                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/affine_on.hpp>
diff --git a/tests/beman/execution/exec-associate.test.cpp b/tests/beman/execution/exec-associate.test.cpp
index ccb57d92..798a691e 100644
--- a/tests/beman/execution/exec-associate.test.cpp
+++ b/tests/beman/execution/exec-associate.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-associate.test.cpp                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/associate.hpp>
diff --git a/tests/beman/execution/exec-awaitable.test.cpp b/tests/beman/execution/exec-awaitable.test.cpp
index 9baf7120..ddc68b29 100644
--- a/tests/beman/execution/exec-awaitable.test.cpp
+++ b/tests/beman/execution/exec-awaitable.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-awaitable.test.cpp                -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/await_suspend_result.hpp>
diff --git a/tests/beman/execution/exec-bulk.test.cpp b/tests/beman/execution/exec-bulk.test.cpp
index f10b337a..f45b6685 100644
--- a/tests/beman/execution/exec-bulk.test.cpp
+++ b/tests/beman/execution/exec-bulk.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-bulk.test.cpp -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include "beman/execution/detail/get_completion_signatures.hpp"
diff --git a/tests/beman/execution/exec-env.test.cpp b/tests/beman/execution/exec-env.test.cpp
index 7c4d2fbc..2cf8569f 100644
--- a/tests/beman/execution/exec-env.test.cpp
+++ b/tests/beman/execution/exec-env.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-env.test.cpp                            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/env.hpp>
diff --git a/tests/beman/execution/exec-fwd-env.test.cpp b/tests/beman/execution/exec-fwd-env.test.cpp
index fc4ce68f..a64bb658 100644
--- a/tests/beman/execution/exec-fwd-env.test.cpp
+++ b/tests/beman/execution/exec-fwd-env.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-fwd-env.test.cpp                  -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/exec-general.test.cpp b/tests/beman/execution/exec-general.test.cpp
index b3eb6f4e..d2a0167f 100644
--- a/tests/beman/execution/exec-general.test.cpp
+++ b/tests/beman/execution/exec-general.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-general.test.cpp                  -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/exec-get-compl-sched.test.cpp b/tests/beman/execution/exec-get-compl-sched.test.cpp
index 61959035..9829335e 100644
--- a/tests/beman/execution/exec-get-compl-sched.test.cpp
+++ b/tests/beman/execution/exec-get-compl-sched.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-compl-sched.test.cpp          -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/get_completion_scheduler.hpp>
diff --git a/tests/beman/execution/exec-get-delegation-scheduler.test.cpp b/tests/beman/execution/exec-get-delegation-scheduler.test.cpp
index bbffd39f..e0dc7909 100644
--- a/tests/beman/execution/exec-get-delegation-scheduler.test.cpp
+++ b/tests/beman/execution/exec-get-delegation-scheduler.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-delegation-scheduler.test.cpp -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/get_delegation_scheduler.hpp>
diff --git a/tests/beman/execution/exec-get-domain.test.cpp b/tests/beman/execution/exec-get-domain.test.cpp
index 6ab623f1..cb49e744 100644
--- a/tests/beman/execution/exec-get-domain.test.cpp
+++ b/tests/beman/execution/exec-get-domain.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-domain.test.cpp               -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/exec-get-env.test.cpp b/tests/beman/execution/exec-get-env.test.cpp
index 3f8c5d84..436f154d 100644
--- a/tests/beman/execution/exec-get-env.test.cpp
+++ b/tests/beman/execution/exec-get-env.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-env.test.cpp                  -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/exec-get-scheduler.test.cpp b/tests/beman/execution/exec-get-scheduler.test.cpp
index 4f77adc5..f940ff53 100644
--- a/tests/beman/execution/exec-get-scheduler.test.cpp
+++ b/tests/beman/execution/exec-get-scheduler.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-scheduler.test.cpp            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/get_scheduler.hpp>
diff --git a/tests/beman/execution/exec-get-stop-token.test.cpp b/tests/beman/execution/exec-get-stop-token.test.cpp
index bfcbcef4..03fa880c 100644
--- a/tests/beman/execution/exec-get-stop-token.test.cpp
+++ b/tests/beman/execution/exec-get-stop-token.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-get-stop-token.test.cpp           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/exec-getcomplsigs.test.cpp b/tests/beman/execution/exec-getcomplsigs.test.cpp
index 1fe8e3e9..459f8870 100644
--- a/tests/beman/execution/exec-getcomplsigs.test.cpp
+++ b/tests/beman/execution/exec-getcomplsigs.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-getcomplsigs.test.cpp             -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/exec-into-variant.test.cpp b/tests/beman/execution/exec-into-variant.test.cpp
index b93dffaa..096ef92c 100644
--- a/tests/beman/execution/exec-into-variant.test.cpp
+++ b/tests/beman/execution/exec-into-variant.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-into-variant.test.cpp             -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/into_variant.hpp>
diff --git a/tests/beman/execution/exec-let.test.cpp b/tests/beman/execution/exec-let.test.cpp
index c95b0262..650d4d47 100644
--- a/tests/beman/execution/exec-let.test.cpp
+++ b/tests/beman/execution/exec-let.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-let.test.cpp                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/let.hpp>
diff --git a/tests/beman/execution/exec-opstate-start.test.cpp b/tests/beman/execution/exec-opstate-start.test.cpp
index 7d43e214..5a087a9d 100644
--- a/tests/beman/execution/exec-opstate-start.test.cpp
+++ b/tests/beman/execution/exec-opstate-start.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-opstate-start.test.cpp            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/exec-opstate.test.cpp b/tests/beman/execution/exec-opstate.test.cpp
index 9ef4b34a..fa0c7ff9 100644
--- a/tests/beman/execution/exec-opstate.test.cpp
+++ b/tests/beman/execution/exec-opstate.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-opstate.test.cpp                  -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/operation_state.hpp>
diff --git a/tests/beman/execution/exec-prop.test.cpp b/tests/beman/execution/exec-prop.test.cpp
index 74940901..9d4c198c 100644
--- a/tests/beman/execution/exec-prop.test.cpp
+++ b/tests/beman/execution/exec-prop.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-prop.test.cpp                           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/prop.hpp>
diff --git a/tests/beman/execution/exec-read-env.test.cpp b/tests/beman/execution/exec-read-env.test.cpp
index 2d8852be..89546747 100644
--- a/tests/beman/execution/exec-read-env.test.cpp
+++ b/tests/beman/execution/exec-read-env.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-read-env.test.cpp                 -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/read_env.hpp>
diff --git a/tests/beman/execution/exec-run-loop-general.test.cpp b/tests/beman/execution/exec-run-loop-general.test.cpp
index 7a1567aa..0b21ced8 100644
--- a/tests/beman/execution/exec-run-loop-general.test.cpp
+++ b/tests/beman/execution/exec-run-loop-general.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-run-loop-general.test.cpp         -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/run_loop.hpp>
diff --git a/tests/beman/execution/exec-run-loop-types.test.cpp b/tests/beman/execution/exec-run-loop-types.test.cpp
index b17d11f2..67f5252a 100644
--- a/tests/beman/execution/exec-run-loop-types.test.cpp
+++ b/tests/beman/execution/exec-run-loop-types.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-run-loop-types.test.cpp           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/run_loop.hpp>
diff --git a/tests/beman/execution/exec-sched.test.cpp b/tests/beman/execution/exec-sched.test.cpp
index 3e92f2a9..ee1e1164 100644
--- a/tests/beman/execution/exec-sched.test.cpp
+++ b/tests/beman/execution/exec-sched.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-sched.test.cpp                    -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/scheduler.hpp>
diff --git a/tests/beman/execution/exec-schedule-from.test.cpp b/tests/beman/execution/exec-schedule-from.test.cpp
index 0917274b..ae75b983 100644
--- a/tests/beman/execution/exec-schedule-from.test.cpp
+++ b/tests/beman/execution/exec-schedule-from.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-schedule-from.test.cpp            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/schedule_from.hpp>
diff --git a/tests/beman/execution/exec-schedule.test.cpp b/tests/beman/execution/exec-schedule.test.cpp
index 77fbf55e..82c1568e 100644
--- a/tests/beman/execution/exec-schedule.test.cpp
+++ b/tests/beman/execution/exec-schedule.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-schedule.test.cpp                 -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/schedule.hpp>
diff --git a/tests/beman/execution/exec-scope-concepts.test.cpp b/tests/beman/execution/exec-scope-concepts.test.cpp
index bad79a3e..b216f647 100644
--- a/tests/beman/execution/exec-scope-concepts.test.cpp
+++ b/tests/beman/execution/exec-scope-concepts.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-scope-concepts.test.cpp                 -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/scope_token.hpp>
diff --git a/tests/beman/execution/exec-scope-counting.test.cpp b/tests/beman/execution/exec-scope-counting.test.cpp
index 68e0d4b1..85eeca8d 100644
--- a/tests/beman/execution/exec-scope-counting.test.cpp
+++ b/tests/beman/execution/exec-scope-counting.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-scope-counting.test.cpp                 -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/counting_scope.hpp>
diff --git a/tests/beman/execution/exec-scope-simple-counting.test.cpp b/tests/beman/execution/exec-scope-simple-counting.test.cpp
index 70fa0d89..c9733448 100644
--- a/tests/beman/execution/exec-scope-simple-counting.test.cpp
+++ b/tests/beman/execution/exec-scope-simple-counting.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/exec-scope-simple-counting.test.cpp          -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/simple_counting_scope.hpp>
diff --git a/tests/beman/execution/exec-set-error.test.cpp b/tests/beman/execution/exec-set-error.test.cpp
index 43aadb94..446a3e4c 100644
--- a/tests/beman/execution/exec-set-error.test.cpp
+++ b/tests/beman/execution/exec-set-error.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-set-error.test.cpp                      -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/exec-set-stopped.test.cpp b/tests/beman/execution/exec-set-stopped.test.cpp
index e91a3a7a..f9bbf787 100644
--- a/tests/beman/execution/exec-set-stopped.test.cpp
+++ b/tests/beman/execution/exec-set-stopped.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-set-stopped.test.cpp              -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/exec-set-value.test.cpp b/tests/beman/execution/exec-set-value.test.cpp
index 7529fd29..bb79061e 100644
--- a/tests/beman/execution/exec-set-value.test.cpp
+++ b/tests/beman/execution/exec-set-value.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-set-value.test.cpp                -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/exec-snd-apply.test.cpp b/tests/beman/execution/exec-snd-apply.test.cpp
index 40f326c5..bd77e331 100644
--- a/tests/beman/execution/exec-snd-apply.test.cpp
+++ b/tests/beman/execution/exec-snd-apply.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-snd-apply.test.cpp                -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/apply_sender.hpp>
diff --git a/tests/beman/execution/exec-snd-transform.test.cpp b/tests/beman/execution/exec-snd-transform.test.cpp
index e3004884..814e92df 100644
--- a/tests/beman/execution/exec-snd-transform.test.cpp
+++ b/tests/beman/execution/exec-snd-transform.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-snd-transform.test.cpp            -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/transform_sender.hpp>
diff --git a/tests/beman/execution/exec-starts-on.test.cpp b/tests/beman/execution/exec-starts-on.test.cpp
index f6536ba7..78d3ea49 100644
--- a/tests/beman/execution/exec-starts-on.test.cpp
+++ b/tests/beman/execution/exec-starts-on.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-starts-on.test.cpp                -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/starts_on.hpp>
diff --git a/tests/beman/execution/exec-sync-wait.test.cpp b/tests/beman/execution/exec-sync-wait.test.cpp
index e873ee81..73cbdb42 100644
--- a/tests/beman/execution/exec-sync-wait.test.cpp
+++ b/tests/beman/execution/exec-sync-wait.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-sync-wait.test.cpp                -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/exec-then.test.cpp b/tests/beman/execution/exec-then.test.cpp
index cfc2fe60..9e9e8234 100644
--- a/tests/beman/execution/exec-then.test.cpp
+++ b/tests/beman/execution/exec-then.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-then.test.cpp                     -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/then.hpp>
diff --git a/tests/beman/execution/exec-when-all.test.cpp b/tests/beman/execution/exec-when-all.test.cpp
index 9ca28bf9..2da62207 100644
--- a/tests/beman/execution/exec-when-all.test.cpp
+++ b/tests/beman/execution/exec-when-all.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-when-all.test.cpp                 -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/detail/when_all.hpp>
diff --git a/tests/beman/execution/exec-with-awaitable-senders.test.cpp b/tests/beman/execution/exec-with-awaitable-senders.test.cpp
index 5d6d2ba4..2b34a2c7 100644
--- a/tests/beman/execution/exec-with-awaitable-senders.test.cpp
+++ b/tests/beman/execution/exec-with-awaitable-senders.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/exec-with-awaitable-senders.test.cpp   -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/function-objects.test.cpp b/tests/beman/execution/function-objects.test.cpp
index 1e58fb00..4cb5b873 100644
--- a/tests/beman/execution/function-objects.test.cpp
+++ b/tests/beman/execution/function-objects.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/function-objects.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/include/test/stop_token.hpp b/tests/beman/execution/include/test/stop_token.hpp
index 08e2d535..2c573fe3 100644
--- a/tests/beman/execution/include/test/stop_token.hpp
+++ b/tests/beman/execution/include/test/stop_token.hpp
@@ -5,7 +5,7 @@
 #ifndef INCLUDED_TEST_STOP_TOKEN
 #define INCLUDED_TEST_STOP_TOKEN
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/issue-144.test.cpp b/tests/beman/execution/issue-144.test.cpp
index ecd4f104..ecf2343a 100644
--- a/tests/beman/execution/issue-144.test.cpp
+++ b/tests/beman/execution/issue-144.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/issue-144.test.cpp                           -*-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/issue-174.test.cpp b/tests/beman/execution/issue-174.test.cpp
index 8199fd4f..dcdc3340 100644
--- a/tests/beman/execution/issue-174.test.cpp
+++ b/tests/beman/execution/issue-174.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/issue-174.test.cpp                            *-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/issue-186.test.cpp b/tests/beman/execution/issue-186.test.cpp
index 1565055b..0233584f 100644
--- a/tests/beman/execution/issue-186.test.cpp
+++ b/tests/beman/execution/issue-186.test.cpp
@@ -1,7 +1,7 @@
 // tests/beman/execution/issue-186.test.cpp                            *-C++-*-
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/execution.hpp>
diff --git a/tests/beman/execution/stopcallback-cons.test.cpp b/tests/beman/execution/stopcallback-cons.test.cpp
index 3d8d07b6..8549a9d1 100644
--- a/tests/beman/execution/stopcallback-cons.test.cpp
+++ b/tests/beman/execution/stopcallback-cons.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stopcallback-cons.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopcallback-general.test.cpp b/tests/beman/execution/stopcallback-general.test.cpp
index 06397b00..52cba985 100644
--- a/tests/beman/execution/stopcallback-general.test.cpp
+++ b/tests/beman/execution/stopcallback-general.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stopcallback-general.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopcallback-inplace-cons.test.cpp b/tests/beman/execution/stopcallback-inplace-cons.test.cpp
index 50e27a42..e24cd244 100644
--- a/tests/beman/execution/stopcallback-inplace-cons.test.cpp
+++ b/tests/beman/execution/stopcallback-inplace-cons.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stopcallback-inplace-cons.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopcallback-inplace-general.test.cpp b/tests/beman/execution/stopcallback-inplace-general.test.cpp
index 3680ad76..cd5552ce 100644
--- a/tests/beman/execution/stopcallback-inplace-general.test.cpp
+++ b/tests/beman/execution/stopcallback-inplace-general.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stopcallback-inplace-general.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopcallback-inplace.test.cpp b/tests/beman/execution/stopcallback-inplace.test.cpp
index 2fb487a7..f56a5045 100644
--- a/tests/beman/execution/stopcallback-inplace.test.cpp
+++ b/tests/beman/execution/stopcallback-inplace.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stopcallback-inplace.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopcallback.test.cpp b/tests/beman/execution/stopcallback.test.cpp
index 411faa04..827398ac 100644
--- a/tests/beman/execution/stopcallback.test.cpp
+++ b/tests/beman/execution/stopcallback.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stopcallback.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopsource-cons.test.cpp b/tests/beman/execution/stopsource-cons.test.cpp
index 6deb6fbb..9322d5bf 100644
--- a/tests/beman/execution/stopsource-cons.test.cpp
+++ b/tests/beman/execution/stopsource-cons.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stopsource-cons.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopsource-general.test.cpp b/tests/beman/execution/stopsource-general.test.cpp
index 3d3d639b..ae9f2442 100644
--- a/tests/beman/execution/stopsource-general.test.cpp
+++ b/tests/beman/execution/stopsource-general.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stopsource-general.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopsource-inplace-cons.test.cpp b/tests/beman/execution/stopsource-inplace-cons.test.cpp
index 212598cb..5650a933 100644
--- a/tests/beman/execution/stopsource-inplace-cons.test.cpp
+++ b/tests/beman/execution/stopsource-inplace-cons.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stopsource-inplace-cons.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopsource-inplace-mem.test.cpp b/tests/beman/execution/stopsource-inplace-mem.test.cpp
index e41d12d1..829c3848 100644
--- a/tests/beman/execution/stopsource-inplace-mem.test.cpp
+++ b/tests/beman/execution/stopsource-inplace-mem.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stopsource-inplace-mem.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stopsource-mem.test.cpp b/tests/beman/execution/stopsource-mem.test.cpp
index 57860a8b..2a605f59 100644
--- a/tests/beman/execution/stopsource-mem.test.cpp
+++ b/tests/beman/execution/stopsource-mem.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stopsource-mem.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stoptoken-general.test.cpp b/tests/beman/execution/stoptoken-general.test.cpp
index 0b7b26e8..501dced4 100644
--- a/tests/beman/execution/stoptoken-general.test.cpp
+++ b/tests/beman/execution/stoptoken-general.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stoptoken-general.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stoptoken-inplace-general.test.cpp b/tests/beman/execution/stoptoken-inplace-general.test.cpp
index e8f58173..552e40b5 100644
--- a/tests/beman/execution/stoptoken-inplace-general.test.cpp
+++ b/tests/beman/execution/stoptoken-inplace-general.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stoptoken-inplace-general.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stoptoken-inplace-members.test.cpp b/tests/beman/execution/stoptoken-inplace-members.test.cpp
index 3534ff92..4115289b 100644
--- a/tests/beman/execution/stoptoken-inplace-members.test.cpp
+++ b/tests/beman/execution/stoptoken-inplace-members.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stoptoken-inplace-members.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stoptoken-mem.test.cpp b/tests/beman/execution/stoptoken-mem.test.cpp
index 18d37747..2b1836fa 100644
--- a/tests/beman/execution/stoptoken-mem.test.cpp
+++ b/tests/beman/execution/stoptoken-mem.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stoptoken-mem.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>
diff --git a/tests/beman/execution/stoptoken-never-general.test.cpp b/tests/beman/execution/stoptoken-never-general.test.cpp
index e865147e..148cd5e6 100644
--- a/tests/beman/execution/stoptoken-never-general.test.cpp
+++ b/tests/beman/execution/stoptoken-never-general.test.cpp
@@ -1,7 +1,7 @@
 // src/beman/execution/tests/stoptoken-never-general.test.cpp
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifdef BEMAN_USE_MODULE
+#ifdef BEMAN_HAS_MODULES
 import beman.execution;
 #else
 #include <beman/execution/stop_token.hpp>