diff --git a/include/alpaka/grid/GridSyncBarrierCpuOmp.hpp b/include/alpaka/grid/GridSyncBarrierCpuOmp.hpp
index 5f3a105635b..da88cc740d6 100644
--- a/include/alpaka/grid/GridSyncBarrierCpuOmp.hpp
+++ b/include/alpaka/grid/GridSyncBarrierCpuOmp.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "alpaka/core/Concepts.hpp"
+#include "alpaka/core/Common.hpp"
 #include "alpaka/grid/Traits.hpp"
 
 #ifdef _OPENMP
@@ -12,7 +12,7 @@
 namespace alpaka
 {
     //! The grid synchronization for OMP accelerators.
-    class GridSyncOmp : public concepts::Implements<ConceptGridSync, GridSyncOmp>
+    class GridSyncOmp : public interface::Implements<ConceptGridSync, GridSyncOmp>
     {
     };
 
diff --git a/include/alpaka/grid/GridSyncBarrierCpuThread.hpp b/include/alpaka/grid/GridSyncBarrierCpuThread.hpp
index 182e3492c10..3f495e9922e 100644
--- a/include/alpaka/grid/GridSyncBarrierCpuThread.hpp
+++ b/include/alpaka/grid/GridSyncBarrierCpuThread.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "alpaka/core/BarrierThread.hpp"
-#include "alpaka/core/Concepts.hpp"
+#include "alpaka/core/Common.hpp"
 #include "alpaka/grid/Traits.hpp"
 
 #include <thread>
@@ -16,7 +16,7 @@ namespace alpaka
 {
     //! The thread id map barrier grid synchronization.
     template<typename TIdx>
-    class GridSyncBarrierThread : public concepts::Implements<ConceptGridSync, GridSyncBarrierThread<TIdx>>
+    class GridSyncBarrierThread : public interface::Implements<ConceptGridSync, GridSyncBarrierThread<TIdx>>
     {
     public:
         using Barrier = core::threads::BarrierThread<TIdx>;
diff --git a/include/alpaka/grid/GridSyncGenericSycl.hpp b/include/alpaka/grid/GridSyncGenericSycl.hpp
index 4c33bd80773..269aa465d9d 100644
--- a/include/alpaka/grid/GridSyncGenericSycl.hpp
+++ b/include/alpaka/grid/GridSyncGenericSycl.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "alpaka/core/Concepts.hpp"
+#include "alpaka/core/Common.hpp"
 #include "alpaka/grid/Traits.hpp"
 
 #ifdef ALPAKA_ACC_SYCL_ENABLED
@@ -16,7 +16,7 @@ namespace alpaka
 {
     //! The grid synchronization for SYCL.
     template<typename TDim>
-    class GridSyncGenericSycl : public concepts::Implements<ConceptGridSync, GridSyncGenericSycl<TDim>>
+    class GridSyncGenericSycl : public interface::Implements<ConceptGridSync, GridSyncGenericSycl<TDim>>
     {
     public:
         GridSyncGenericSycl(sycl::nd_item<TDim::value> work_item) : my_item{work_item}
diff --git a/include/alpaka/grid/GridSyncGpuCudaHip.hpp b/include/alpaka/grid/GridSyncGpuCudaHip.hpp
index 62a10c49ac4..86d09fb3383 100644
--- a/include/alpaka/grid/GridSyncGpuCudaHip.hpp
+++ b/include/alpaka/grid/GridSyncGpuCudaHip.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "alpaka/core/BoostPredef.hpp"
-#include "alpaka/core/Concepts.hpp"
+#include "alpaka/core/Common.hpp"
 #include "alpaka/grid//Traits.hpp"
 
 #if defined(ALPAKA_ACC_GPU_CUDA_ENABLED) || defined(ALPAKA_ACC_GPU_HIP_ENABLED)
@@ -22,7 +22,7 @@
 namespace alpaka
 {
     //! The GPU CUDA/HIP grid synchronization.
-    class GridSyncCudaHipBuiltIn : public concepts::Implements<ConceptGridSync, GridSyncCudaHipBuiltIn>
+    class GridSyncCudaHipBuiltIn : public interface::Implements<ConceptGridSync, GridSyncCudaHipBuiltIn>
     {
     };
 
diff --git a/include/alpaka/grid/GridSyncNoOp.hpp b/include/alpaka/grid/GridSyncNoOp.hpp
index 875f99353f2..2a1fa031e13 100644
--- a/include/alpaka/grid/GridSyncNoOp.hpp
+++ b/include/alpaka/grid/GridSyncNoOp.hpp
@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "alpaka/core/Concepts.hpp"
+#include "alpaka/core/Common.hpp"
 #include "alpaka/grid/Traits.hpp"
 
 namespace alpaka
 {
     //! The NoOp grid synchronization for accelerators that only support a single thread with cooperative kernels.
-    class GridSyncNoOp : public concepts::Implements<ConceptGridSync, GridSyncNoOp>
+    class GridSyncNoOp : public interface::Implements<ConceptGridSync, GridSyncNoOp>
     {
     };
 
diff --git a/include/alpaka/grid/Traits.hpp b/include/alpaka/grid/Traits.hpp
index 7f29b484cef..2c39128f919 100644
--- a/include/alpaka/grid/Traits.hpp
+++ b/include/alpaka/grid/Traits.hpp
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "alpaka/core/Common.hpp"
-#include "alpaka/core/Concepts.hpp"
 
 namespace alpaka
 {
@@ -32,7 +31,7 @@ namespace alpaka
     template<typename TGridSync>
     ALPAKA_FN_ACC auto syncGridThreads(TGridSync const& gridSync) -> void
     {
-        using ImplementationBase = concepts::ImplementationBase<ConceptGridSync, TGridSync>;
+        using ImplementationBase = interface::ImplementationBase<ConceptGridSync, TGridSync>;
         trait::SyncGridThreads<ImplementationBase>::syncGridThreads(gridSync);
     }