diff --git a/sycl/include/CL/sycl/group_algorithm.hpp b/sycl/include/CL/sycl/group_algorithm.hpp
index a838d2011cff2..6ede3ff23b68f 100644
--- a/sycl/include/CL/sycl/group_algorithm.hpp
+++ b/sycl/include/CL/sycl/group_algorithm.hpp
@@ -17,8 +17,8 @@
 #include <CL/sycl/known_identity.hpp>
 #include <CL/sycl/nd_item.hpp>
 #include <CL/sycl/sub_group.hpp>
+#include <sycl/ext/oneapi/experimental/group_sort.hpp>
 #include <sycl/ext/oneapi/functional.hpp>
-#include <sycl/ext/oneapi/group_sort.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
diff --git a/sycl/include/sycl/ext/oneapi/group_sort.hpp b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
similarity index 95%
rename from sycl/include/sycl/ext/oneapi/group_sort.hpp
rename to sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
index 775d988917aa0..df29ab840f7ff 100644
--- a/sycl/include/sycl/ext/oneapi/group_sort.hpp
+++ b/sycl/include/sycl/ext/oneapi/experimental/group_sort.hpp
@@ -14,12 +14,13 @@
 #include <CL/sycl/detail/type_traits.hpp>
 #include <type_traits>
 
-#include "experimental/group_helpers_sorters.hpp"
+#include "group_helpers_sorters.hpp"
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
 namespace ext {
 namespace oneapi {
+namespace experimental {
 namespace detail {
 
 // ---- traits
@@ -41,8 +42,7 @@ struct is_sorter_impl {
   template <typename G = Group>
   static decltype(
       std::integral_constant<bool, is_expected_return_type<G>::value &&
-                                       sycl::is_group_v<G>>{})
-  test(int);
+                                       sycl::is_group_v<G>>{}) test(int);
 
   template <typename = Group> static std::false_type test(...);
 };
@@ -56,8 +56,7 @@ struct is_sorter_impl<
   template <typename G = Group>
   static decltype(std::declval<Sorter>()(std::declval<G>(), std::declval<Ptr>(),
                                          std::declval<Ptr>()),
-                  sycl::detail::is_generic_group<G>{})
-  test(int);
+                  sycl::detail::is_generic_group<G>{}) test(int);
 
   template <typename = Group> static std::false_type test(...);
 };
@@ -135,6 +134,7 @@ joint_sort(experimental::group_with_scratchpad<Group, Extent> exec, Iter first,
              experimental::default_sorter<>(exec.get_memory()));
 }
 
+} // namespace experimental
 } // namespace oneapi
 } // namespace ext
 } // namespace sycl