diff --git a/src/walberla/codegen/build_config.py b/src/walberla/codegen/build_config.py
index 38f94713b4ee62d73400da2409f1348a345170a0..25a7fab2226c82b9f9cabccdf132b5210489dbfe 100644
--- a/src/walberla/codegen/build_config.py
+++ b/src/walberla/codegen/build_config.py
@@ -60,8 +60,8 @@ class WalberlaBuildConfig:
 
         if isinstance(ctx.project_info, WalberlaBuildConfig):
             return ctx.project_info
-        elif DEBUG_ENV.BUILD_CONFIG is not None:
-            return DEBUG_ENV.BUILD_CONFIG
+        elif DEBUG_MOCK_CMAKE.BUILD_CONFIG is not None:
+            return DEBUG_MOCK_CMAKE.BUILD_CONFIG
         else:
             raise ValueError(
                 "The given SfgContext does not encapsulate a waLBerla build config object."
@@ -75,7 +75,7 @@ class WalberlaBuildConfig:
         if self.cuda_enabled:
             cfg.target = Target.CUDA
         elif self.hip_enabled:
-            cfg.target = Target.GPU  # TODO: Target.HIP
+            cfg.target = Target.HIP
         else:
             #  CPU target
             if self.optimize_for_localhost:
@@ -89,12 +89,12 @@ class WalberlaBuildConfig:
         return cfg
 
 
-class DEBUG_ENV:
+class DEBUG_MOCK_CMAKE:
     BUILD_CONFIG: WalberlaBuildConfig | None = None
 
     @staticmethod
     def use_hip_default():
-        DEBUG_ENV.BUILD_CONFIG = WalberlaBuildConfig(
+        DEBUG_MOCK_CMAKE.BUILD_CONFIG = WalberlaBuildConfig(
             c_compiler_id="hipcc",
             cxx_compiler_id="hipcc",
             use_double_precision=True,
diff --git a/src/walberla/codegen/sweep.py b/src/walberla/codegen/sweep.py
index 66b743fa3dffd8fbdd04da32d5d9708ab400da8a..7239ff6503d6e938f5a43647d50cf6e8b96f5522 100644
--- a/src/walberla/codegen/sweep.py
+++ b/src/walberla/codegen/sweep.py
@@ -550,15 +550,6 @@ class Sweep(CustomGenerator):
         target = gen_config.get_target()
         self._set_field_interface(target)
 
-        if target.is_gpu():
-            match target:
-                case Target.CUDA:
-                    sfg.use_cuda()
-                case Target.HIP:
-                    sfg.use_hip()
-                case _:
-                    assert False, "unexpected GPU target"
-
         knamespace = sfg.kernel_namespace(f"{self._name}_kernels")
 
         assignments = BlockforestParameters.process(self._assignments)
diff --git a/tests/BasicLbmScenarios/LbmAlgorithms.py b/tests/BasicLbmScenarios/LbmAlgorithms.py
index be8aadc3215138c7410f656de8dcfcbff39ee023..3e6b35c6dabf1cbd41c52ea12b635bb7e129f466 100644
--- a/tests/BasicLbmScenarios/LbmAlgorithms.py
+++ b/tests/BasicLbmScenarios/LbmAlgorithms.py
@@ -17,9 +17,9 @@ from lbmpy.macroscopic_value_kernels import macroscopic_values_setter
 from walberla.codegen import Sweep
 from walberla.codegen.boundaries import FreeSlip
 
-from walberla.codegen.build_config import DEBUG_ENV
+from walberla.codegen.build_config import DEBUG_MOCK_CMAKE
 
-DEBUG_ENV.use_hip_default()
+DEBUG_MOCK_CMAKE.use_hip_default()
 
 with SourceFileGenerator(keep_unknown_argv=True) as sfg:
     parser = argparse.ArgumentParser()
diff --git a/tests/BasicLbmScenarios/SimDomain.hpp b/tests/BasicLbmScenarios/SimDomain.hpp
index 41532a5e53cceef16a61f5e3f756da74990442ff..72c44a82ddc4edf5ab867d01164616bf3fc93576 100644
--- a/tests/BasicLbmScenarios/SimDomain.hpp
+++ b/tests/BasicLbmScenarios/SimDomain.hpp
@@ -104,7 +104,7 @@ struct SimDomain
       commCpu();
    }
 
-   void sync2cpu()
+   void fields2host()
    {
       wait();
       gpu::fieldCpy< PdfField_T, CommonGpuField >(blocks, cpuFields.pdfsId, gpuFields.pdfsId);
@@ -143,7 +143,7 @@ struct SimDomain
 
    void wait() { /* NOP */ }
 
-   void sync2cpu() { /* NOP */ }
+   void fields2host() { /* NOP */ }
 
 #endif
 
diff --git a/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp b/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
index 5c983746531c82a82fbf7114724e5938dc7c4a8f..2ca0fb478d4d4096b9050bb7707fb28b509daf5a 100644
--- a/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
+++ b/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
@@ -38,7 +38,7 @@ void fullyPeriodic(Environment& env)
          streamCollide(&b);
       });
 
-      dom.sync2cpu();
+      dom.fields2host();
 
       dom.forAllBlocks([&](auto & block){
          const VectorField_T & velField = *block.template getData< VectorField_T >(dom.cpuFields.uId);