diff --git a/sycl/include/sycl/detail/spirv.hpp b/sycl/include/sycl/detail/spirv.hpp
index 72ad176ac12b8..3e2587c4131e1 100644
--- a/sycl/include/sycl/detail/spirv.hpp
+++ b/sycl/include/sycl/detail/spirv.hpp
@@ -569,7 +569,7 @@ EnableIfNativeShuffle<T> SubgroupShuffleUp(T x, uint32_t delta) {
 template <typename T>
 EnableIfVectorShuffle<T> SubgroupShuffle(T x, id<1> local_id) {
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = SubgroupShuffle(x[s], local_id);
   }
   return result;
@@ -578,7 +578,7 @@ EnableIfVectorShuffle<T> SubgroupShuffle(T x, id<1> local_id) {
 template <typename T>
 EnableIfVectorShuffle<T> SubgroupShuffleXor(T x, id<1> local_id) {
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = SubgroupShuffleXor(x[s], local_id);
   }
   return result;
@@ -587,7 +587,7 @@ EnableIfVectorShuffle<T> SubgroupShuffleXor(T x, id<1> local_id) {
 template <typename T>
 EnableIfVectorShuffle<T> SubgroupShuffleDown(T x, uint32_t delta) {
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = SubgroupShuffleDown(x[s], delta);
   }
   return result;
@@ -596,7 +596,7 @@ EnableIfVectorShuffle<T> SubgroupShuffleDown(T x, uint32_t delta) {
 template <typename T>
 EnableIfVectorShuffle<T> SubgroupShuffleUp(T x, uint32_t delta) {
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = SubgroupShuffleUp(x[s], delta);
   }
   return result;
diff --git a/sycl/include/sycl/ext/oneapi/group_algorithm.hpp b/sycl/include/sycl/ext/oneapi/group_algorithm.hpp
index 4d9f205983b90..63229a5db1c3b 100644
--- a/sycl/include/sycl/ext/oneapi/group_algorithm.hpp
+++ b/sycl/include/sycl/ext/oneapi/group_algorithm.hpp
@@ -167,7 +167,7 @@ detail::enable_if_t<(detail::is_generic_group<Group>::value &&
                                  typename Group::id_type local_id) {
 #ifdef __SYCL_DEVICE_ONLY__
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = broadcast(g, x[s], local_id);
   }
   return result;
@@ -212,7 +212,7 @@ detail::enable_if_t<(detail::is_generic_group<Group>::value &&
                                      linear_local_id) {
 #ifdef __SYCL_DEVICE_ONLY__
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = broadcast(g, x[s], linear_local_id);
   }
   return result;
@@ -250,7 +250,7 @@ detail::enable_if_t<(detail::is_generic_group<Group>::value &&
                     T> broadcast(Group g, T x) {
 #ifdef __SYCL_DEVICE_ONLY__
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = broadcast(g, x[s]);
   }
   return result;
diff --git a/sycl/include/sycl/group_algorithm.hpp b/sycl/include/sycl/group_algorithm.hpp
index 915115c530d08..05e335cb9200a 100644
--- a/sycl/include/sycl/group_algorithm.hpp
+++ b/sycl/include/sycl/group_algorithm.hpp
@@ -229,7 +229,7 @@ reduce_over_group(Group g, T x, BinaryOperation binary_op) {
            std::is_same<decltype(binary_op(x[0], x[0])), float>::value),
       "Result type of binary_op must match reduction accumulation type.");
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = reduce_over_group(g, x[s], binary_op);
   }
   return result;
@@ -280,7 +280,7 @@ reduce_over_group(Group g, V x, T init, BinaryOperation binary_op) {
       "Result type of binary_op must match reduction accumulation type.");
 #ifdef __SYCL_DEVICE_ONLY__
   T result = init;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = binary_op(init[s], reduce_over_group(g, x[s], binary_op));
   }
   return result;
@@ -656,7 +656,7 @@ exclusive_scan_over_group(Group g, T x, BinaryOperation binary_op) {
            std::is_same<decltype(binary_op(x[0], x[0])), float>::value),
       "Result type of binary_op must match scan accumulation type.");
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = exclusive_scan_over_group(g, x[s], binary_op);
   }
   return result;
@@ -680,7 +680,7 @@ exclusive_scan_over_group(Group g, V x, T init, BinaryOperation binary_op) {
            std::is_same<decltype(binary_op(init[0], x[0])), float>::value),
       "Result type of binary_op must match scan accumulation type.");
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = exclusive_scan_over_group(g, x[s], init[s], binary_op);
   }
   return result;
@@ -823,7 +823,7 @@ inclusive_scan_over_group(Group g, T x, BinaryOperation binary_op) {
            std::is_same<decltype(binary_op(x[0], x[0])), float>::value),
       "Result type of binary_op must match scan accumulation type.");
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = inclusive_scan_over_group(g, x[s], binary_op);
   }
   return result;
@@ -917,7 +917,7 @@ inclusive_scan_over_group(Group g, V x, BinaryOperation binary_op, T init) {
            std::is_same<decltype(binary_op(init[0], x[0])), float>::value),
       "Result type of binary_op must match scan accumulation type.");
   T result;
-  for (int s = 0; s < x.get_size(); ++s) {
+  for (int s = 0; s < x.size(); ++s) {
     result[s] = inclusive_scan_over_group(g, x[s], binary_op, init[s]);
   }
   return result;