diff --git a/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp b/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp
index bf77bc1aed306..728a01b680426 100644
--- a/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp
+++ b/sycl/test-e2e/AddressCast/dynamic_address_cast.cpp
@@ -33,10 +33,10 @@ int main() {
   Queue
       .submit([&](sycl::handler &cgh) {
         auto GlobalAccessor =
-            GlobalBuffer.get_access<sycl::access::mode::read_write>(cgh);
+            GlobalBuffer.get_access<sycl::access_mode::read_write>(cgh);
         auto LocalAccessor = sycl::local_accessor<int>(1, cgh);
         auto ResultAccessor =
-            ResultBuffer.get_access<sycl::access::mode::write>(cgh);
+            ResultBuffer.get_access<sycl::access_mode::write>(cgh);
         cgh.parallel_for<class Kernel>(
             sycl::nd_range<1>(NItems, 1), [=](sycl::nd_item<1> Item) {
               bool Success = true;
diff --git a/sycl/test-e2e/AddressCast/khr_dynamic_addrspace_cast.cpp b/sycl/test-e2e/AddressCast/khr_dynamic_addrspace_cast.cpp
index c140a338e3161..269d6180bb83a 100644
--- a/sycl/test-e2e/AddressCast/khr_dynamic_addrspace_cast.cpp
+++ b/sycl/test-e2e/AddressCast/khr_dynamic_addrspace_cast.cpp
@@ -31,10 +31,10 @@ int main() {
   Queue
       .submit([&](sycl::handler &cgh) {
         auto GlobalAccessor =
-            GlobalBuffer.get_access<sycl::access::mode::read_write>(cgh);
+            GlobalBuffer.get_access<sycl::access_mode::read_write>(cgh);
         auto LocalAccessor = sycl::local_accessor<int>(1, cgh);
         auto ResultAccessor =
-            ResultBuffer.get_access<sycl::access::mode::write>(cgh);
+            ResultBuffer.get_access<sycl::access_mode::write>(cgh);
         cgh.parallel_for<class Kernel>(
             sycl::nd_range<1>(NItems, 1), [=](sycl::nd_item<1> Item) {
               bool Success = true;
diff --git a/sycl/test-e2e/AddressCast/khr_static_addrspace_cast.cpp b/sycl/test-e2e/AddressCast/khr_static_addrspace_cast.cpp
index 9742ef4babfdc..313c262e7fbd7 100644
--- a/sycl/test-e2e/AddressCast/khr_static_addrspace_cast.cpp
+++ b/sycl/test-e2e/AddressCast/khr_static_addrspace_cast.cpp
@@ -24,10 +24,10 @@ int main() {
   Queue
       .submit([&](sycl::handler &cgh) {
         auto GlobalAccessor =
-            GlobalBuffer.get_access<sycl::access::mode::read_write>(cgh);
+            GlobalBuffer.get_access<sycl::access_mode::read_write>(cgh);
         auto LocalAccessor = sycl::local_accessor<int>(1, cgh);
         auto ResultAccessor =
-            ResultBuffer.get_access<sycl::access::mode::write>(cgh);
+            ResultBuffer.get_access<sycl::access_mode::write>(cgh);
         cgh.parallel_for<class Kernel>(
             sycl::nd_range<1>(NItems, 1), [=](sycl::nd_item<1> Item) {
               bool Success = true;
diff --git a/sycl/test-e2e/AddressCast/static_address_cast.cpp b/sycl/test-e2e/AddressCast/static_address_cast.cpp
index e7630f1715e5a..ce5834b47eebe 100644
--- a/sycl/test-e2e/AddressCast/static_address_cast.cpp
+++ b/sycl/test-e2e/AddressCast/static_address_cast.cpp
@@ -25,10 +25,10 @@ int main() {
   Queue
       .submit([&](sycl::handler &cgh) {
         auto GlobalAccessor =
-            GlobalBuffer.get_access<sycl::access::mode::read_write>(cgh);
+            GlobalBuffer.get_access<sycl::access_mode::read_write>(cgh);
         auto LocalAccessor = sycl::local_accessor<int>(1, cgh);
         auto ResultAccessor =
-            ResultBuffer.get_access<sycl::access::mode::write>(cgh);
+            ResultBuffer.get_access<sycl::access_mode::write>(cgh);
         cgh.parallel_for<class Kernel>(
             sycl::nd_range<1>(NItems, 1), [=](sycl::nd_item<1> Item) {
               bool Success = true;
diff --git a/sycl/test-e2e/AtomicRef/add.h b/sycl/test-e2e/AtomicRef/add.h
index 69b0eaa16b2ee..9ff96188cdd91 100644
--- a/sycl/test-e2e/AtomicRef/add.h
+++ b/sycl/test-e2e/AtomicRef/add.h
@@ -32,7 +32,7 @@ void add_fetch_local_test(queue q, size_t N) {
     buffer<T> sum_buf(&sum, 1);
     buffer<T> output_buf(output.data(), output.size());
     q.submit([&](handler &cgh) {
-       auto sum = sum_buf.template get_access<access::mode::read_write>(cgh);
+       auto sum = sum_buf.template get_access<access_mode::read_write>(cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
        local_accessor<T, 1> loc(1, cgh);
@@ -81,7 +81,7 @@ void add_fetch_test(queue q, size_t N) {
     buffer<T> sum_buf(&sum, 1);
     buffer<T> output_buf(output.data(), output.size());
     q.submit([&](handler &cgh) {
-       auto sum = sum_buf.template get_access<access::mode::read_write>(cgh);
+       auto sum = sum_buf.template get_access<access_mode::read_write>(cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
        cgh.parallel_for(range<1>(N), [=](item<1> it) {
@@ -164,7 +164,7 @@ void add_plus_equal_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto sum = sum_buf.template get_access<access::mode::read_write>(cgh);
+      auto sum = sum_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
@@ -247,7 +247,7 @@ void add_pre_inc_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto sum = sum_buf.template get_access<access::mode::read_write>(cgh);
+      auto sum = sum_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
@@ -329,7 +329,7 @@ void add_post_inc_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto sum = sum_buf.template get_access<access::mode::read_write>(cgh);
+      auto sum = sum_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
diff --git a/sycl/test-e2e/AtomicRef/and.h b/sycl/test-e2e/AtomicRef/and.h
index 54ceb35eab915..23e3fe53e2bd1 100644
--- a/sycl/test-e2e/AtomicRef/and.h
+++ b/sycl/test-e2e/AtomicRef/and.h
@@ -32,7 +32,7 @@ void and_local_test(queue q) {
     buffer<T> cum_buf(&cum, 1);
     buffer<T> output_buf(output.data(), output.size());
     q.submit([&](handler &cgh) {
-       auto cum = cum_buf.template get_access<access::mode::read_write>(cgh);
+       auto cum = cum_buf.template get_access<access_mode::read_write>(cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
        local_accessor<T, 1> loc(1, cgh);
@@ -79,7 +79,7 @@ void and_global_test(queue q) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto cum = cum_buf.template get_access<access::mode::read_write>(cgh);
+      auto cum = cum_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
diff --git a/sycl/test-e2e/AtomicRef/assignment.h b/sycl/test-e2e/AtomicRef/assignment.h
index 660cc7bfbb327..8f7904451a1f8 100644
--- a/sycl/test-e2e/AtomicRef/assignment.h
+++ b/sycl/test-e2e/AtomicRef/assignment.h
@@ -27,7 +27,7 @@ void assignment_test(queue q, size_t N) {
     buffer<T> assignment_buf(&assignment, 1);
     q.submit([&](handler &cgh) {
       auto st =
-          assignment_buf.template get_access<access::mode::read_write>(cgh);
+          assignment_buf.template get_access<access_mode::read_write>(cgh);
       cgh.parallel_for<assignment_kernel<AtomicRef, address_space, T>>(
           range<1>(N), [=](item<1> it) {
             size_t gid = it.get_id(0);
diff --git a/sycl/test-e2e/AtomicRef/atomic_memory_order_acq_rel.cpp b/sycl/test-e2e/AtomicRef/atomic_memory_order_acq_rel.cpp
index 495348aa7c5e4..70814a9227966 100644
--- a/sycl/test-e2e/AtomicRef/atomic_memory_order_acq_rel.cpp
+++ b/sycl/test-e2e/AtomicRef/atomic_memory_order_acq_rel.cpp
@@ -22,9 +22,8 @@ template <memory_order order> void test_acquire_global() {
     buffer<int> val_buf(val, 2);
 
     q.submit([&](handler &cgh) {
-       auto error =
-           error_buf.template get_access<access::mode::read_write>(cgh);
-       auto val = val_buf.template get_access<access::mode::read_write>(cgh);
+       auto error = error_buf.template get_access<access_mode::read_write>(cgh);
+       auto val = val_buf.template get_access<access_mode::read_write>(cgh);
        cgh.parallel_for(range<1>(N_items), [=](item<1> it) {
          volatile int *val_p = val.get_multi_ptr<access::decorated::no>().get();
          auto atm0 =
@@ -66,8 +65,7 @@ template <memory_order order> void test_acquire_local() {
     buffer<int> val_buf(val, 2);
 
     q.submit([&](handler &cgh) {
-       auto error =
-           error_buf.template get_access<access::mode::read_write>(cgh);
+       auto error = error_buf.template get_access<access_mode::read_write>(cgh);
        local_accessor<int, 1> val(2, cgh);
        cgh.parallel_for(
            nd_range<1>(global_size, local_size), [=](nd_item<1> it) {
@@ -114,9 +112,8 @@ template <memory_order order> void test_release_global() {
     buffer<int> val_buf(val, 2);
 
     q.submit([&](handler &cgh) {
-       auto error =
-           error_buf.template get_access<access::mode::read_write>(cgh);
-       auto val = val_buf.template get_access<access::mode::read_write>(cgh);
+       auto error = error_buf.template get_access<access_mode::read_write>(cgh);
+       auto val = val_buf.template get_access<access_mode::read_write>(cgh);
        cgh.parallel_for(range<1>(N_items), [=](item<1> it) {
          volatile int *val_p = val.get_multi_ptr<access::decorated::no>().get();
          auto atm0 =
@@ -158,8 +155,7 @@ template <memory_order order> void test_release_local() {
     buffer<int> val_buf(val, 2);
 
     q.submit([&](handler &cgh) {
-       auto error =
-           error_buf.template get_access<access::mode::read_write>(cgh);
+       auto error = error_buf.template get_access<access_mode::read_write>(cgh);
        local_accessor<int, 1> val(2, cgh);
        cgh.parallel_for(
            nd_range<1>(global_size, local_size), [=](nd_item<1> it) {
diff --git a/sycl/test-e2e/AtomicRef/atomic_memory_order_seq_cst.cpp b/sycl/test-e2e/AtomicRef/atomic_memory_order_seq_cst.cpp
index 4d9947601e2e2..fa848ac933596 100644
--- a/sycl/test-e2e/AtomicRef/atomic_memory_order_seq_cst.cpp
+++ b/sycl/test-e2e/AtomicRef/atomic_memory_order_seq_cst.cpp
@@ -35,7 +35,7 @@ void check(queue &q, buffer<int, 2> &res_buf, size_t N_iters) {
       {N_items / 2 * N_iters + 1, N_items / 2 * N_iters + 1});
 
   q.submit([&](handler &cgh) {
-    auto res = res_buf.template get_access<access::mode::read>(cgh);
+    auto res = res_buf.template get_access<access_mode::read>(cgh);
     auto checked =
         checked_buf.template get_access<access::mode::discard_write>(cgh);
     cgh.parallel_for(nd_range<1>(N_items, 32), [=](nd_item<1> it) {
@@ -48,8 +48,8 @@ void check(queue &q, buffer<int, 2> &res_buf, size_t N_iters) {
     });
   });
   q.submit([&](handler &cgh) {
-    auto res = res_buf.template get_access<access::mode::read>(cgh);
-    auto checked = checked_buf.template get_access<access::mode::write>(cgh);
+    auto res = res_buf.template get_access<access_mode::read>(cgh);
+    auto checked = checked_buf.template get_access<access_mode::write>(cgh);
     cgh.parallel_for(nd_range<1>(N_items / 2, 32), [=](nd_item<1> it) {
       size_t id = it.get_global_id(0);
       for (int i = 1; i < N_iters; i++) {
@@ -65,9 +65,9 @@ void check(queue &q, buffer<int, 2> &res_buf, size_t N_iters) {
   int err = 0;
   buffer<int> err_buf(&err, 1);
   q.submit([&](handler &cgh) {
-    auto res = res_buf.template get_access<access::mode::read>(cgh);
-    auto checked = checked_buf.template get_access<access::mode::read>(cgh);
-    auto err = err_buf.template get_access<access::mode::write>(cgh);
+    auto res = res_buf.template get_access<access_mode::read>(cgh);
+    auto checked = checked_buf.template get_access<access_mode::read>(cgh);
+    auto err = err_buf.template get_access<access_mode::write>(cgh);
     cgh.parallel_for(nd_range<1>(N_items / 2, 32), [=](nd_item<1> it) {
       size_t id = it.get_global_id(0);
       for (int i = 1; i < N_iters; i++) {
@@ -93,7 +93,7 @@ template <memory_order order> void test_global(size_t N_iters) {
 
   q.submit([&](handler &cgh) {
      auto res = res_buf.template get_access<access::mode::discard_write>(cgh);
-     auto val = val_buf.template get_access<access::mode::read_write>(cgh);
+     auto val = val_buf.template get_access<access_mode::read_write>(cgh);
      // Intentionally using a small work group size. The assumption being that
      // more sub groups mean more likely failure for the same number of
      // work-items if sequential consistency does not work
diff --git a/sycl/test-e2e/AtomicRef/compare_exchange.h b/sycl/test-e2e/AtomicRef/compare_exchange.h
index 7da21730e4793..d3c4fc7a27132 100644
--- a/sycl/test-e2e/AtomicRef/compare_exchange.h
+++ b/sycl/test-e2e/AtomicRef/compare_exchange.h
@@ -33,7 +33,7 @@ void compare_exchange_local_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
     q.submit([&](handler &cgh) {
        auto compare_exchange =
-           compare_exchange_buf.template get_access<access::mode::read_write>(
+           compare_exchange_buf.template get_access<access_mode::read_write>(
                cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
@@ -88,7 +88,7 @@ void compare_exchange_global_test(queue q, size_t N) {
 
     q.submit([&](handler &cgh) {
        auto exc =
-           compare_exchange_buf.template get_access<access::mode::read_write>(
+           compare_exchange_buf.template get_access<access_mode::read_write>(
                cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
diff --git a/sycl/test-e2e/AtomicRef/exchange.h b/sycl/test-e2e/AtomicRef/exchange.h
index fd2ec48433fcf..06e3219263fb7 100644
--- a/sycl/test-e2e/AtomicRef/exchange.h
+++ b/sycl/test-e2e/AtomicRef/exchange.h
@@ -32,7 +32,7 @@ void exchange_local_test(queue q, size_t N) {
     buffer<T> cum_buf(&cum, 1);
     buffer<T> output_buf(output.data(), output.size());
     q.submit([&](handler &cgh) {
-       auto cum = cum_buf.template get_access<access::mode::read_write>(cgh);
+       auto cum = cum_buf.template get_access<access_mode::read_write>(cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
        local_accessor<T, 1> loc(1, cgh);
@@ -79,8 +79,7 @@ void exchange_global_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto exc =
-          exchange_buf.template get_access<access::mode::read_write>(cgh);
+      auto exc = exchange_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
diff --git a/sycl/test-e2e/AtomicRef/load.h b/sycl/test-e2e/AtomicRef/load.h
index 792e18fce6557..8270f0a2dc851 100644
--- a/sycl/test-e2e/AtomicRef/load.h
+++ b/sycl/test-e2e/AtomicRef/load.h
@@ -33,7 +33,7 @@ void load_local_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-       auto ld = load_buf.template get_access<access::mode::read_write>(cgh);
+       auto ld = load_buf.template get_access<access_mode::read_write>(cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
        local_accessor<T, 1> loc(1, cgh);
@@ -69,7 +69,7 @@ void load_global_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto ld = load_buf.template get_access<access::mode::read_write>(cgh);
+      auto ld = load_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
diff --git a/sycl/test-e2e/AtomicRef/max.h b/sycl/test-e2e/AtomicRef/max.h
index c9b6da5bc1688..e3f826a0f38ce 100644
--- a/sycl/test-e2e/AtomicRef/max.h
+++ b/sycl/test-e2e/AtomicRef/max.h
@@ -32,7 +32,7 @@ void max_local_test(queue q, size_t N) {
     buffer<T> cum_buf(&cum, 1);
     buffer<T> output_buf(output.data(), output.size());
     q.submit([&](handler &cgh) {
-       auto cum = cum_buf.template get_access<access::mode::read_write>(cgh);
+       auto cum = cum_buf.template get_access<access_mode::read_write>(cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
        local_accessor<T, 1> loc(1, cgh);
@@ -83,7 +83,7 @@ void max_global_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto val = val_buf.template get_access<access::mode::read_write>(cgh);
+      auto val = val_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
diff --git a/sycl/test-e2e/AtomicRef/min.h b/sycl/test-e2e/AtomicRef/min.h
index fd623d4a3d155..f2dd807bfe925 100644
--- a/sycl/test-e2e/AtomicRef/min.h
+++ b/sycl/test-e2e/AtomicRef/min.h
@@ -32,7 +32,7 @@ void min_local_test(queue q, size_t N) {
     buffer<T> cum_buf(&cum, 1);
     buffer<T> output_buf(output.data(), output.size());
     q.submit([&](handler &cgh) {
-       auto cum = cum_buf.template get_access<access::mode::read_write>(cgh);
+       auto cum = cum_buf.template get_access<access_mode::read_write>(cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
        local_accessor<T, 1> loc(1, cgh);
@@ -83,7 +83,7 @@ void min_global_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto val = val_buf.template get_access<access::mode::read_write>(cgh);
+      auto val = val_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
diff --git a/sycl/test-e2e/AtomicRef/or.h b/sycl/test-e2e/AtomicRef/or.h
index cb3f1a51eb3d1..e08bda3a8990a 100644
--- a/sycl/test-e2e/AtomicRef/or.h
+++ b/sycl/test-e2e/AtomicRef/or.h
@@ -32,7 +32,7 @@ void or_local_test(queue q) {
     buffer<T> cum_buf(&cum, 1);
     buffer<T> output_buf(output.data(), output.size());
     q.submit([&](handler &cgh) {
-       auto cum = cum_buf.template get_access<access::mode::read_write>(cgh);
+       auto cum = cum_buf.template get_access<access_mode::read_write>(cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
        local_accessor<T, 1> loc(1, cgh);
@@ -79,7 +79,7 @@ void or_global_test(queue q) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto cum = cum_buf.template get_access<access::mode::read_write>(cgh);
+      auto cum = cum_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
diff --git a/sycl/test-e2e/AtomicRef/store.h b/sycl/test-e2e/AtomicRef/store.h
index 8773c80f113d3..fa6a3db28fff0 100644
--- a/sycl/test-e2e/AtomicRef/store.h
+++ b/sycl/test-e2e/AtomicRef/store.h
@@ -29,7 +29,7 @@ void store_global_test(queue q, size_t N) {
   {
     buffer<T> store_buf(&store, 1);
     q.submit([&](handler &cgh) {
-      auto st = store_buf.template get_access<access::mode::read_write>(cgh);
+      auto st = store_buf.template get_access<access_mode::read_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
         size_t gid = it.get_id(0);
         auto atm = AtomicRef<T, memory_order::relaxed, scope, space>(st[0]);
@@ -82,7 +82,7 @@ void store_local_test(queue q, size_t N) {
   {
     buffer<T> store_buf(&store, 1);
     q.submit([&](handler &cgh) {
-      auto st = store_buf.template get_access<access::mode::read_write>(cgh);
+      auto st = store_buf.template get_access<access_mode::read_write>(cgh);
       local_accessor<T, 1> loc(1, cgh);
       cgh.parallel_for(nd_range<1>(N, N), [=](nd_item<1> it) {
         size_t gid = it.get_global_id(0);
diff --git a/sycl/test-e2e/AtomicRef/sub.h b/sycl/test-e2e/AtomicRef/sub.h
index ab5ef47efe931..d7975c98956d7 100644
--- a/sycl/test-e2e/AtomicRef/sub.h
+++ b/sycl/test-e2e/AtomicRef/sub.h
@@ -32,7 +32,7 @@ void sub_fetch_local_test(queue q, size_t N) {
     buffer<T> sum_buf(&sum, 1);
     buffer<T> output_buf(output.data(), output.size());
     q.submit([&](handler &cgh) {
-       auto sum = sum_buf.template get_access<access::mode::read_write>(cgh);
+       auto sum = sum_buf.template get_access<access_mode::read_write>(cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
        local_accessor<T, 1> loc(1, cgh);
@@ -82,7 +82,7 @@ void sub_fetch_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto val = val_buf.template get_access<access::mode::read_write>(cgh);
+      auto val = val_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
@@ -165,7 +165,7 @@ void sub_minus_equal_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto val = val_buf.template get_access<access::mode::read_write>(cgh);
+      auto val = val_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
@@ -248,7 +248,7 @@ void sub_pre_dec_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto val = val_buf.template get_access<access::mode::read_write>(cgh);
+      auto val = val_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
@@ -331,7 +331,7 @@ void sub_post_dec_test(queue q, size_t N) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto val = val_buf.template get_access<access::mode::read_write>(cgh);
+      auto val = val_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
diff --git a/sycl/test-e2e/AtomicRef/xor.h b/sycl/test-e2e/AtomicRef/xor.h
index 2f4ce02cf91f3..5ff16614f9ace 100644
--- a/sycl/test-e2e/AtomicRef/xor.h
+++ b/sycl/test-e2e/AtomicRef/xor.h
@@ -32,7 +32,7 @@ void xor_local_test(queue q) {
     buffer<T> cum_buf(&cum, 1);
     buffer<T> output_buf(output.data(), output.size());
     q.submit([&](handler &cgh) {
-       auto cum = cum_buf.template get_access<access::mode::read_write>(cgh);
+       auto cum = cum_buf.template get_access<access_mode::read_write>(cgh);
        auto out =
            output_buf.template get_access<access::mode::discard_write>(cgh);
        local_accessor<T, 1> loc(1, cgh);
@@ -79,7 +79,7 @@ void xor_global_test(queue q) {
     buffer<T> output_buf(output.data(), output.size());
 
     q.submit([&](handler &cgh) {
-      auto cum = cum_buf.template get_access<access::mode::read_write>(cgh);
+      auto cum = cum_buf.template get_access<access_mode::read_write>(cgh);
       auto out =
           output_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.parallel_for(range<1>(N), [=](item<1> it) {
diff --git a/sycl/test-e2e/Basic/access_to_subset.cpp b/sycl/test-e2e/Basic/access_to_subset.cpp
index 3fc81f477c0de..d927696d7a39c 100644
--- a/sycl/test-e2e/Basic/access_to_subset.cpp
+++ b/sycl/test-e2e/Basic/access_to_subset.cpp
@@ -12,7 +12,7 @@
 #include <sycl/detail/core.hpp>
 
 using namespace sycl;
-using acc_w = accessor<int, 2, access::mode::write, access::target::device>;
+using acc_w = accessor<int, 2, access_mode::write, access::target::device>;
 
 int main() {
 
diff --git a/sycl/test-e2e/Basic/accessor/accessor.cpp b/sycl/test-e2e/Basic/accessor/accessor.cpp
index b6b7036f1a558..0f79f992415ac 100644
--- a/sycl/test-e2e/Basic/accessor/accessor.cpp
+++ b/sycl/test-e2e/Basic/accessor/accessor.cpp
@@ -35,7 +35,7 @@ struct IdxID3 {
 
 template <typename T>
 using AccAlias =
-    sycl::accessor<T, 1, sycl::access::mode::write, sycl::target::device>;
+    sycl::accessor<T, 1, sycl::access_mode::write, sycl::target::device>;
 
 template <typename T> struct InheritedAccessor : public AccAlias<T> {
 
@@ -67,9 +67,9 @@ template <typename Acc> struct Wrapper3 {
   Wrapper2<Acc> w2;
 };
 
-using ResAccT = sycl::accessor<int, 1, sycl::access::mode::read_write>;
-using AccT = sycl::accessor<int, 1, sycl::access::mode::read>;
-using AccCT = sycl::accessor<const int, 1, sycl::access::mode::read>;
+using ResAccT = sycl::accessor<int, 1, sycl::access_mode::read_write>;
+using AccT = sycl::accessor<int, 1, sycl::access_mode::read>;
+using AccCT = sycl::accessor<const int, 1, sycl::access_mode::read>;
 
 void implicit_conversion(const AccCT &acc, const ResAccT &res_acc) {
   auto v = acc[0];
@@ -188,7 +188,7 @@ void testLocalAccIters(std::vector<int> &vec, bool testConstIter = false,
     sycl::queue queue;
     sycl::buffer<int, 1> buf(vec.data(), vec.size());
     queue.submit([&](sycl::handler &cgh) {
-      auto globAcc = buf.get_access<sycl::access::mode::read_write>(cgh);
+      auto globAcc = buf.get_access<sycl::access_mode::read_write>(cgh);
       if (test2D) {
         sycl::local_accessor<int, 2> locAcc(sycl::range<2>{2, 16}, cgh);
         testLocalAccItersImpl(cgh, globAcc, locAcc, testConstIter);
@@ -268,7 +268,7 @@ int main() {
                              {sycl::property::buffer::use_host_ptr()});
 
     Queue.submit([&](sycl::handler &cgh) {
-      auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+      auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
       assert(!acc.is_placeholder());
       assert(acc.byte_size() == sizeof(int));
       assert(acc.size() == 1);
@@ -289,7 +289,7 @@ int main() {
                                {sycl::property::buffer::use_host_ptr()});
 
       Queue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.parallel_for<class dim2_subscr>(Range, [=](sycl::item<2> itemID) {
           acc[itemID.get_id(0)][itemID.get_id(1)] += itemID.get_linear_id();
         });
@@ -316,7 +316,7 @@ int main() {
     {
       sycl::buffer<int, 1> Buf(Arr, 1);
       queue.submit([&](sycl::handler &cgh) {
-        auto acc = sycl::accessor<int, 2, sycl::access::mode::atomic,
+        auto acc = sycl::accessor<int, 2, sycl::access_mode::atomic,
                                   sycl::target::local>(range, cgh);
         cgh.parallel_for<class dim2_subscr_atomic>(
             sycl::nd_range<2>{range, range}, [=](sycl::nd_item<2>) {
@@ -337,7 +337,7 @@ int main() {
                                {sycl::property::buffer::use_host_ptr()});
 
       Queue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.parallel_for<class dim3_subscr>(Range, [=](sycl::item<3> itemID) {
           acc[itemID.get_id(0)][itemID.get_id(1)][itemID.get_id(2)] +=
               itemID.get_linear_id();
@@ -366,7 +366,7 @@ int main() {
     constexpr int dims = 1;
 
     using data_loc = int;
-    constexpr auto mode_loc = sycl::access::mode::read_write;
+    constexpr auto mode_loc = sycl::access_mode::read_write;
     constexpr auto target_loc = sycl::target::local;
     const auto range_loc = sycl::range<1>(1);
 
@@ -414,7 +414,7 @@ int main() {
       sycl::buffer<int, 1> buf(sycl::range<1>(3));
 
       Queue.submit([&](sycl::handler &cgh) {
-        auto dev_acc = buf.get_access<sycl::access::mode::write>(cgh);
+        auto dev_acc = buf.get_access<sycl::access_mode::write>(cgh);
 
         cgh.parallel_for<class test_discard_read_write>(
             sycl::range<1>{3}, [=](sycl::id<1> index) { dev_acc[index] = 42; });
@@ -435,7 +435,7 @@ int main() {
       sycl::buffer<int, 1> buf((int *)array, sycl::range<1>(10),
                                {sycl::property::buffer::use_host_ptr()});
       queue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         auto acc_wrapped = AccWrapper<decltype(acc)>{acc};
         cgh.parallel_for<class wrapped_access1>(
             sycl::range<1>(buf.size()), [=](sycl::item<1> it) {
@@ -466,8 +466,8 @@ int main() {
       sycl::buffer<int, 1> buf2((int *)array2, sycl::range<1>(10),
                                 {sycl::property::buffer::use_host_ptr()});
       queue.submit([&](sycl::handler &cgh) {
-        auto acc1 = buf1.get_access<sycl::access::mode::read_write>(cgh);
-        auto acc2 = buf2.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc1 = buf1.get_access<sycl::access_mode::read_write>(cgh);
+        auto acc2 = buf2.get_access<sycl::access_mode::read_write>(cgh);
         auto acc_wrapped =
             AccsWrapper<decltype(acc1), decltype(acc2)>{10, acc1, 5, acc2};
         cgh.parallel_for<class wrapped_access2>(
@@ -503,7 +503,7 @@ int main() {
       sycl::buffer<int, 1> buf((int *)array, sycl::range<1>(10),
                                {sycl::property::buffer::use_host_ptr()});
       queue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         auto acc_wrapped = AccWrapper<decltype(acc)>{acc};
         Wrapper1 wr1;
         auto wr2 = Wrapper2<decltype(acc)>{wr1, acc_wrapped};
@@ -533,8 +533,8 @@ int main() {
       sycl::buffer<int, 1> buf(array, sycl::range<1>(3));
 
       queue.submit([&](sycl::handler &cgh) {
-        auto acc1 = buf.get_access<sycl::access::mode::read>(cgh);
-        auto acc2 = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc1 = buf.get_access<sycl::access_mode::read>(cgh);
+        auto acc2 = buf.get_access<sycl::access_mode::read_write>(cgh);
 
         cgh.parallel_for<class two_accessors_to_buf>(
             sycl::range<1>{3},
@@ -559,7 +559,7 @@ int main() {
         sycl::buffer<int, 1> b(&data, sycl::range<1>(1));
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
-          sycl::accessor<int, 0, sycl::access::mode::read_write,
+          sycl::accessor<int, 0, sycl::access_mode::read_write,
                          sycl::target::device>
               B(b, cgh);
           cgh.single_task<class acc_with_zero_dim>([=]() {
@@ -591,13 +591,13 @@ int main() {
 
     sycl::queue queue;
     queue.submit([&](sycl::handler &cgh) {
-      sycl::accessor<int, 0, sycl::access::mode::read_write,
+      sycl::accessor<int, 0, sycl::access_mode::read_write,
                      sycl::target::device>
           acc1(buf1, cgh);
-      sycl::accessor<int, 1, sycl::access::mode::read_write,
+      sycl::accessor<int, 1, sycl::access_mode::read_write,
                      sycl::target::device>
           acc2(buf2, cgh);
-      sycl::accessor<int, 1, sycl::access::mode::read_write,
+      sycl::accessor<int, 1, sycl::access_mode::read_write,
                      sycl::target::device>
           acc3(buf3, cgh, sycl::range<1>(1));
       cgh.single_task<class acc_alloc_buf>([=]() {
@@ -607,11 +607,11 @@ int main() {
       });
     });
 
-    sycl::accessor<int, 0, sycl::access::mode::read, sycl::target::host_buffer>
+    sycl::accessor<int, 0, sycl::access_mode::read, sycl::target::host_buffer>
         acc4(buf1);
-    sycl::accessor<int, 1, sycl::access::mode::read, sycl::target::host_buffer>
+    sycl::accessor<int, 1, sycl::access_mode::read, sycl::target::host_buffer>
         acc5(buf2);
-    sycl::accessor<int, 1, sycl::access::mode::read, sycl::target::host_buffer>
+    sycl::accessor<int, 1, sycl::access_mode::read, sycl::target::host_buffer>
         acc6(buf3, sycl::range<1>(1));
 
     assert(acc4 == 2);
@@ -631,10 +631,9 @@ int main() {
 
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
-          sycl::accessor<int, 1, sycl::access::mode::write,
-                         sycl::target::device>
+          sycl::accessor<int, 1, sycl::access_mode::write, sycl::target::device>
               D(d, cgh);
-          sycl::accessor<int, 1, sycl::access::mode::read,
+          sycl::accessor<int, 1, sycl::access_mode::read,
                          sycl::target::constant_buffer>
               C(c, cgh);
 
@@ -661,10 +660,10 @@ int main() {
         sycl::buffer<int, 1> d(&data, sycl::range<1>(1));
         sycl::buffer<int, 1> c(&cnst, sycl::range<1>(1));
 
-        sycl::accessor<int, 1, sycl::access::mode::write, sycl::target::device,
+        sycl::accessor<int, 1, sycl::access_mode::write, sycl::target::device,
                        sycl::access::placeholder::true_t>
             D(d);
-        sycl::accessor<int, 1, sycl::access::mode::read,
+        sycl::accessor<int, 1, sycl::access_mode::read,
                        sycl::target::constant_buffer,
                        sycl::access::placeholder::true_t>
             C(c);
@@ -695,7 +694,7 @@ int main() {
     sycl::range<1> r(4);
     sycl::buffer<int, 1> b(r);
     try {
-      sycl::accessor<int, 1, sycl::access::mode::read_write,
+      sycl::accessor<int, 1, sycl::access_mode::read_write,
                      sycl::access::target::device,
                      sycl::access::placeholder::true_t>
           acc(b);
@@ -726,7 +725,7 @@ int main() {
     sycl::range<1> r(4);
     sycl::buffer<int, 1> b(r);
     try {
-      using AccT = sycl::accessor<int, 1, sycl::access::mode::read_write,
+      using AccT = sycl::accessor<int, 1, sycl::access_mode::read_write,
                                   sycl::access::target::device,
                                   sycl::access::placeholder::true_t>;
       AccT acc(b);
@@ -760,7 +759,7 @@ int main() {
     sycl::range<1> r(4);
     sycl::buffer<int, 1> b(r);
     try {
-      using AccT = sycl::accessor<int, 1, sycl::access::mode::read_write,
+      using AccT = sycl::accessor<int, 1, sycl::access_mode::read_write,
                                   sycl::access::target::device,
                                   sycl::access::placeholder::true_t>;
       AccT acc(b);
@@ -797,7 +796,7 @@ int main() {
     sycl::range<1> r(4);
     sycl::buffer<int, 1> b(r);
     try {
-      using AccT = sycl::accessor<int, 1, sycl::access::mode::read_write,
+      using AccT = sycl::accessor<int, 1, sycl::access_mode::read_write,
                                   sycl::access::target::device,
                                   sycl::access::placeholder::true_t>;
       AccT acc(b);
@@ -852,10 +851,9 @@ int main() {
 
         sycl::queue queue;
         queue.submit([&](sycl::handler &cgh) {
-          sycl::accessor<int, 1, sycl::access::mode::write,
-                         sycl::target::device>
+          sycl::accessor<int, 1, sycl::access_mode::write, sycl::target::device>
               AccA(A, cgh);
-          sycl::accessor<int, 1, sycl::access::mode::read,
+          sycl::accessor<int, 1, sycl::access_mode::read,
                          sycl::target::constant_buffer>
               AccB(B, cgh);
           InheritedAccessor<int> AccC(C, cgh);
@@ -888,7 +886,7 @@ int main() {
       {
         sycl::buffer buf(array, sycl::range<1>(3));
         q.submit([&](sycl::handler &h) {
-          auto acc = buf.get_access<sycl::access::mode::write>(h);
+          auto acc = buf.get_access<sycl::access_mode::write>(h);
           h.parallel_for<class A>(3, [=](sycl::id<1> i) {
             for (int j = 0; j < 3; ++j) {
               acc[i][j] = j + i * 10;
@@ -925,7 +923,7 @@ int main() {
 
     // illegal ranges
     try {
-      auto acc = b.get_access<sycl::access::mode::read_write>(illegalR, offset);
+      auto acc = b.get_access<sycl::access_mode::read_write>(illegalR, offset);
       assert(false && "operation should not have succeeded");
     } catch (sycl::exception &e) {
       assert(e.code() == sycl::errc::invalid && "errc should be errc::invalid");
@@ -933,7 +931,7 @@ int main() {
     try {
       sycl::queue q;
       q.submit([&](sycl::handler &cgh) {
-        auto acc = b.get_access<sycl::access::mode::read_write>(cgh, illegalR);
+        auto acc = b.get_access<sycl::access_mode::read_write>(cgh, illegalR);
       });
       q.wait_and_throw();
       assert(false &&
@@ -1174,7 +1172,7 @@ int main() {
     sycl::queue Queue;
     int Data[] = {32, 32};
 
-    using HostTaskAcc = sycl::accessor<int, 0, sycl::access::mode::read_write,
+    using HostTaskAcc = sycl::accessor<int, 0, sycl::access_mode::read_write,
                                        sycl::access::target::host_task>;
 
     // Explicit block to prompt copy-back to Data
@@ -1455,7 +1453,7 @@ int main() {
         queue
             .submit([&](sycl::handler &cgh) {
               auto B =
-                  IBuf.template get_access<sycl::access::mode::read_write>(cgh);
+                  IBuf.template get_access<sycl::access_mode::read_write>(cgh);
 
               cgh.single_task<class fill_with_potentially_zero_size>([=]() {
                 for (size_t I = 0; I < B.size(); ++I)
@@ -1530,7 +1528,7 @@ int main() {
 
   // default constructed accessor can be passed to a kernel (2).
   {
-    using AccT = sycl::accessor<int, 1, sycl::access::mode::read_write>;
+    using AccT = sycl::accessor<int, 1, sycl::access_mode::read_write>;
     AccT acc;
     assert(acc.empty());
     sycl::queue q;
diff --git a/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp b/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp
index 5fb98ae7d6b59..32309a20e87de 100644
--- a/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp
+++ b/sycl/test-e2e/Basic/alloc_pinned_host_memory.cpp
@@ -30,8 +30,8 @@ int main() {
           {ext::oneapi::property::buffer::use_pinned_host_memory()});
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto A = a.get_access<access::mode::read_write>(cgh);
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto A = a.get_access<access_mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class init_b>(range<1>{10}, [=](id<1> index) {
           B[index] = 0;
           A[index] = B[index] + 1;
diff --git a/sycl/test-e2e/Basic/bit_cast/bit_cast.cpp b/sycl/test-e2e/Basic/bit_cast/bit_cast.cpp
index fc3c700462e22..2c61124daf571 100644
--- a/sycl/test-e2e/Basic/bit_cast/bit_cast.cpp
+++ b/sycl/test-e2e/Basic/bit_cast/bit_cast.cpp
@@ -10,7 +10,7 @@
 #include <math.h>
 #include <type_traits>
 
-constexpr sycl::access::mode sycl_write = sycl::access::mode::write;
+constexpr sycl::access_mode sycl_write = sycl::access_mode::write;
 
 template <typename To, typename From> class BitCastKernel;
 
diff --git a/sycl/test-e2e/Basic/buffer/buffer.cpp b/sycl/test-e2e/Basic/buffer/buffer.cpp
index 6444d6f9867f6..f263c5c98ea31 100644
--- a/sycl/test-e2e/Basic/buffer/buffer.cpp
+++ b/sycl/test-e2e/Basic/buffer/buffer.cpp
@@ -33,7 +33,7 @@ int main() {
       buffer<int, 1> b(data1, range<1>(10), {property::buffer::use_host_ptr()});
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class init_a>(range<1>{10},
                                        [=](id<1> index) { B[index] = 0; });
       });
@@ -49,7 +49,7 @@ int main() {
       buffer<int, 1> b(data1.data(), range<1>(10));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class init_b>(range<1>{10},
                                        [=](id<1> index) { B[index] = 0; });
       });
@@ -72,9 +72,9 @@ int main() {
       buffer<int, 1> e(res.data(), range<1>(bufsSize));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
-        auto D = d.get_access<access::mode::write>(cgh);
-        auto E = e.get_access<access::mode::write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
+        auto D = d.get_access<access_mode::write>(cgh);
+        auto E = e.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class init_c>(range<1>{bufsSize}, [=](id<1> index) {
           B[index]++;
           D[index] = B[index] + B[index] + 1;
@@ -162,7 +162,7 @@ int main() {
       Buffer.set_final_data(nullptr);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class Nullptr>(range<1>{10},
                                         [=](id<1> index) { B[index] = 1; });
       });
@@ -177,7 +177,7 @@ int main() {
       Buffer.set_final_data(result);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class rawPointer>(range<1>{10},
                                            [=](id<1> index) { B[index] = 1; });
       });
@@ -193,7 +193,7 @@ int main() {
       Buffer.set_final_data(resultWeak);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class weakPointer>(range<1>{10},
                                             [=](id<1> index) { B[index] = 1; });
       });
@@ -209,7 +209,7 @@ int main() {
       Buffer.set_final_data(result);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class sharedPointer>(
             range<1>{10}, [=](id<1> index) { B[index] = 1; });
       });
@@ -230,7 +230,7 @@ int main() {
       queue myQueue;
       resultShared.reset();
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class sharedPointerAndReset>(
             range<1>{10}, [=](id<1> index) { B[index] = 1; });
       });
@@ -246,7 +246,7 @@ int main() {
       Buffer.set_final_data(result.begin());
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class vectorIterator>(
             range<1>{10}, [=](id<1> index) { B[index] = 1; });
       });
@@ -262,7 +262,7 @@ int main() {
       Buffer.set_final_data(nullptr);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class nullptAndUseHost>(
             range<1>{10}, [=](id<1> index) { B[index] = 1; });
       });
@@ -278,7 +278,7 @@ int main() {
       Buffer.set_final_data(result);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class rawPointerAndUseHost>(
             range<1>{10}, [=](id<1> index) { B[index] = 1; });
       });
@@ -295,7 +295,7 @@ int main() {
       Buffer.set_final_data(resultWeak);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class sharedPointerUseHost>(
             range<1>{10}, [=](id<1> index) { B[index] = 1; });
       });
@@ -316,7 +316,7 @@ int main() {
       queue myQueue;
       resultShared.reset();
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class sharedPointerAndResetUseHost>(
             range<1>{10}, [=](id<1> index) { B[index] = 1; });
       });
@@ -333,7 +333,7 @@ int main() {
       Buffer.set_final_data(result.begin());
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class vectorIteratorAndUseHost>(
             range<1>{10}, [=](id<1> index) { B[index] = 1; });
       });
@@ -348,13 +348,13 @@ int main() {
       Buffer.set_final_data((int *)result);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class bufferByRange2Init>(
             range<2>{20, 20}, [=](id<2> index) { B[index] = 0; });
       });
 
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class bufferByRange2>(
             range<2>{10, 10}, [=](id<2> index) { B[index] = 1; });
       });
@@ -388,13 +388,13 @@ int main() {
       Buffer.set_final_data((int *)result);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = Buffer.get_access<access::mode::write>(cgh);
+        auto B = Buffer.get_access<access_mode::write>(cgh);
         cgh.parallel_for<class bufferByRangeOffsetInit>(
             range<2>{20, 20}, [=](id<2> index) { B[index] = 0; });
       });
 
       myQueue.submit([&](handler &cgh) {
-        accessor<int, 2, access::mode::write, access::target::device,
+        accessor<int, 2, access_mode::write, access::target::device,
                  access::placeholder::false_t>
             B(Buffer, cgh, range<2>(10, 10), id<2>(10, 10));
         cgh.parallel_for<class bufferByRangeOffset>(
@@ -429,7 +429,7 @@ int main() {
       buffer<int, 1> b(data1.begin() + 2, data1.begin() + 5);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class iter_constuctor>(
             range<1>{3}, [=](id<1> index) { B[index] = 20; });
       });
@@ -448,7 +448,7 @@ int main() {
       buffer<int, 1> b(data1.cbegin() + 2, data1.cbegin() + 5);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class const_iter_constuctor>(
             range<1>{3}, [=](id<1> index) { B[index] = 20; });
       });
@@ -467,7 +467,7 @@ int main() {
       b.set_final_data(data2.begin() + 2);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class iter_constuctor_set_final_data>(
             range<1>{3}, [=](id<1> index) { B[index] = 20; });
       });
@@ -490,7 +490,7 @@ int main() {
       b.set_write_back(true);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class wb>(range<1>{10},
                                    [=](id<1> index) { B[index] = 0; });
       });
@@ -552,11 +552,11 @@ int main() {
 
       Queue.submit([&](sycl::handler &cgh) {
         auto Accessor_bool =
-            buf_bool_shrd.get_access<sycl::access::mode::write>(cgh);
+            buf_bool_shrd.get_access<sycl::access_mode::write>(cgh);
         auto Accessor_int =
-            buf_int_shrd.get_access<sycl::access::mode::write>(cgh);
+            buf_int_shrd.get_access<sycl::access_mode::write>(cgh);
         auto Accessor_float =
-            buf_float_shrd.get_access<sycl::access::mode::write>(cgh);
+            buf_float_shrd.get_access<sycl::access_mode::write>(cgh);
         cgh.parallel_for<class FillBuffer>(r, [=](sycl::id<1> WIid) {
           Accessor_bool[WIid] = true;
           Accessor_int[WIid] = 3;
@@ -584,7 +584,7 @@ int main() {
       b.set_write_back(false);
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class notwb>(range<1>{10},
                                       [=](id<1> index) { B[index] = 0; });
       });
@@ -605,8 +605,8 @@ int main() {
       buffer<int, 1> b(data2.data(), range<1>(10));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto A = a.get_access<access::mode::read_write>(cgh);
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto A = a.get_access<access_mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class override_lambda>(
             range<1>{10}, [=](id<1> index) { A[index] = 0; });
       });
@@ -623,10 +623,10 @@ int main() {
     {
       buffer<int, 1> a(data1.data(), range<1>(10));
       buffer<int, 1> b(data2);
-      accessor<int, 1, access::mode::read_write, access::target::device,
+      accessor<int, 1, access_mode::read_write, access::target::device,
                access::placeholder::true_t>
           A(a);
-      accessor<int, 1, access::mode::read_write, access::target::device,
+      accessor<int, 1, access_mode::read_write, access::target::device,
                access::placeholder::true_t>
           B(b);
       queue myQueue;
@@ -670,8 +670,8 @@ int main() {
       assert(AccA.size() == AccB.size());
     }
 
-    auto AH0 = host_accessor<char, 0, access::mode::read_write>(Buf_1);
-    auto BH0 = host_accessor<char, 0, access::mode::read_write>(Buf_2);
+    auto AH0 = host_accessor<char, 0, access_mode::read_write>(Buf_1);
+    auto BH0 = host_accessor<char, 0, access_mode::read_write>(Buf_2);
     assert(AH0.byte_size() == sizeof(char));
     assert(BH0.byte_size() == sizeof(char));
     assert(AH0.size() == 1);
@@ -680,10 +680,10 @@ int main() {
     queue Queue;
     Queue.submit([&](handler &CGH) {
       auto AK0 =
-          accessor<char, 0, access::mode::read_write, access::target::device>(
+          accessor<char, 0, access_mode::read_write, access::target::device>(
               Buf_1, CGH);
       auto BK0 =
-          accessor<char, 0, access::mode::read_write, access::target::device>(
+          accessor<char, 0, access_mode::read_write, access::target::device>(
               Buf_2, CGH);
       assert(AK0.byte_size() == sizeof(char));
       assert(BK0.byte_size() == sizeof(char));
diff --git a/sycl/test-e2e/Basic/buffer/buffer_container.cpp b/sycl/test-e2e/Basic/buffer/buffer_container.cpp
index 0a263bb199a6c..84e398ac0ec29 100644
--- a/sycl/test-e2e/Basic/buffer/buffer_container.cpp
+++ b/sycl/test-e2e/Basic/buffer/buffer_container.cpp
@@ -14,7 +14,7 @@ int main() {
       buffer A(out_data);
       queue Q;
       Q.submit([&](handler &h) {
-        auto out = A.get_access<access::mode::write>(h);
+        auto out = A.get_access<access_mode::write>(h);
         h.parallel_for<class containerBuffer>(A.get_range(),
                                               [out](id<1> i) { out[i] = 1; });
       });
diff --git a/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp b/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp
index 5106e86bb50a1..2041955eb7b9d 100644
--- a/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp
+++ b/sycl/test-e2e/Basic/buffer/buffer_full_copy.cpp
@@ -22,7 +22,7 @@ void check_copy_device_to_host(sycl::queue &Queue) {
 
   // Submit kernel where you'll fill the buffer
   Queue.submit([&](sycl::handler &cgh) {
-    auto acc = simple_buffer.get_access<sycl::access::mode::write>(cgh);
+    auto acc = simple_buffer.get_access<sycl::access_mode::write>(cgh);
     cgh.fill(acc, 13);
   });
 
@@ -69,8 +69,8 @@ void check_fill(sycl::queue &Queue) {
   }
 
   auto e = Queue.submit([&](sycl::handler &cgh) {
-    auto a = buf_1.template get_access<sycl::access::mode::write>(cgh, size / 2,
-                                                                  offset);
+    auto a = buf_1.template get_access<sycl::access_mode::write>(cgh, size / 2,
+                                                                 offset);
     cgh.fill(a, (float)1337.0);
   });
   e.wait();
@@ -102,8 +102,8 @@ void check_copy_host_to_device(sycl::queue &Queue) {
     expected_res_2[i] = expected_res_1[offset + i];
 
   auto e = Queue.submit([&](sycl::handler &cgh) {
-    auto a = buf_1.get_access<sycl::access::mode::read>(cgh, size / 2, offset);
-    auto b = buf_2.get_access<sycl::access::mode::write>(cgh, size / 2);
+    auto a = buf_1.get_access<sycl::access_mode::read>(cgh, size / 2, offset);
+    auto b = buf_2.get_access<sycl::access_mode::write>(cgh, size / 2);
     cgh.copy(a, b);
   });
   e.wait();
@@ -141,10 +141,10 @@ void check_copy_host_to_device(sycl::queue &Queue) {
       expected_res_4[i][j] = expected_res_3[i + offset][j + offset];
 
   e = Queue.submit([&](sycl::handler &cgh) {
-    auto a = buf_3.get_access<sycl::access::mode::read>(
+    auto a = buf_3.get_access<sycl::access_mode::read>(
         cgh, {size / 2, size / 2}, {offset, offset});
     auto b =
-        buf_4.get_access<sycl::access::mode::write>(cgh, {size / 2, size / 2});
+        buf_4.get_access<sycl::access_mode::write>(cgh, {size / 2, size / 2});
     cgh.copy(a, b);
   });
   e.wait();
@@ -190,9 +190,9 @@ void check_copy_host_to_device(sycl::queue &Queue) {
             expected_res_5[i + offset][j + offset][k + offset];
 
   e = Queue.submit([&](sycl::handler &cgh) {
-    auto a = buf_5.get_access<sycl::access::mode::read>(
+    auto a = buf_5.get_access<sycl::access_mode::read>(
         cgh, {size / 2, size / 2, size / 2}, {offset, offset, offset});
-    auto b = buf_6.get_access<sycl::access::mode::write>(
+    auto b = buf_6.get_access<sycl::access_mode::write>(
         cgh, {size / 2, size / 2, size / 2});
     cgh.copy(a, b);
   });
diff --git a/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp b/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp
index 2fa49525a738b..d65ad14b6ba10 100644
--- a/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp
+++ b/sycl/test-e2e/Basic/buffer/native_buffer_creation_flags.cpp
@@ -22,7 +22,7 @@ int main() {
     // buffer is created with the UR_MEM_FLAG_USE_HOST_POINTER flag.
     // CHECK: <--- urMemBufferCreate
     // CHECK-SAME: UR_MEM_FLAG_USE_HOST_POINTER
-    auto BufAcc = Buf.get_access<access::mode::read>(Cgh);
+    auto BufAcc = Buf.get_access<access_mode::read>(Cgh);
     Cgh.single_task<Foo>([=]() { int A = BufAcc[0]; });
   });
 }
diff --git a/sycl/test-e2e/Basic/buffer/reinterpret.cpp b/sycl/test-e2e/Basic/buffer/reinterpret.cpp
index 8dba511eb60de..1502e4938268d 100644
--- a/sycl/test-e2e/Basic/buffer/reinterpret.cpp
+++ b/sycl/test-e2e/Basic/buffer/reinterpret.cpp
@@ -39,7 +39,7 @@ void execute_kernel(sycl::queue &cmd_queue, std::vector<OldType> &data,
 
   cmd_queue.submit([&](sycl::handler &cgh) {
     auto rb_acc =
-        reinterpret_subbuf.template get_access<sycl::access::mode::write>(cgh);
+        reinterpret_subbuf.template get_access<sycl::access_mode::write>(cgh);
     cgh.parallel_for<KernelName>(
         reinterpret_subbuf.get_range(),
         [=](sycl::id<dim> index) { rb_acc[index] = val; });
@@ -61,7 +61,7 @@ int main() {
   sycl::buffer<unsigned int, 1> buf_i(r1);
   auto buf_char = buf_i.reinterpret<unsigned char>(r2);
   cmd_queue.submit([&](sycl::handler &cgh) {
-    auto acc = buf_char.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc = buf_char.get_access<sycl::access_mode::read_write>(cgh);
     cgh.parallel_for<class chars>(r2,
                                   [=](sycl::id<1> i) { acc[i] = UCHAR_MAX; });
   });
@@ -81,7 +81,7 @@ int main() {
   sycl::buffer<unsigned int, 1> buf_1d(r1d);
   auto buf_2d = buf_1d.reinterpret<unsigned int>(r2d);
   cmd_queue.submit([&](sycl::handler &cgh) {
-    auto acc2d = buf_2d.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc2d = buf_2d.get_access<sycl::access_mode::read_write>(cgh);
     cgh.parallel_for<class ones>(r2d, [=](sycl::item<2> itemID) {
       size_t i = itemID.get_id(0);
       size_t j = itemID.get_id(1);
@@ -194,7 +194,7 @@ int main() {
 
       cmd_queue.submit([&](sycl::handler &cgh) {
         auto rb_acc =
-            reinterpret_subbuf.get_access<sycl::access::mode::write>(cgh);
+            reinterpret_subbuf.get_access<sycl::access_mode::write>(cgh);
         cgh.parallel_for<class foo_3>(
             reinterpret_subbuf.get_range(),
             [=](sycl::id<1> index) { rb_acc[index] = 13; });
diff --git a/sycl/test-e2e/Basic/buffer/subbuffer.cpp b/sycl/test-e2e/Basic/buffer/subbuffer.cpp
index 0ea777a23ecad..93d2c8e00306f 100644
--- a/sycl/test-e2e/Basic/buffer/subbuffer.cpp
+++ b/sycl/test-e2e/Basic/buffer/subbuffer.cpp
@@ -41,7 +41,7 @@ void checkHostAccessor(sycl::queue &q) {
     }
 
     q.submit([&](sycl::handler &cgh) {
-      auto acc = subbuf.get_access<sycl::access::mode::write>(cgh);
+      auto acc = subbuf.get_access<sycl::access_mode::write>(cgh);
       cgh.parallel_for<class foobar_2>(sycl::range<1>(10),
                                        [=](sycl::id<1> i) { acc[i] *= -10; });
     });
@@ -85,7 +85,7 @@ void check1DSubBuffer(sycl::queue &q) {
     q.submit([&](sycl::handler &cgh) {
       // accessor starts at the third element of the subbuffer
       // and can read for 7 more (ie to the end of the subbuffer)
-      auto acc = subbuf.get_access<sycl::access::mode::read_write>(
+      auto acc = subbuf.get_access<sycl::access_mode::read_write>(
           cgh, sycl::range<1>(subbuffer_access_range),
           sycl::id<1>(offset_inside_subbuf));
       // subrange is made negative. ( 32 33 34 -35 -36 -37 -38 -39 -40 -41)
@@ -95,8 +95,8 @@ void check1DSubBuffer(sycl::queue &q) {
 
     // copy results of last operation back to buf2/vec2
     q.submit([&](sycl::handler &cgh) {
-      auto acc_sub = subbuf.get_access<sycl::access::mode::read>(cgh);
-      auto acc_buf = buf2.get_access<sycl::access::mode::write>(cgh);
+      auto acc_sub = subbuf.get_access<sycl::access_mode::read>(cgh);
+      auto acc_buf = buf2.get_access<sycl::access_mode::write>(cgh);
       cgh.parallel_for<class foobar_0>(
           subbuf.get_range(), [=](sycl::id<1> i) { acc_buf[i] = acc_sub[i]; });
     });
@@ -106,7 +106,7 @@ void check1DSubBuffer(sycl::queue &q) {
     // (..29 30 31 | 320 330 340 -350 -360 -370 -380 -390 -400 -410 | 42 43 44
     // ...)
     q.submit([&](sycl::handler &cgh) {
-      auto acc_sub = subbuf.get_access<sycl::access::mode::read_write>(
+      auto acc_sub = subbuf.get_access<sycl::access_mode::read_write>(
           cgh, sycl::range<1>(subbuf_size));
       cgh.parallel_for<class foobar_1>(
           sycl::range<1>(subbuf_size),
@@ -248,7 +248,7 @@ void checkExceptions() {
 }
 
 void copyBlock() {
-  using typename sycl::access::mode;
+  using typename sycl::access_mode;
   using buffer = sycl::buffer<int, 1>;
 
   auto CopyF = [](buffer &Buffer, buffer &Block, size_t Idx, size_t BlockSize) {
@@ -312,13 +312,13 @@ void checkMultipleContexts() {
     sycl::buffer<int, 1> subbuf2(buf, sycl::id<1>(N / 2),
                                  sycl::range<1>(N / 2));
     queue1.submit([&](sycl::handler &cgh) {
-      auto bufacc = subbuf1.get_access<sycl::access::mode::read_write>(cgh);
+      auto bufacc = subbuf1.get_access<sycl::access_mode::read_write>(cgh);
       cgh.parallel_for<class sub_buffer_1>(
           sycl::range<1>(N / 2), [=](sycl::id<1> idx) { bufacc[idx[0]] = 1; });
     });
 
     queue2.submit([&](sycl::handler &cgh) {
-      auto bufacc = subbuf2.get_access<sycl::access::mode::read_write>(cgh);
+      auto bufacc = subbuf2.get_access<sycl::access_mode::read_write>(cgh);
       cgh.parallel_for<class sub_buffer_2>(
           sycl::range<1>(N / 2), [=](sycl::id<1> idx) { bufacc[idx[0]] = 2; });
     });
@@ -331,7 +331,7 @@ void checkMultipleContexts() {
     sycl::buffer<int, 1> subbuf1(buf, sycl::id<1>(N / 2),
                                  sycl::range<1>(N / 2));
     queue1.submit([&](sycl::handler &cgh) {
-      auto bufacc = subbuf1.get_access<sycl::access::mode::read_write>(cgh);
+      auto bufacc = subbuf1.get_access<sycl::access_mode::read_write>(cgh);
       cgh.parallel_for<class sub_buffer_3>(
           sycl::range<1>(N / 2), [=](sycl::id<1> idx) { bufacc[idx[0]] = -1; });
     });
diff --git a/sycl/test-e2e/Basic/built-ins.cpp b/sycl/test-e2e/Basic/built-ins.cpp
index 2984ba302a9d4..e2085d4ee1b7c 100644
--- a/sycl/test-e2e/Basic/built-ins.cpp
+++ b/sycl/test-e2e/Basic/built-ins.cpp
@@ -41,8 +41,8 @@ int main() {
     s::buffer<float, 1> BufMin(s::range<1>(1));
     s::buffer<s::float2, 1> BufMax(s::range<1>(1));
     q.submit([&](s::handler &cgh) {
-      auto AccMin = BufMin.get_access<s::access::mode::write>(cgh);
-      auto AccMax = BufMax.get_access<s::access::mode::write>(cgh);
+      auto AccMin = BufMin.get_access<s::access_mode::write>(cgh);
+      auto AccMax = BufMax.get_access<s::access_mode::write>(cgh);
       cgh.single_task<class common>([=]() {
         AccMax[0] = s::max(s::float2{0.5f, 2.5f}, s::float2{2.3f, 2.3f});
         AccMin[0] = s::min(float{0.5f}, float{2.3f});
diff --git a/sycl/test-e2e/Basic/char_builtins.cpp b/sycl/test-e2e/Basic/char_builtins.cpp
index f31c69c51a5e1..3ca6df038a080 100644
--- a/sycl/test-e2e/Basic/char_builtins.cpp
+++ b/sycl/test-e2e/Basic/char_builtins.cpp
@@ -46,9 +46,9 @@ template <typename T> int doCharTest(const T *A, const T *B, T *C) {
     buffer<T> BBuf(B, BufferSize);
     buffer<T> CBuf(C, BufferSize);
     Q.submit([&](handler &CGH) {
-      auto AAcc = ABuf.template get_access<access::mode::read>(CGH);
-      auto BAcc = BBuf.template get_access<access::mode::read>(CGH);
-      auto CAcc = CBuf.template get_access<access::mode::write>(CGH);
+      auto AAcc = ABuf.template get_access<access_mode::read>(CGH);
+      auto BAcc = BBuf.template get_access<access_mode::read>(CGH);
+      auto CAcc = CBuf.template get_access<access_mode::write>(CGH);
       CGH.single_task<>([=]() {
         CAcc[0] = clz(AAcc[0]);
         CAcc[1] = ctz(AAcc[1]);
@@ -69,7 +69,7 @@ template <typename T> int doCharTest(const T *A, const T *B, T *C) {
   {
     buffer<T> ABuf(A, BufferSize);
     Q.submit([&](handler &CGH) {
-      auto AAcc = ABuf.template get_access<access::mode::read_write>(CGH);
+      auto AAcc = ABuf.template get_access<access_mode::read_write>(CGH);
       local_accessor<T, 1> Local(range<1>{WorkGroupSize}, CGH);
 
       nd_range<1> NDR{range<1>(NElems), range<1>(WorkGroupSize)};
diff --git a/sycl/test-e2e/Basic/compare_exchange_strong.cpp b/sycl/test-e2e/Basic/compare_exchange_strong.cpp
index 92e0a30f04d98..fca6d96079cff 100644
--- a/sycl/test-e2e/Basic/compare_exchange_strong.cpp
+++ b/sycl/test-e2e/Basic/compare_exchange_strong.cpp
@@ -16,8 +16,8 @@ int main() {
     buffer<int32_t, 1> buf(&data, range<1>(1));
 
     testQueue.submit([&](handler &cgh) {
-      auto globAcc = buf.template get_access<access::mode::atomic>(cgh);
-      auto resultAcc = resultBuf.template get_access<access::mode::write>(cgh);
+      auto globAcc = buf.template get_access<access_mode::atomic>(cgh);
+      auto resultAcc = resultBuf.template get_access<access_mode::write>(cgh);
       cgh.single_task<class foo>([=]() {
         auto a = globAcc[0];
         char result = 0;
diff --git a/sycl/test-e2e/Basic/device_event.cpp b/sycl/test-e2e/Basic/device_event.cpp
index c1ee8e38e8587..e840a47ec87c4 100644
--- a/sycl/test-e2e/Basic/device_event.cpp
+++ b/sycl/test-e2e/Basic/device_event.cpp
@@ -67,7 +67,7 @@ int test_strideN(size_t stride) {
     buffer<int, 1> out_buf(out_data, range<1>(nElems));
 
     myQueue.submit([&](handler &cgh) {
-      auto out_ptr = out_buf.get_access<access::mode::write>(cgh);
+      auto out_ptr = out_buf.get_access<access_mode::write>(cgh);
       local_accessor<int, 1> local_acc(range<1>(16), cgh);
 
       // Create work-groups with 16 work items in each group.
diff --git a/sycl/test-e2e/Basic/event.cpp b/sycl/test-e2e/Basic/event.cpp
index 513e1aa8d6304..aca2fe33185e7 100644
--- a/sycl/test-e2e/Basic/event.cpp
+++ b/sycl/test-e2e/Basic/event.cpp
@@ -70,7 +70,7 @@ int main() {
     float Scalar = 2.0;
     sycl::buffer<float, 1> Buf(&Data, sycl::range<1>(1));
     auto Event = Queue.submit([&](sycl::handler &cgh) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(cgh);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(cgh);
 
       cgh.single_task<class test_event>([=]() { Acc[0] = Scalar; });
     });
diff --git a/sycl/test-e2e/Basic/event_profiling_info.cpp b/sycl/test-e2e/Basic/event_profiling_info.cpp
index 8339491e93ad7..c4c4c3d894c47 100644
--- a/sycl/test-e2e/Basic/event_profiling_info.cpp
+++ b/sycl/test-e2e/Basic/event_profiling_info.cpp
@@ -53,9 +53,9 @@ int main() {
     // buffer copy
     queue copyQueue{Dev, sycl::property::queue::enable_profiling()};
     event copyEvent = copyQueue.submit([&](sycl::handler &Cgh) {
-      accessor<int, 1, access::mode::read, access::target::device> AccessorFrom(
+      accessor<int, 1, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh, range<1>(Size));
-      accessor<int, 1, access::mode::write, access::target::device> AccessorTo(
+      accessor<int, 1, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh, range<1>(Size));
       Cgh.copy(AccessorFrom, AccessorTo);
     });
diff --git a/sycl/test-e2e/Basic/fill_accessor.cpp b/sycl/test-e2e/Basic/fill_accessor.cpp
index 7327e4b5859f0..cd0d7f58852ef 100644
--- a/sycl/test-e2e/Basic/fill_accessor.cpp
+++ b/sycl/test-e2e/Basic/fill_accessor.cpp
@@ -52,7 +52,7 @@ void CheckFillZeroDimAccessor(queue &Q, T Init, T Expected) {
   {
     buffer<T, Dims> Buffer(Data.data(), Range);
     Q.submit([&](handler &CGH) {
-       accessor<T, 0, sycl::access::mode::write> Accessor(Buffer, CGH);
+       accessor<T, 0, sycl::access_mode::write> Accessor(Buffer, CGH);
        CGH.fill(Accessor, Expected);
      }).wait_and_throw();
   }
diff --git a/sycl/test-e2e/Basic/fill_accessor_ur.cpp b/sycl/test-e2e/Basic/fill_accessor_ur.cpp
index 8f938aa77d815..247a041d46d4b 100644
--- a/sycl/test-e2e/Basic/fill_accessor_ur.cpp
+++ b/sycl/test-e2e/Basic/fill_accessor_ur.cpp
@@ -20,7 +20,7 @@ void testFill_Buffer1D() {
     sycl::queue q;
     std::cout << "start testFill_Buffer1D" << std::endl;
     q.submit([&](sycl::handler &cgh) {
-      auto acc1D = buffer_1D.get_access<sycl::access::mode::write>(cgh);
+      auto acc1D = buffer_1D.get_access<sycl::access_mode::write>(cgh);
       // should stage urEnqueueMemBufferFill
       cgh.fill(acc1D, float{1});
     });
@@ -29,7 +29,7 @@ void testFill_Buffer1D() {
     std::cout << "start testFill_Buffer1D -- OFFSET" << std::endl;
     q.submit([&](sycl::handler &cgh) {
       auto acc1DOffset =
-          buffer_1D.get_access<sycl::access::mode::write>(cgh, {4}, {2});
+          buffer_1D.get_access<sycl::access_mode::write>(cgh, {4}, {2});
       // despite being offset, should stage urEnqueueMemBufferFill
       cgh.fill(acc1DOffset, float{2});
     });
@@ -50,7 +50,7 @@ void testFill_Buffer2D() {
     sycl::queue q;
     std::cout << "start testFill_Buffer2D" << std::endl;
     q.submit([&](sycl::handler &cgh) {
-      auto acc2D = buffer_2D.get_access<sycl::access::mode::write>(cgh);
+      auto acc2D = buffer_2D.get_access<sycl::access_mode::write>(cgh);
       // should stage urEnqueueMemBufferFill
       cgh.fill(acc2D, float{3});
     });
@@ -59,7 +59,7 @@ void testFill_Buffer2D() {
     std::cout << "start testFill_Buffer2D -- OFFSET" << std::endl;
     q.submit([&](sycl::handler &cgh) {
       auto acc2D =
-          buffer_2D.get_access<sycl::access::mode::write>(cgh, {8, 12}, {2, 2});
+          buffer_2D.get_access<sycl::access_mode::write>(cgh, {8, 12}, {2, 2});
       // "ranged accessor" will have to be handled by custom kernel:
       // urEnqueueKernelLaunchWithArgsExp
       cgh.fill(acc2D, float{4});
@@ -81,7 +81,7 @@ void testFill_Buffer3D() {
     sycl::queue q;
     std::cout << "start testFill_Buffer3D" << std::endl;
     q.submit([&](sycl::handler &cgh) {
-      auto acc3D = buffer_3D.get_access<sycl::access::mode::write>(cgh);
+      auto acc3D = buffer_3D.get_access<sycl::access_mode::write>(cgh);
       // should stage urEnqueueMemBufferFill
       cgh.fill(acc3D, float{5});
     });
@@ -89,7 +89,7 @@ void testFill_Buffer3D() {
 
     std::cout << "start testFill_Buffer3D -- OFFSET" << std::endl;
     q.submit([&](sycl::handler &cgh) {
-      auto acc3D = buffer_3D.get_access<sycl::access::mode::write>(
+      auto acc3D = buffer_3D.get_access<sycl::access_mode::write>(
           cgh, {4, 8, 12}, {3, 3, 3});
       // "ranged accessor" will have to be handled by custom kernel:
       // urEnqueueKernelLaunchWithArgsExp
@@ -113,7 +113,7 @@ void testFill_ZeroDim() {
     sycl::queue q;
     std::cout << "start testFill_ZeroDim" << std::endl;
     q.submit([&](sycl::handler &cgh) {
-      sycl::accessor<float, 0, sycl::access::mode::write> Acc0(Buffer, cgh);
+      sycl::accessor<float, 0, sycl::access_mode::write> Acc0(Buffer, cgh);
       cgh.fill(Acc0, float{1});
     });
     q.wait();
diff --git a/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp b/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp
index 9f1120994e3e9..2cb4b7e0c519d 100644
--- a/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp
+++ b/sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp
@@ -32,12 +32,12 @@ int main() {
       sycl::buffer<int> results_buf(results, sycl::range<1>(checks_number));
       sycl::queue q;
       q.submit([&](sycl::handler &cgh) {
-        sycl::accessor<int, 1, sycl::access::mode::write,
+        sycl::accessor<int, 1, sycl::access_mode::write,
                        sycl::access::target::device>
-            acc(buf.get_access<sycl::access::mode::write>(cgh));
-        sycl::accessor<int, 1, sycl::access::mode::write,
+            acc(buf.get_access<sycl::access_mode::write>(cgh));
+        sycl::accessor<int, 1, sycl::access_mode::write,
                        sycl::access::target::device>
-            results_acc(results_buf.get_access<sycl::access::mode::write>(cgh));
+            results_acc(results_buf.get_access<sycl::access_mode::write>(cgh));
         cgh.parallel_for<class IdTest>(n, [=](sycl::id<1> i) {
           auto that_id = sycl::ext::oneapi::this_work_item::get_nd_item<1>();
           results_acc[0] = that_id.get_global_id() == i;
@@ -66,12 +66,12 @@ int main() {
       sycl::buffer<int> results_buf(results, sycl::range<1>(checks_number));
       sycl::queue q;
       q.submit([&](sycl::handler &cgh) {
-        sycl::accessor<int, 1, sycl::access::mode::write,
+        sycl::accessor<int, 1, sycl::access_mode::write,
                        sycl::access::target::device>
-            acc(buf.get_access<sycl::access::mode::write>(cgh));
-        sycl::accessor<int, 1, sycl::access::mode::write,
+            acc(buf.get_access<sycl::access_mode::write>(cgh));
+        sycl::accessor<int, 1, sycl::access_mode::write,
                        sycl::access::target::device>
-            results_acc(results_buf.get_access<sycl::access::mode::write>(cgh));
+            results_acc(results_buf.get_access<sycl::access_mode::write>(cgh));
         cgh.parallel_for<class ItemTest>(n, [=](auto i) {
           static_assert(std::is_same<decltype(i), sycl::item<1>>::value,
                         "lambda arg type is unexpected");
@@ -104,12 +104,12 @@ int main() {
       sycl::queue q;
       sycl::id<1> offset(1);
       q.submit([&](sycl::handler &cgh) {
-        sycl::accessor<int, 1, sycl::access::mode::write,
+        sycl::accessor<int, 1, sycl::access_mode::write,
                        sycl::access::target::device>
-            acc(buf.get_access<sycl::access::mode::write>(cgh));
-        sycl::accessor<int, 1, sycl::access::mode::write,
+            acc(buf.get_access<sycl::access_mode::write>(cgh));
+        sycl::accessor<int, 1, sycl::access_mode::write,
                        sycl::access::target::device>
-            results_acc(results_buf.get_access<sycl::access::mode::write>(cgh));
+            results_acc(results_buf.get_access<sycl::access_mode::write>(cgh));
         cgh.parallel_for<class ItemOffsetTest>(
             sycl::range<1>{n}, offset, [=](sycl::item<1, true> i) {
               auto that_id =
diff --git a/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp b/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp
index 7d8e94bbfb132..f6639ce3527a8 100644
--- a/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp
+++ b/sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp
@@ -30,12 +30,12 @@ int main() {
       sycl::queue q;
       sycl::nd_range<1> NDR(sycl::range<1>{n}, sycl::range<1>{2});
       q.submit([&](sycl::handler &cgh) {
-        sycl::accessor<int, 1, sycl::access::mode::write,
+        sycl::accessor<int, 1, sycl::access_mode::write,
                        sycl::access::target::device>
-            acc(buf.get_access<sycl::access::mode::write>(cgh));
-        sycl::accessor<int, 1, sycl::access::mode::write,
+            acc(buf.get_access<sycl::access_mode::write>(cgh));
+        sycl::accessor<int, 1, sycl::access_mode::write,
                        sycl::access::target::device>
-            results_acc(results_buf.get_access<sycl::access::mode::write>(cgh));
+            results_acc(results_buf.get_access<sycl::access_mode::write>(cgh));
         cgh.parallel_for<class NdItemTest>(NDR, [=](auto nd_i) {
           static_assert(std::is_same<decltype(nd_i), sycl::nd_item<1>>::value,
                         "lambda arg type is unexpected");
diff --git a/sycl/test-e2e/Basic/get_backend.cpp b/sycl/test-e2e/Basic/get_backend.cpp
index fbb3090ba7f4f..81d521c5286d6 100644
--- a/sycl/test-e2e/Basic/get_backend.cpp
+++ b/sycl/test-e2e/Basic/get_backend.cpp
@@ -57,7 +57,7 @@ int main() {
 
     buffer<int, 1> buf{range<1>(1)};
     event e = q.submit([&](handler &cgh) {
-      auto acc = buf.get_access<access::mode::read_write>(cgh);
+      auto acc = buf.get_access<access_mode::read_write>(cgh);
       cgh.fill(acc, 0);
     });
     if (e.get_backend() != plt.get_backend()) {
diff --git a/sycl/test-e2e/Basic/group_async_copy.cpp b/sycl/test-e2e/Basic/group_async_copy.cpp
index ccf3de87c58a0..48d2365c03f05 100644
--- a/sycl/test-e2e/Basic/group_async_copy.cpp
+++ b/sycl/test-e2e/Basic/group_async_copy.cpp
@@ -108,8 +108,8 @@ template <typename T> int test(size_t Stride) {
   initOutputBuffer(OutBuf);
 
   Q.submit([&](handler &CGH) {
-     auto In = InBuf.template get_access<access::mode::read>(CGH);
-     auto Out = OutBuf.template get_access<access::mode::write>(CGH);
+     auto In = InBuf.template get_access<access_mode::read>(CGH);
+     auto Out = OutBuf.template get_access<access_mode::write>(CGH);
      local_accessor<T, 1> Local(range<1>{WorkGroupSize}, CGH);
 
      nd_range<1> NDR{range<1>(NElems), range<1>(WorkGroupSize)};
diff --git a/sycl/test-e2e/Basic/group_async_copy_legacy.cpp b/sycl/test-e2e/Basic/group_async_copy_legacy.cpp
index 9b2279fdcbb83..2cba047661d9c 100644
--- a/sycl/test-e2e/Basic/group_async_copy_legacy.cpp
+++ b/sycl/test-e2e/Basic/group_async_copy_legacy.cpp
@@ -114,8 +114,8 @@ template <typename T> int test(size_t Stride) {
      // In must be read_write for legacy multi_ptr as it would otherwise produce
      // a const multi_ptr which was not a valid source argument to
      // async_work_group_copy in SYCL 1.2.1.
-     auto In = InBuf.template get_access<access::mode::read_write>(CGH);
-     auto Out = OutBuf.template get_access<access::mode::write>(CGH);
+     auto In = InBuf.template get_access<access_mode::read_write>(CGH);
+     auto Out = OutBuf.template get_access<access_mode::write>(CGH);
      local_accessor<T, 1> Local(range<1>{WorkGroupSize}, CGH);
 
      nd_range<1> NDR{range<1>(NElems), range<1>(WorkGroupSize)};
diff --git a/sycl/test-e2e/Basic/half_builtins.cpp b/sycl/test-e2e/Basic/half_builtins.cpp
index 2fcdd1c4b4b68..4ed22ec856251 100644
--- a/sycl/test-e2e/Basic/half_builtins.cpp
+++ b/sycl/test-e2e/Basic/half_builtins.cpp
@@ -178,10 +178,10 @@ int main() {
     buffer<float16> c_buf(&c, 1);
     buffer<int> err_buf(&err, 1);
     q.submit([&](handler &cgh) {
-      auto A = a_buf.get_access<access::mode::read>(cgh);
-      auto B = b_buf.get_access<access::mode::read>(cgh);
-      auto C = c_buf.get_access<access::mode::read>(cgh);
-      auto err = err_buf.get_access<access::mode::write>(cgh);
+      auto A = a_buf.get_access<access_mode::read>(cgh);
+      auto B = b_buf.get_access<access_mode::read>(cgh);
+      auto C = c_buf.get_access<access_mode::read>(cgh);
+      auto err = err_buf.get_access<access_mode::write>(cgh);
       cgh.parallel_for(SZ_max, [=](item<1> index) {
         size_t i = index.get_id(0);
         TEST_BUILTIN_1(sycl::fabs);
diff --git a/sycl/test-e2e/Basic/half_type.cpp b/sycl/test-e2e/Basic/half_type.cpp
index c24a4651c4bd4..f20d215a7475d 100644
--- a/sycl/test-e2e/Basic/half_type.cpp
+++ b/sycl/test-e2e/Basic/half_type.cpp
@@ -34,9 +34,9 @@ void verify_add(queue &q, buffer<half, 1> &a, buffer<half, 1> &b, range<1> &r,
   buffer<half, 1> c{r};
 
   q.submit([&](handler &cgh) {
-    auto A = a.get_access<access::mode::read>(cgh);
-    auto B = b.get_access<access::mode::read>(cgh);
-    auto C = c.get_access<access::mode::write>(cgh);
+    auto A = a.get_access<access_mode::read>(cgh);
+    auto B = b.get_access<access_mode::read>(cgh);
+    auto C = c.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class calc_add>(
         r, [=](id<1> index) { C[index] = A[index] + B[index]; });
   });
@@ -49,9 +49,9 @@ void verify_min(queue &q, buffer<half, 1> &a, buffer<half, 1> &b, range<1> &r,
   buffer<half, 1> c{r};
 
   q.submit([&](handler &cgh) {
-    auto A = a.get_access<access::mode::read>(cgh);
-    auto B = b.get_access<access::mode::read>(cgh);
-    auto C = c.get_access<access::mode::write>(cgh);
+    auto A = a.get_access<access_mode::read>(cgh);
+    auto B = b.get_access<access_mode::read>(cgh);
+    auto C = c.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class calc_min>(
         r, [=](id<1> index) { C[index] = A[index] - B[index]; });
   });
@@ -64,9 +64,9 @@ void verify_mul(queue &q, buffer<half, 1> &a, buffer<half, 1> &b, range<1> &r,
   buffer<half, 1> c{r};
 
   q.submit([&](handler &cgh) {
-    auto A = a.get_access<access::mode::read>(cgh);
-    auto B = b.get_access<access::mode::read>(cgh);
-    auto C = c.get_access<access::mode::write>(cgh);
+    auto A = a.get_access<access_mode::read>(cgh);
+    auto B = b.get_access<access_mode::read>(cgh);
+    auto C = c.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class calc_mul>(
         r, [=](id<1> index) { C[index] = A[index] * B[index]; });
   });
@@ -79,9 +79,9 @@ void verify_div(queue &q, buffer<half, 1> &a, buffer<half, 1> &b, range<1> &r,
   buffer<half, 1> c{r};
 
   q.submit([&](handler &cgh) {
-    auto A = a.get_access<access::mode::read>(cgh);
-    auto B = b.get_access<access::mode::read>(cgh);
-    auto C = c.get_access<access::mode::write>(cgh);
+    auto A = a.get_access<access_mode::read>(cgh);
+    auto B = b.get_access<access_mode::read>(cgh);
+    auto C = c.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class calc_div>(
         r, [=](id<1> index) { C[index] = A[index] / B[index]; });
   });
@@ -94,7 +94,7 @@ void verify_vec(queue &q) {
   int a = 0;
   buffer<int, 1> e(&a, range<1>(1));
   q.submit([&](sycl::handler &cgh) {
-    auto E = e.get_access<access::mode::write>(cgh);
+    auto E = e.get_access<access_mode::write>(cgh);
     cgh.single_task<class vec_of_half>([=]() {
       if (int(hvec.s0()) != 999 || int(hvec.s1()) != 999)
         E[0] = 1;
diff --git a/sycl/test-e2e/Basic/handler/handler_copy_with_offset.cpp b/sycl/test-e2e/Basic/handler/handler_copy_with_offset.cpp
index c54047f49b8d2..1f2dfaf10aa0e 100644
--- a/sycl/test-e2e/Basic/handler/handler_copy_with_offset.cpp
+++ b/sycl/test-e2e/Basic/handler/handler_copy_with_offset.cpp
@@ -19,8 +19,8 @@
 #include <vector>
 
 using namespace sycl;
-constexpr access::mode read = access::mode::read;
-constexpr access::mode write = access::mode::write;
+constexpr access_mode read = access_mode::read;
+constexpr access_mode write = access_mode::write;
 constexpr access::target ondevice = access::target::device;
 
 int main() {
diff --git a/sycl/test-e2e/Basic/handler/handler_generic_integral_lambda.cpp b/sycl/test-e2e/Basic/handler/handler_generic_integral_lambda.cpp
index b68022ff45141..e91bb4873bd61 100644
--- a/sycl/test-e2e/Basic/handler/handler_generic_integral_lambda.cpp
+++ b/sycl/test-e2e/Basic/handler/handler_generic_integral_lambda.cpp
@@ -23,9 +23,9 @@ int main() {
       sycl::buffer<int> buf(data, sycl::range<1>(length));
       sycl::queue q;
       q.submit([&](sycl::handler &cgh) {
-        sycl::accessor<int, 1, sycl::access::mode::write,
+        sycl::accessor<int, 1, sycl::access_mode::write,
                        sycl::access::target::device>
-            acc(buf.get_access<sycl::access::mode::write>(cgh));
+            acc(buf.get_access<sycl::access_mode::write>(cgh));
         cgh.parallel_for<class GenericLambda>(
             length, [=](auto item) { acc[item.get_id()] = item; });
       });
@@ -41,9 +41,9 @@ int main() {
       sycl::buffer<int> buf(data, sycl::range<1>(length));
       sycl::queue q;
       q.submit([&](sycl::handler &cgh) {
-        sycl::accessor<int, 1, sycl::access::mode::write,
+        sycl::accessor<int, 1, sycl::access_mode::write,
                        sycl::access::target::device>
-            acc(buf.get_access<sycl::access::mode::write>(cgh));
+            acc(buf.get_access<sycl::access_mode::write>(cgh));
         cgh.parallel_for<class SizeTLambda>(
             length, [=](std::size_t item) { acc[item] = item; });
       });
@@ -59,9 +59,9 @@ int main() {
       sycl::buffer<int> buf(data, sycl::range<1>(length));
       sycl::queue q;
       q.submit([&](sycl::handler &cgh) {
-        sycl::accessor<int, 1, sycl::access::mode::write,
+        sycl::accessor<int, 1, sycl::access_mode::write,
                        sycl::access::target::device>
-            acc(buf.get_access<sycl::access::mode::write>(cgh));
+            acc(buf.get_access<sycl::access_mode::write>(cgh));
         cgh.parallel_for<class IntLambda>(length,
                                           [=](int item) { acc[item] = item; });
       });
diff --git a/sycl/test-e2e/Basic/handler/handler_mem_op.cpp b/sycl/test-e2e/Basic/handler/handler_mem_op.cpp
index 553e3e8f1c624..e3378cd1b987d 100644
--- a/sycl/test-e2e/Basic/handler/handler_mem_op.cpp
+++ b/sycl/test-e2e/Basic/handler/handler_mem_op.cpp
@@ -226,7 +226,7 @@ template <typename T> void test_fill(T Val) {
     buffer<T, 1> Buffer(Data, range<1>(Size));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::write, access::target::device> Accessor(
+      accessor<T, 1, access_mode::write, access::target::device> Accessor(
           Buffer, Cgh, range<1>(Size));
       Cgh.fill(Accessor, Value);
     });
@@ -247,7 +247,7 @@ template <typename T> void test_copy_ptr_acc() {
     buffer<T, 1> Buffer(Data, range<1>(Size));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::write, access::target::device> Accessor(
+      accessor<T, 1, access_mode::write, access::target::device> Accessor(
           Buffer, Cgh, range<1>(Size));
       Cgh.copy(Values, Accessor);
     });
@@ -283,7 +283,7 @@ template <typename T> void test_3D_copy_ptr_acc() {
     buffer<T, 3> Buffer(Data, Range);
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 3, access::mode::write, access::target::device> Accessor(
+      accessor<T, 3, access_mode::write, access::target::device> Accessor(
           Buffer, Cgh, Range);
       Cgh.copy(Values, Accessor);
     });
@@ -304,7 +304,7 @@ template <typename T> void test_copy_acc_ptr() {
     buffer<T, 1> Buffer(Data, range<1>(Size));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::read, access::target::device> Accessor(
+      accessor<T, 1, access_mode::read, access::target::device> Accessor(
           Buffer, Cgh, range<1>(Size));
       Cgh.copy(Accessor, Values);
     });
@@ -320,7 +320,7 @@ template <typename T> void test_copy_acc_ptr() {
     T Dst[Size] = {0};
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      auto Acc = Buffer.template get_access<access::mode::read>(Cgh);
+      auto Acc = Buffer.template get_access<access_mode::read>(Cgh);
       Cgh.copy(Acc, reinterpret_cast<void *>(Dst));
     });
     Queue.wait();
@@ -336,8 +336,8 @@ template <typename T> void test_copy_acc_ptr() {
     buffer<T, 1> SrcBuf(&SrcValue, range<1>(1));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 0, access::mode::read, access::target::device> SrcAcc(SrcBuf,
-                                                                        Cgh);
+      accessor<T, 0, access_mode::read, access::target::device> SrcAcc(SrcBuf,
+                                                                       Cgh);
       Cgh.copy(SrcAcc, &DstValue);
     });
   }
@@ -348,7 +348,7 @@ template <typename T> void test_copy_acc_ptr() {
   DstValue = 0;
   {
     buffer<T, 1> SrcBuf(&SrcValue, range<1>(1));
-    accessor<T, 0, access::mode::read, access::target::device,
+    accessor<T, 0, access_mode::read, access::target::device,
              access::placeholder::true_t>
         SrcAcc(SrcBuf);
     {
@@ -374,7 +374,7 @@ template <typename T> void test_3D_copy_acc_ptr() {
     buffer<T, 3> Buffer(Data, Range);
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 3, access::mode::read, access::target::device> Accessor(
+      accessor<T, 3, access_mode::read, access::target::device> Accessor(
           Buffer, Cgh, Range);
       Cgh.copy(Accessor, Values);
     });
@@ -395,7 +395,7 @@ template <typename T> void test_copy_shared_ptr_acc() {
     buffer<T, 1> Buffer(Data, range<1>(Size));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::write, access::target::device> Accessor(
+      accessor<T, 1, access_mode::write, access::target::device> Accessor(
           Buffer, Cgh, range<1>(Size));
       Cgh.copy(Values, Accessor);
     });
@@ -413,7 +413,7 @@ template <typename T> void test_copy_shared_ptr_const_acc() {
     buffer<T, 1> Buffer(Data, range<1>(Size));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::write, access::target::device> Accessor(
+      accessor<T, 1, access_mode::write, access::target::device> Accessor(
           Buffer, Cgh, range<1>(Size));
       Cgh.copy(Values, Accessor);
     });
@@ -434,7 +434,7 @@ template <typename T> void test_copy_acc_shared_ptr() {
     buffer<T, 1> Buffer(Data, range<1>(Size));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::read, access::target::device> Accessor(
+      accessor<T, 1, access_mode::read, access::target::device> Accessor(
           Buffer, Cgh, range<1>(Size));
       Cgh.copy(Accessor, Values);
     });
@@ -456,9 +456,9 @@ template <typename T> void test_copy_acc_acc() {
     buffer<T, 1> BufferTo(Values, range<1>(Size));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 1, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh, range<1>(Size));
-      accessor<T, 1, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 1, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh, range<1>(Size));
       Cgh.copy(AccessorFrom, AccessorTo);
     });
@@ -481,13 +481,13 @@ template <typename T> void test_update_host() {
     Buffer.set_final_data(nullptr);
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::write, access::target::device> Accessor(
+      accessor<T, 1, access_mode::write, access::target::device> Accessor(
           Buffer, Cgh, range<1>(Size));
       Cgh.parallel_for<class rawPointer<T>>(
           range<1>{Size}, [=](id<1> Index) { Accessor[Index] = Index.get(0); });
     });
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::write, access::target::device> Accessor(
+      accessor<T, 1, access_mode::write, access::target::device> Accessor(
           Buffer, Cgh, range<1>(Size));
       Cgh.update_host(Accessor);
     });
@@ -511,9 +511,9 @@ template <typename T> void test_2D_copy_acc_acc() {
     buffer<T, 2> BufferTo((T *)Values, range<2>(Size, Size));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 2, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 2, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh, range<2>(Size, Size));
-      accessor<T, 2, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 2, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh, range<2>(Size, Size));
       Cgh.copy(AccessorFrom, AccessorTo);
     });
@@ -542,9 +542,9 @@ template <typename T> void test_3D_copy_acc_acc() {
     buffer<T, 3> BufferTo((T *)Values, range<3>(Size, Size, Size));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 3, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 3, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh, range<3>(Size, Size, Size));
-      accessor<T, 3, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 3, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh, range<3>(Size, Size, Size));
       Cgh.copy(AccessorFrom, AccessorTo);
     });
@@ -567,9 +567,9 @@ template <typename T> void test_0D1D_copy_acc_acc() {
     buffer<T, 1> BufferTo(&Dst, range<1>(1));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 0, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 0, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh);
-      accessor<T, 1, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 1, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh);
       Cgh.copy(AccessorFrom, AccessorTo);
     });
@@ -584,9 +584,9 @@ template <typename T> void test_0D1D_copy_acc_acc() {
     buffer<T, 1> BufferTo(&Dst, range<1>(1));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 1, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh);
-      accessor<T, 0, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 0, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh);
       Cgh.copy(AccessorFrom, AccessorTo);
     });
@@ -601,9 +601,9 @@ template <typename T> void test_0D1D_copy_acc_acc() {
     buffer<T, 1> BufferTo(&Dst, range<1>(1));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 0, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 0, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh);
-      accessor<T, 0, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 0, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh);
       Cgh.copy(AccessorFrom, AccessorTo);
     });
@@ -621,9 +621,9 @@ template <typename T> void test_1D2D_copy_acc_acc() {
     buffer<T, 2> BufferTo(&Values[0], range<2>(Size / 2, 2));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 1, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh, range<1>(Size));
-      accessor<T, 2, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 2, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh, range<2>(Size / 2, 2));
       Cgh.copy(AccessorFrom, AccessorTo);
     });
@@ -641,9 +641,9 @@ template <typename T> void test_1D3D_copy_acc_acc() {
     buffer<T, 3> BufferTo(&Values[0], range<3>(Size / 4, 2, 2));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 1, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 1, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh, range<1>(Size));
-      accessor<T, 3, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 3, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh, range<3>(Size / 4, 2, 2));
       Cgh.copy(AccessorFrom, AccessorTo);
     });
@@ -661,9 +661,9 @@ template <typename T> void test_2D1D_copy_acc_acc() {
     buffer<T, 1> BufferTo(&Values[0], range<1>(Size));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 2, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 2, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh, range<2>(Size / 2, 2));
-      accessor<T, 1, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 1, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh, range<1>(Size));
       Cgh.copy(AccessorFrom, AccessorTo);
     });
@@ -681,9 +681,9 @@ template <typename T> void test_2D3D_copy_acc_acc() {
     buffer<T, 3> BufferTo(&Values[0], range<3>(Size / 4, 2, 2));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 2, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 2, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh, range<2>(Size / 2, 2));
-      accessor<T, 3, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 3, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh, range<3>(Size / 4, 2, 2));
       Cgh.copy(AccessorFrom, AccessorTo);
     });
@@ -701,9 +701,9 @@ template <typename T> void test_3D1D_copy_acc_acc() {
     buffer<T, 1> BufferTo(&Values[0], range<1>(Size));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 3, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 3, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh, range<3>(Size / 4, 2, 2));
-      accessor<T, 1, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 1, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh, range<1>(Size));
       Cgh.copy(AccessorFrom, AccessorTo);
     });
@@ -721,9 +721,9 @@ template <typename T> void test_3D2D_copy_acc_acc() {
     buffer<T, 2> BufferTo(&Values[0], range<2>(Size / 2, 2));
     queue Queue;
     Queue.submit([&](handler &Cgh) {
-      accessor<T, 3, access::mode::read, access::target::device> AccessorFrom(
+      accessor<T, 3, access_mode::read, access::target::device> AccessorFrom(
           BufferFrom, Cgh, range<3>(Size / 4, 2, 2));
-      accessor<T, 2, access::mode::write, access::target::device> AccessorTo(
+      accessor<T, 2, access_mode::write, access::target::device> AccessorTo(
           BufferTo, Cgh, range<2>(Size / 2, 2));
       Cgh.copy(AccessorFrom, AccessorTo);
     });
diff --git a/sycl/test-e2e/Basic/host-task-dependency.cpp b/sycl/test-e2e/Basic/host-task-dependency.cpp
index be6ea2c94a29f..218db85007b06 100644
--- a/sycl/test-e2e/Basic/host-task-dependency.cpp
+++ b/sycl/test-e2e/Basic/host-task-dependency.cpp
@@ -27,10 +27,9 @@ struct Context {
 
 S::event HostTask_CopyBuf1ToBuf2(Context *Ctx) {
   S::event Event = Ctx->Queue.submit([&](S::handler &CGH) {
-    S::host_accessor<int, 1, S::access::mode::read> CopierSrcAcc(Ctx->Buf1,
+    S::host_accessor<int, 1, S::access_mode::read> CopierSrcAcc(Ctx->Buf1, CGH);
+    S::host_accessor<int, 1, S::access_mode::write> CopierDstAcc(Ctx->Buf2,
                                                                  CGH);
-    S::host_accessor<int, 1, S::access::mode::write> CopierDstAcc(Ctx->Buf2,
-                                                                  CGH);
 
     auto CopierHostTask = [=] {
       for (size_t Idx = 0; Idx < CopierDstAcc.size(); ++Idx)
@@ -54,21 +53,21 @@ S::event HostTask_CopyBuf1ToBuf2(Context *Ctx) {
 void Thread1Fn(Context *Ctx) {
   // 0. initialize resulting buffer with apriori wrong result
   {
-    S::host_accessor<int, 1, S::access::mode::write> Acc(Ctx->Buf1);
+    S::host_accessor<int, 1, S::access_mode::write> Acc(Ctx->Buf1);
 
     for (size_t Idx = 0; Idx < Acc.size(); ++Idx)
       Acc[Idx] = -1;
   }
 
   {
-    S::host_accessor<int, 1, S::access::mode::write> Acc(Ctx->Buf2);
+    S::host_accessor<int, 1, S::access_mode::write> Acc(Ctx->Buf2);
 
     for (size_t Idx = 0; Idx < Acc.size(); ++Idx)
       Acc[Idx] = -2;
   }
 
   {
-    S::host_accessor<int, 1, S::access::mode::write> Acc(Ctx->Buf3);
+    S::host_accessor<int, 1, S::access_mode::write> Acc(Ctx->Buf3);
 
     for (size_t Idx = 0; Idx < Acc.size(); ++Idx)
       Acc[Idx] = -3;
@@ -76,7 +75,7 @@ void Thread1Fn(Context *Ctx) {
 
   // 1. submit task writing to buffer 1
   Ctx->Queue.submit([&](S::handler &CGH) {
-    S::accessor<int, 1, S::access::mode::write, S::access::target::device>
+    S::accessor<int, 1, S::access_mode::write, S::access::target::device>
         GeneratorAcc(Ctx->Buf1, CGH);
 
     auto GeneratorKernel = [GeneratorAcc] {
@@ -92,9 +91,9 @@ void Thread1Fn(Context *Ctx) {
 
   // 3. submit simple task to move data between two buffers
   Ctx->Queue.submit([&](S::handler &CGH) {
-    S::accessor<int, 1, S::access::mode::read, S::access::target::device>
-        SrcAcc(Ctx->Buf2, CGH);
-    S::accessor<int, 1, S::access::mode::write, S::access::target::device>
+    S::accessor<int, 1, S::access_mode::read, S::access::target::device> SrcAcc(
+        Ctx->Buf2, CGH);
+    S::accessor<int, 1, S::access_mode::write, S::access::target::device>
         DstAcc(Ctx->Buf3, CGH);
 
     CGH.depends_on(HostTaskEvent);
@@ -109,7 +108,7 @@ void Thread1Fn(Context *Ctx) {
 
   // 4. check data in buffer #3
   {
-    S::host_accessor<int, 1, S::access::mode::read> Acc(Ctx->Buf3);
+    S::host_accessor<int, 1, S::access_mode::read> Acc(Ctx->Buf3);
 
     bool Failure = false;
 
@@ -154,7 +153,7 @@ void test() {
 
   // 3. check via host accessor that buf 2 contains valid data
   {
-    S::host_accessor<int, 1, S::access::mode::read> ResultAcc(Ctx.Buf2);
+    S::host_accessor<int, 1, S::access_mode::read> ResultAcc(Ctx.Buf2);
 
     bool Failure = false;
     for (size_t Idx = 0; Idx < ResultAcc.size(); ++Idx) {
diff --git a/sycl/test-e2e/Basic/image/image.cpp b/sycl/test-e2e/Basic/image/image.cpp
index 79734d985df3b..b9a66a42e3400 100644
--- a/sycl/test-e2e/Basic/image/image.cpp
+++ b/sycl/test-e2e/Basic/image/image.cpp
@@ -29,8 +29,8 @@ int main() {
   const sycl::image_channel_order ChanOrder = sycl::image_channel_order::rgba;
   const sycl::image_channel_type ChanType = sycl::image_channel_type::fp32;
 
-  constexpr auto SYCLRead = sycl::access::mode::read;
-  constexpr auto SYCLWrite = sycl::access::mode::write;
+  constexpr auto SYCLRead = sycl::access_mode::read;
+  constexpr auto SYCLWrite = sycl::access_mode::write;
 
   const sycl::range<2> Img1Size(4, 4);
   const sycl::range<2> Img2Size(4, 4);
@@ -95,7 +95,7 @@ int main() {
     constexpr int dims = 1;
 
     using data_img = sycl::float4;
-    constexpr auto mode_img = sycl::access::mode::read;
+    constexpr auto mode_img = sycl::access_mode::read;
     constexpr auto target_img = sycl::target::image;
     const auto range_img = sycl::range<dims>(3);
     auto image = sycl::image<dims>(sycl::image_channel_order::rgba,
@@ -126,7 +126,7 @@ int main() {
     sycl::queue Q;
     Q.submit([&](sycl::handler &CGH) {
        auto ImgAcc =
-           Img.get_access<sycl::float4, sycl::access::mode::write>(CGH);
+           Img.get_access<sycl::float4, sycl::access_mode::write>(CGH);
 
        sycl::nd_range<2> Rng(sycl::range<2>(NX, NY), sycl::range<2>(16, 16));
 
diff --git a/sycl/test-e2e/Basic/image/image_accessor_range.cpp b/sycl/test-e2e/Basic/image/image_accessor_range.cpp
index c29cd31d5cfb3..8937b97ab46c3 100644
--- a/sycl/test-e2e/Basic/image/image_accessor_range.cpp
+++ b/sycl/test-e2e/Basic/image/image_accessor_range.cpp
@@ -30,7 +30,7 @@ void try_1D(queue &Q) {
             image_channel_type::unsigned_int8, range{M});
 
   Q.submit([&](handler &h) {
-    accessor<int4, 1, access::mode::read, access::target::image> acs1(im1, h);
+    accessor<int4, 1, access_mode::read, access::target::image> acs1(im1, h);
     accessor ABX{BX, h};
     auto R = acs1.get_range();
     std::cout << "Host acs1.get_range()=" << R[0] << "\n";
@@ -60,7 +60,7 @@ void try_2D(queue &Q) {
             image_channel_type::unsigned_int8, range{M, N});
 
   Q.submit([&](handler &h) {
-    accessor<int4, 2, access::mode::read, access::target::image> acs2(im2, h);
+    accessor<int4, 2, access_mode::read, access::target::image> acs2(im2, h);
     accessor ABX{BX, h};
     auto R = acs2.get_range();
     std::cout << "Host acs2.get_range()=" << R[0] << "," << R[1] << "\n";
@@ -92,8 +92,8 @@ void try_3D(queue &Q) {
             image_channel_type::unsigned_int8, range{M, N, L});
 
   Q.submit([&](handler &h) {
-    accessor<int4, 2, access::mode::read, access::target::image_array> acs3(im3,
-                                                                            h);
+    accessor<int4, 2, access_mode::read, access::target::image_array> acs3(im3,
+                                                                           h);
     accessor ABX{BX, h};
     auto R = acs3.get_range();
     std::cout << "Host acs3.get_range()=" << R[0] << "," << R[1] << "," << R[2]
diff --git a/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp b/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp
index faa3a54967efc..1c22e0086f9fe 100644
--- a/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp
+++ b/sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp
@@ -67,8 +67,8 @@ void checkReadSampler(char *host_ptr, s::sampler Sampler, s::float4 Coord,
     s::queue myQueue;
     s::buffer<s::float4, 1> ReadDataBuf(&ReadData, s::range<1>(1));
     myQueue.submit([&](s::handler &cgh) {
-      auto ReadAcc = Img.get_access<s::float4, s::access::mode::read>(cgh);
-      s::accessor<s::float4, 1, s::access::mode::write> ReadDataBufAcc(
+      auto ReadAcc = Img.get_access<s::float4, s::access_mode::read>(cgh);
+      s::accessor<s::float4, 1, s::access_mode::write> ReadDataBufAcc(
           ReadDataBuf, cgh);
 
       cgh.single_task<class kernel_class<i>>([=]() {
diff --git a/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp b/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp
index 220d5e31b3f0f..a13e493385656 100644
--- a/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp
+++ b/sycl/test-e2e/Basic/image/image_accessor_readwrite.cpp
@@ -108,7 +108,7 @@ void write_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
     s::image<1> Img(HostPtr, ImgOrder, ImgType, s::range<1>{10});
     s::queue Queue;
     Queue.submit([&](s::handler &cgh) {
-      auto WriteAcc = Img.get_access<WriteDataT, s::access::mode::write>(cgh);
+      auto WriteAcc = Img.get_access<WriteDataT, s::access_mode::write>(cgh);
       cgh.single_task<
           class kernel_class<WriteDataT, static_cast<int>(ImgType), 0>>(
           [=]() { WriteAcc.write(Coord, Color); });
@@ -128,8 +128,8 @@ void check_read_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
     s::queue Queue;
     s::buffer<ReadDataT, 1> ReadDataBuf(&ReadData, s::range<1>(1));
     Queue.submit([&](s::handler &cgh) {
-      auto ReadAcc = Img.get_access<ReadDataT, s::access::mode::read>(cgh);
-      s::accessor<ReadDataT, 1, s::access::mode::write> ReadDataBufAcc(
+      auto ReadAcc = Img.get_access<ReadDataT, s::access_mode::read>(cgh);
+      s::accessor<ReadDataT, 1, s::access_mode::write> ReadDataBufAcc(
           ReadDataBuf, cgh);
 
       cgh.single_task<
diff --git a/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp b/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp
index 52edf12c04f25..418cce5df235c 100644
--- a/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp
+++ b/sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp
@@ -75,7 +75,7 @@ void write_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
     s::image<1> Img(HostPtr, ImgOrder, ImgType, s::range<1>{10});
     s::queue Queue;
     Queue.submit([&](s::handler &cgh) {
-      auto WriteAcc = Img.get_access<WriteDataT, s::access::mode::write>(cgh);
+      auto WriteAcc = Img.get_access<WriteDataT, s::access_mode::write>(cgh);
       cgh.single_task<
           class kernel_class<WriteDataT, static_cast<int>(ImgType), 0>>(
           [=]() { WriteAcc.write(Coord, Color); });
@@ -95,8 +95,8 @@ void check_read_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
     s::queue Queue;
     s::buffer<ReadDataT, 1> ReadDataBuf(&ReadData, s::range<1>(1));
     Queue.submit([&](s::handler &cgh) {
-      auto ReadAcc = Img.get_access<ReadDataT, s::access::mode::read>(cgh);
-      s::accessor<ReadDataT, 1, s::access::mode::write> ReadDataBufAcc(
+      auto ReadAcc = Img.get_access<ReadDataT, s::access_mode::read>(cgh);
+      s::accessor<ReadDataT, 1, s::access_mode::write> ReadDataBufAcc(
           ReadDataBuf, cgh);
 
       cgh.single_task<
diff --git a/sycl/test-e2e/Basic/image/image_array.cpp b/sycl/test-e2e/Basic/image/image_array.cpp
index 2b5b826d7ba75..81c9f2741dec3 100644
--- a/sycl/test-e2e/Basic/image/image_array.cpp
+++ b/sycl/test-e2e/Basic/image/image_array.cpp
@@ -57,9 +57,9 @@ int main() {
 
     TestQueue Q{sycl::default_selector_v};
 
-    constexpr auto SYCLRead = sycl::access::mode::read;
-    constexpr auto SYCLWrite = sycl::access::mode::write;
-    constexpr auto SYCLReadWrite = sycl::access::mode::read_write;
+    constexpr auto SYCLRead = sycl::access_mode::read;
+    constexpr auto SYCLWrite = sycl::access_mode::write;
+    constexpr auto SYCLReadWrite = sycl::access_mode::read_write;
 
     Q.submit([&](sycl::handler &CGH) {
       auto ImgAcc = Img.get_access<sycl::float4, SYCLRead>(CGH);
diff --git a/sycl/test-e2e/Basic/image/image_max_size.cpp b/sycl/test-e2e/Basic/image/image_max_size.cpp
index a2c0e22a283f0..24e4c23ad50a2 100644
--- a/sycl/test-e2e/Basic/image/image_max_size.cpp
+++ b/sycl/test-e2e/Basic/image/image_max_size.cpp
@@ -56,8 +56,8 @@ bool testND(queue &Q, size_t XSize, size_t YSize, size_t ZSize = 1) {
                            image_channel_type::unsigned_int32, ImgRange);
 
     Q.submit([&](handler &CGH) {
-       auto AAcc = ImgA.template get_access<uint4, access::mode::read>(CGH);
-       auto BAcc = ImgB.template get_access<uint4, access::mode::write>(CGH);
+       auto AAcc = ImgA.template get_access<uint4, access_mode::read>(CGH);
+       auto BAcc = ImgB.template get_access<uint4, access_mode::write>(CGH);
        CGH.parallel_for<CopyKernel<Dimensions>>(
            ImgRange, [=](id<Dimensions> Id) {
              // Use int2 for 2D and int4 for 3D images.
diff --git a/sycl/test-e2e/Basic/image/image_read.h b/sycl/test-e2e/Basic/image/image_read.h
index f670349df7f63..c13830eb0175a 100644
--- a/sycl/test-e2e/Basic/image/image_read.h
+++ b/sycl/test-e2e/Basic/image/image_read.h
@@ -33,9 +33,9 @@ bool test1d_coord(s::queue myQueue, dataT *hostPtr, coordT coord,
 
     // Do the test by reading a single pixel from the image
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::read>(cgh);
-      s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,
-                                                                  cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::read>(cgh);
+      s::accessor<dataT, 1, s::access_mode::write> resultDataAcc(resultDataBuf,
+                                                                 cgh);
 
       cgh.single_task<test_1d_class<dataT>>([=]() {
         dataT RetColor = imageAcc.read(coord);
@@ -74,9 +74,9 @@ bool test2d_coord(s::queue myQueue, dataT *hostPtr, coordT coord,
 
     // Do the test by reading a single pixel from the image
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::read>(cgh);
-      s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,
-                                                                  cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::read>(cgh);
+      s::accessor<dataT, 1, s::access_mode::write> resultDataAcc(resultDataBuf,
+                                                                 cgh);
 
       cgh.single_task<test_2d_class<dataT>>([=]() {
         dataT RetColor = imageAcc.read(coord);
@@ -114,9 +114,9 @@ bool test3d_coord(s::queue myQueue, dataT *hostPtr, coordT coord,
 
     // Do the test by reading a single pixel from the image
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::read>(cgh);
-      s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,
-                                                                  cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::read>(cgh);
+      s::accessor<dataT, 1, s::access_mode::write> resultDataAcc(resultDataBuf,
+                                                                 cgh);
 
       cgh.single_task<test_3d_class<dataT>>([=]() {
         dataT RetColor = imageAcc.read(coord);
diff --git a/sycl/test-e2e/Basic/image/image_sample.cpp b/sycl/test-e2e/Basic/image/image_sample.cpp
index 22d59061b7a90..78dc940303642 100644
--- a/sycl/test-e2e/Basic/image/image_sample.cpp
+++ b/sycl/test-e2e/Basic/image/image_sample.cpp
@@ -51,9 +51,9 @@ bool test1d_coord(dataT *hostPtr, coordT coord, dataT expectedColour) {
     // Do the test by reading a single pixel from the image
     s::queue myQueue(s::default_selector_v);
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::read>(cgh);
-      s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,
-                                                                  cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::read>(cgh);
+      s::accessor<dataT, 1, s::access_mode::write> resultDataAcc(resultDataBuf,
+                                                                 cgh);
 
       cgh.single_task<test_1d_class>([=]() {
         dataT RetColor = imageAcc.read(coord, testSampler);
@@ -86,9 +86,9 @@ bool test2d_coord(dataT *hostPtr, coordT coord, dataT expectedColour) {
     // Do the test by reading a single pixel from the image
     s::queue myQueue(s::default_selector_v);
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::read>(cgh);
-      s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,
-                                                                  cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::read>(cgh);
+      s::accessor<dataT, 1, s::access_mode::write> resultDataAcc(resultDataBuf,
+                                                                 cgh);
 
       cgh.single_task<test_2d_class>([=]() {
         dataT RetColor = imageAcc.read(coord, testSampler);
@@ -121,9 +121,9 @@ bool test3d_coord(dataT *hostPtr, coordT coord, dataT expectedColour) {
     // Do the test by reading a single pixel from the image
     s::queue myQueue(s::default_selector_v);
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::read>(cgh);
-      s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,
-                                                                  cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::read>(cgh);
+      s::accessor<dataT, 1, s::access_mode::write> resultDataAcc(resultDataBuf,
+                                                                 cgh);
 
       cgh.single_task<test_3d_class>([=]() {
         dataT RetColor = imageAcc.read(coord, testSampler);
diff --git a/sycl/test-e2e/Basic/image/image_trace.cpp b/sycl/test-e2e/Basic/image/image_trace.cpp
index 9437468d61a2f..7c76e8ed31ed7 100644
--- a/sycl/test-e2e/Basic/image/image_trace.cpp
+++ b/sycl/test-e2e/Basic/image/image_trace.cpp
@@ -33,8 +33,8 @@ int main() {
   const sycl::image_channel_order ChanOrder = sycl::image_channel_order::rgba;
   const sycl::image_channel_type ChanType = sycl::image_channel_type::fp32;
 
-  constexpr auto SYCLRead = sycl::access::mode::read;
-  constexpr auto SYCLWrite = sycl::access::mode::write;
+  constexpr auto SYCLRead = sycl::access_mode::read;
+  constexpr auto SYCLWrite = sycl::access_mode::write;
 
   const sycl::range<2> Img1Size(4, 4);
   const sycl::range<2> Img2Size(4, 4);
diff --git a/sycl/test-e2e/Basic/image/image_write.h b/sycl/test-e2e/Basic/image/image_write.h
index 4d7e8a21c2e97..35ffc17819c86 100644
--- a/sycl/test-e2e/Basic/image/image_write.h
+++ b/sycl/test-e2e/Basic/image/image_write.h
@@ -35,15 +35,15 @@ bool test1d_coord(s::queue myQueue, dataT *hostPtr, coordT coord,
     s::buffer<dataT, 1> resultDataBuf(&resultData, s::range<1>(1));
 
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::write>(cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::write>(cgh);
       cgh.single_task<test_1d_write_class<dataT>>(
           [=]() { imageAcc.write(coord, colour); });
     });
 
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::read>(cgh);
-      s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,
-                                                                  cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::read>(cgh);
+      s::accessor<dataT, 1, s::access_mode::write> resultDataAcc(resultDataBuf,
+                                                                 cgh);
 
       cgh.single_task<test_1d_read_class<dataT>>([=]() {
         dataT RetColor = imageAcc.read(coord);
@@ -81,16 +81,16 @@ bool test2d_coord(s::queue myQueue, dataT *hostPtr, coordT coord,
     s::buffer<dataT, 1> resultDataBuf(&resultData, s::range<1>(1));
 
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::write>(cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::write>(cgh);
 
       cgh.single_task<test_2d_write_class<dataT>>(
           [=]() { imageAcc.write(coord, colour); });
     });
 
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::read>(cgh);
-      s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,
-                                                                  cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::read>(cgh);
+      s::accessor<dataT, 1, s::access_mode::write> resultDataAcc(resultDataBuf,
+                                                                 cgh);
 
       cgh.single_task<test_2d_read_class<dataT>>([=]() {
         dataT RetColor = imageAcc.read(coord);
@@ -128,15 +128,15 @@ bool test3d_coord(s::queue myQueue, dataT *hostPtr, coordT coord,
     s::buffer<dataT, 1> resultDataBuf(&resultData, s::range<1>(1));
 
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::write>(cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::write>(cgh);
       cgh.single_task<test_3d_write_class<dataT>>(
           [=]() { imageAcc.write(coord, colour); });
     });
 
     myQueue.submit([&](s::handler &cgh) {
-      auto imageAcc = image.get_access<dataT, s::access::mode::read>(cgh);
-      s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,
-                                                                  cgh);
+      auto imageAcc = image.get_access<dataT, s::access_mode::read>(cgh);
+      s::accessor<dataT, 1, s::access_mode::write> resultDataAcc(resultDataBuf,
+                                                                 cgh);
 
       cgh.single_task<test_3d_read_class<dataT>>([=]() {
         dataT RetColor = imageAcc.read(coord);
diff --git a/sycl/test-e2e/Basic/image/srgba-read.cpp b/sycl/test-e2e/Basic/image/srgba-read.cpp
index 91f0d4052bca8..e999daf6b5777 100644
--- a/sycl/test-e2e/Basic/image/srgba-read.cpp
+++ b/sycl/test-e2e/Basic/image/srgba-read.cpp
@@ -53,8 +53,8 @@ void test_rd(image_channel_order ChanOrder, image_channel_type ChanType) {
 
     Q.submit([&](handler &cgh) {
       auto image_acc =
-          image_2D.get_access<accessorPixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+          image_2D.get_access<accessorPixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im2D_rw>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Basic/interop/make_kernel_subdevice_l0.cpp b/sycl/test-e2e/Basic/interop/make_kernel_subdevice_l0.cpp
index 587f2664d6d14..3cb393659fe01 100644
--- a/sycl/test-e2e/Basic/interop/make_kernel_subdevice_l0.cpp
+++ b/sycl/test-e2e/Basic/interop/make_kernel_subdevice_l0.cpp
@@ -133,7 +133,7 @@ int main() {
   }
 
   Q.submit([&](handler &cgh) {
-    auto acc = buf.get_access<access::mode::write>(cgh);
+    auto acc = buf.get_access<access_mode::write>(cgh);
     cgh.set_args(acc);
     cgh.parallel_for(range<1>(1), K);
   });
diff --git a/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp b/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp
index 7d87d2ed13e55..95bd422d32b81 100644
--- a/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp
+++ b/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api.cpp
@@ -240,7 +240,7 @@ int main() {
     sycl::buffer<int, 1> Buf(sycl::range<1>{1});
 
     Q.submit([&](sycl::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::write>(CGH);
       CGH.use_kernel_bundle(KernelBundleExecutable);
       CGH.single_task<Kernel3Name>([=]() { Acc[0] = 42; });
     });
diff --git a/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api_hip.cpp b/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api_hip.cpp
index db558009a6f03..ec437a364ba4a 100644
--- a/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api_hip.cpp
+++ b/sycl/test-e2e/Basic/kernel_bundle/kernel_bundle_api_hip.cpp
@@ -147,7 +147,7 @@ int main() {
     // The error handling tests rely on Kernel3Name binary existing.
     sycl::buffer<int, 1> Buf(sycl::range<1>{1});
     Q.submit([&](sycl::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::write>(CGH);
       CGH.single_task<Kernel3Name>([=]() { Acc[0] = 42; });
     });
 
diff --git a/sycl/test-e2e/Basic/kernel_info.cpp b/sycl/test-e2e/Basic/kernel_info.cpp
index 73d5a6fd7514d..edc2c19b6bd89 100644
--- a/sycl/test-e2e/Basic/kernel_info.cpp
+++ b/sycl/test-e2e/Basic/kernel_info.cpp
@@ -49,7 +49,7 @@ int main() {
   kernel krn = kb.get_kernel(kernelID);
 
   q.submit([&](handler &cgh) {
-    auto acc = buf.get_access<access::mode::read_write>(cgh);
+    auto acc = buf.get_access<access_mode::read_write>(cgh);
     cgh.single_task<SingleTask>([=]() { acc[0] = acc[0] + 1; });
   });
 
diff --git a/sycl/test-e2e/Basic/kernel_info_attr.cpp b/sycl/test-e2e/Basic/kernel_info_attr.cpp
index e185b7b26a5c2..deb1841955af0 100644
--- a/sycl/test-e2e/Basic/kernel_info_attr.cpp
+++ b/sycl/test-e2e/Basic/kernel_info_attr.cpp
@@ -37,7 +37,7 @@ int main() {
   kernel krn = KB.get_kernel(KernelID);
 
   q.submit([&](handler &cgh) {
-    auto acc = buf.get_access<access::mode::read_write>(cgh);
+    auto acc = buf.get_access<access_mode::read_write>(cgh);
     cgh.single_task<SingleTask>([=]() { acc[0] = acc[0] + 1; });
   });
 
diff --git a/sycl/test-e2e/Basic/linear-sub_group.cpp b/sycl/test-e2e/Basic/linear-sub_group.cpp
index 684ff7d7fbdcc..a08876c8ec83f 100644
--- a/sycl/test-e2e/Basic/linear-sub_group.cpp
+++ b/sycl/test-e2e/Basic/linear-sub_group.cpp
@@ -28,7 +28,7 @@ int main(int argc, char *argv[]) {
   {
     buffer<int, 2> output_buf(output.data(), range<2>(outer, inner));
     q.submit([&](handler &cgh) {
-      auto output = output_buf.get_access<access::mode::read_write>(cgh);
+      auto output = output_buf.get_access<access_mode::read_write>(cgh);
       cgh.parallel_for<class linear_id>(
           nd_range<2>(range<2>(outer, inner), range<2>(outer, inner)),
           [=](nd_item<2> it) {
diff --git a/sycl/test-e2e/Basic/multi_ptr.hpp b/sycl/test-e2e/Basic/multi_ptr.hpp
index 812dab1652ae3..744d820a99d94 100644
--- a/sycl/test-e2e/Basic/multi_ptr.hpp
+++ b/sycl/test-e2e/Basic/multi_ptr.hpp
@@ -86,19 +86,19 @@ template <typename T, access::decorated IsDecorated> void testMultPtr() {
     buffer<T, 1> bufferData_5(data_5, numOfItems);
     queue myQueue;
     myQueue.submit([&](handler &cgh) {
-      accessor<T, 1, access::mode::read, access::target::device,
+      accessor<T, 1, access_mode::read, access::target::device,
                access::placeholder::false_t>
           accessorData_1(bufferData_1, cgh);
-      accessor<T, 1, access::mode::read_write, access::target::device,
+      accessor<T, 1, access_mode::read_write, access::target::device,
                access::placeholder::false_t>
           accessorData_2(bufferData_2, cgh);
-      accessor<T, 1, access::mode::read_write, access::target::device,
+      accessor<T, 1, access_mode::read_write, access::target::device,
                access::placeholder::false_t>
           accessorData_3(bufferData_3, cgh);
-      accessor<T, 1, access::mode::read_write, access::target::device,
+      accessor<T, 1, access_mode::read_write, access::target::device,
                access::placeholder::false_t>
           accessorData_4(bufferData_4, cgh);
-      accessor<T, 1, access::mode::read_write, access::target::device,
+      accessor<T, 1, access_mode::read_write, access::target::device,
                access::placeholder::false_t>
           accessorData_5(bufferData_5, cgh);
       local_accessor<T, 1> localAccessor(numOfItems, cgh);
@@ -172,11 +172,11 @@ void testMultPtrArrowOperator() {
     buffer<point<T>, 1> bufferData_3(data_3, numOfItems);
     queue myQueue;
     myQueue.submit([&](handler &cgh) {
-      accessor<point<T>, 1, access::mode::read, access::target::device,
+      accessor<point<T>, 1, access_mode::read, access::target::device,
                access::placeholder::false_t>
           accessorData_1(bufferData_1, cgh);
       local_accessor<point<T>, 1> accessorData_2(1, cgh);
-      accessor<point<T>, 1, access::mode::read, access::target::device,
+      accessor<point<T>, 1, access_mode::read, access::target::device,
                access::placeholder::false_t>
           accessorData_3(bufferData_3, cgh);
 
diff --git a/sycl/test-e2e/Basic/multi_ptr_legacy.hpp b/sycl/test-e2e/Basic/multi_ptr_legacy.hpp
index 45cc9a104c55a..93dcb1f6a05f8 100644
--- a/sycl/test-e2e/Basic/multi_ptr_legacy.hpp
+++ b/sycl/test-e2e/Basic/multi_ptr_legacy.hpp
@@ -55,10 +55,10 @@ template <typename T> void testMultPtr() {
     buffer<T, 1> bufferData_2(data_2, numOfItems);
     queue myQueue;
     myQueue.submit([&](handler &cgh) {
-      accessor<T, 1, access::mode::read, access::target::device,
+      accessor<T, 1, access_mode::read, access::target::device,
                access::placeholder::false_t>
           accessorData_1(bufferData_1, cgh);
-      accessor<T, 1, access::mode::read_write, access::target::device,
+      accessor<T, 1, access_mode::read_write, access::target::device,
                access::placeholder::false_t>
           accessorData_2(bufferData_2, cgh);
       local_accessor<T, 1> localAccessor(numOfItems, cgh);
@@ -139,14 +139,14 @@ template <typename T> void testMultPtrArrowOperator() {
     buffer<bool, 1> result_buf{1};
     queue myQueue;
     myQueue.submit([&](handler &cgh) {
-      accessor<point<T>, 1, access::mode::read, access::target::device,
+      accessor<point<T>, 1, access_mode::read, access::target::device,
                access::placeholder::false_t>
           accessorData_1(bufferData_1, cgh);
-      accessor<point<T>, 1, access::mode::read, access::target::constant_buffer,
+      accessor<point<T>, 1, access_mode::read, access::target::constant_buffer,
                access::placeholder::false_t>
           accessorData_2(bufferData_2, cgh);
       local_accessor<point<T>, 1> accessorData_3(1, cgh);
-      accessor<point<T>, 1, access::mode::read, access::target::device,
+      accessor<point<T>, 1, access_mode::read, access::target::device,
                access::placeholder::false_t>
           accessorData_4(bufferData_4, cgh);
 
diff --git a/sycl/test-e2e/Basic/multi_ptr_null_relational_operators.cpp b/sycl/test-e2e/Basic/multi_ptr_null_relational_operators.cpp
index 6aaca3eab4ad8..16897929bae8a 100644
--- a/sycl/test-e2e/Basic/multi_ptr_null_relational_operators.cpp
+++ b/sycl/test-e2e/Basic/multi_ptr_null_relational_operators.cpp
@@ -33,7 +33,7 @@ void nullptrRelationalOperatorTest() {
     sycl::buffer<int, 1> buf(1);
     queue
         .submit([&](sycl::handler &cgh) {
-          auto dev_acc = buf.get_access<sycl::access::mode::write>(cgh);
+          auto dev_acc = buf.get_access<sycl::access_mode::write>(cgh);
           if constexpr (address_space ==
                         sycl::access::address_space::local_space) {
             sycl::local_accessor<int, 1> locAcc(1, cgh);
diff --git a/sycl/test-e2e/Basic/multisource.cpp b/sycl/test-e2e/Basic/multisource.cpp
index db7b4dbf39e74..6d6fb4815a6c9 100644
--- a/sycl/test-e2e/Basic/multisource.cpp
+++ b/sycl/test-e2e/Basic/multisource.cpp
@@ -30,7 +30,7 @@ void init_buf(queue &q, buffer<int, 1> &b, range<1> &r, int i);
 #elif INIT_KERNEL
 void init_buf(queue &q, buffer<int, 1> &b, range<1> &r, int i) {
   q.submit([&](handler &cgh) {
-    auto B = b.get_access<access::mode::write>(cgh);
+    auto B = b.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class init>(r, [=](id<1> index) { B[index] = i; });
   });
 }
@@ -43,9 +43,9 @@ void calc_buf(queue &q, buffer<int, 1> &a, buffer<int, 1> &b, buffer<int, 1> &c,
 void calc_buf(queue &q, buffer<int, 1> &a, buffer<int, 1> &b, buffer<int, 1> &c,
               range<1> &r) {
   q.submit([&](handler &cgh) {
-    auto A = a.get_access<access::mode::read>(cgh);
-    auto B = b.get_access<access::mode::read>(cgh);
-    auto C = c.get_access<access::mode::write>(cgh);
+    auto A = a.get_access<access_mode::read>(cgh);
+    auto B = b.get_access<access_mode::read>(cgh);
+    auto C = c.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class calc>(
         r, [=](id<1> index) { C[index] = A[index] - B[index]; });
   });
diff --git a/sycl/test-e2e/Basic/multisource_spv_obj.cpp b/sycl/test-e2e/Basic/multisource_spv_obj.cpp
index 7f03c74f51753..03c2788c2022e 100644
--- a/sycl/test-e2e/Basic/multisource_spv_obj.cpp
+++ b/sycl/test-e2e/Basic/multisource_spv_obj.cpp
@@ -42,7 +42,7 @@ void init_buf(queue &q, buffer<int, 1> &b, range<1> &r, int i);
 #elif INIT_KERNEL
 void init_buf(queue &q, buffer<int, 1> &b, range<1> &r, int i) {
   q.submit([&](handler &cgh) {
-    auto B = b.get_access<access::mode::write>(cgh);
+    auto B = b.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class init>(r, [=](id<1> index) { B[index] = i; });
   });
 }
@@ -55,9 +55,9 @@ void calc_buf(queue &q, buffer<int, 1> &a, buffer<int, 1> &b, buffer<int, 1> &c,
 void calc_buf(queue &q, buffer<int, 1> &a, buffer<int, 1> &b, buffer<int, 1> &c,
               range<1> &r) {
   q.submit([&](handler &cgh) {
-    auto A = a.get_access<access::mode::read>(cgh);
-    auto B = b.get_access<access::mode::read>(cgh);
-    auto C = c.get_access<access::mode::write>(cgh);
+    auto A = a.get_access<access_mode::read>(cgh);
+    auto B = b.get_access<access_mode::read>(cgh);
+    auto C = c.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class calc>(
         r, [=](id<1> index) { C[index] = A[index] - B[index]; });
   });
diff --git a/sycl/test-e2e/Basic/nested_queue_submit.cpp b/sycl/test-e2e/Basic/nested_queue_submit.cpp
index 8e06abb7ef095..4b50ce612198b 100644
--- a/sycl/test-e2e/Basic/nested_queue_submit.cpp
+++ b/sycl/test-e2e/Basic/nested_queue_submit.cpp
@@ -20,7 +20,7 @@ void nestedSubmitParallelFor(sycl::queue &q) {
   {
     sycl::buffer<float> buf(array.data(), sycl::range<1>{n});
     q.submit([&](sycl::handler &h) {
-      auto acc = buf.get_access<sycl::access::mode::write>(h);
+      auto acc = buf.get_access<sycl::access_mode::write>(h);
       q.parallel_for<class zero>(sycl::range<1>{n},
                                  [=](sycl::id<1> i) { acc[i] = float(0.0); });
     });
diff --git a/sycl/test-e2e/Basic/offset-accessor-get_pointer.cpp b/sycl/test-e2e/Basic/offset-accessor-get_pointer.cpp
index 76a5135ff6563..01475ff22fb12 100644
--- a/sycl/test-e2e/Basic/offset-accessor-get_pointer.cpp
+++ b/sycl/test-e2e/Basic/offset-accessor-get_pointer.cpp
@@ -17,7 +17,7 @@
 using namespace sycl;
 
 void test_across_ranges() {
-  constexpr auto r_w = access::mode::read_write;
+  constexpr auto r_w = access_mode::read_write;
   constexpr unsigned long width = 4;
   constexpr unsigned long count = width * width;
   constexpr unsigned long count3D = width * width * width; // 64
diff --git a/sycl/test-e2e/Basic/parallel_for_indexers.cpp b/sycl/test-e2e/Basic/parallel_for_indexers.cpp
index 59dbf3329e82d..946237d0db7db 100644
--- a/sycl/test-e2e/Basic/parallel_for_indexers.cpp
+++ b/sycl/test-e2e/Basic/parallel_for_indexers.cpp
@@ -20,7 +20,7 @@ int main() {
                        {property::buffer::use_host_ptr()});
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class id1>(globalRange,
                                     [=](id<1> index) { B[index] = index[0]; });
       });
@@ -43,7 +43,7 @@ int main() {
                         {property::buffer::use_host_ptr()});
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class item1_nooffset>(
             globalRange, [=](item<1, false> index) {
               B[index.get_id()] = int2{index.get_id()[0], index.get_range()[0]};
@@ -72,7 +72,7 @@ int main() {
                         {property::buffer::use_host_ptr()});
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class item1_offset>(
             globalRange, globalOffset, [=](item<1> index) {
               B[index.get_id()] = int3{index.get_id()[0], index.get_range()[0],
@@ -107,7 +107,7 @@ int main() {
                         {property::buffer::use_host_ptr()});
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class item1_nd_range>(ndRange, [=](nd_item<1> index) {
           B[index.get_global_id()] =
               int3{index.get_global_id()[0], index.get_global_range()[0],
diff --git a/sycl/test-e2e/Basic/parallel_for_user_types.cpp b/sycl/test-e2e/Basic/parallel_for_user_types.cpp
index c77d2eb4183a1..344a24add3ed6 100644
--- a/sycl/test-e2e/Basic/parallel_for_user_types.cpp
+++ b/sycl/test-e2e/Basic/parallel_for_user_types.cpp
@@ -40,7 +40,7 @@ int main() {
   // Check user defined sycl::item wrapper
   sycl::buffer<int> data_buf(data, sz);
   q.submit([&](sycl::handler &h) {
-    auto buf_acc = data_buf.get_access<sycl::access::mode::read_write>(h);
+    auto buf_acc = data_buf.get_access<sycl::access_mode::read_write>(h);
     h.parallel_for(sycl::range<1>{sz},
                    [=](item_wrapper<1> item) { buf_acc[item.get()] += 1; });
   });
@@ -60,7 +60,7 @@ int main() {
 
   // Check user defined sycl::nd_item wrapper
   q.submit([&](sycl::handler &h) {
-    auto buf_acc = data_buf.get_access<sycl::access::mode::read_write>(h);
+    auto buf_acc = data_buf.get_access<sycl::access_mode::read_write>(h);
     h.parallel_for(sycl::nd_range<1>{sz, 2},
                    [=](nd_item_wrapper<1> item) { buf_acc[item.get()] += 1; });
   });
diff --git a/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp b/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp
index 26eba4b57e28e..77dafe85907ec 100644
--- a/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp
+++ b/sycl/test-e2e/Basic/queue/queue_shortcut_functions.cpp
@@ -28,7 +28,7 @@ int main() {
     {
       sycl::buffer<int> DataBuffer(Data.data(), sycl::range<1>(Size));
 
-      sycl::accessor<int, 1, sycl::access::mode::read_write,
+      sycl::accessor<int, 1, sycl::access_mode::read_write,
                      sycl::access::target::device,
                      sycl::access::placeholder::true_t,
                      sycl::ext::oneapi::accessor_property_list<>>
@@ -57,7 +57,7 @@ int main() {
     {
       sycl::buffer<int> Buf(Data.data(), sycl::range<1>(Size));
 
-      sycl::accessor<int, 1, sycl::access::mode::read_write,
+      sycl::accessor<int, 1, sycl::access_mode::read_write,
                      sycl::access::target::device,
                      sycl::access::placeholder::true_t,
                      sycl::ext::oneapi::accessor_property_list<>>
@@ -96,7 +96,7 @@ int main() {
     {
       sycl::buffer<int> Buf(DataPtr, sycl::range<1>(Size));
 
-      sycl::accessor<int, 1, sycl::access::mode::read_write,
+      sycl::accessor<int, 1, sycl::access_mode::read_write,
                      sycl::access::target::device,
                      sycl::access::placeholder::true_t,
                      sycl::ext::oneapi::accessor_property_list<>>
@@ -135,12 +135,12 @@ int main() {
       sycl::buffer<int> RefBuf(ReferenceData.data(), sycl::range<1>(Size));
       sycl::buffer<int> DataBuf(Data.data(), sycl::range<1>(Size));
 
-      sycl::accessor<int, 1, sycl::access::mode::read,
+      sycl::accessor<int, 1, sycl::access_mode::read,
                      sycl::access::target::device,
                      sycl::access::placeholder::true_t,
                      sycl::ext::oneapi::accessor_property_list<>>
           RefAcc(RefBuf);
-      sycl::accessor<int, 1, sycl::access::mode::write,
+      sycl::accessor<int, 1, sycl::access_mode::write,
                      sycl::access::target::device,
                      sycl::access::placeholder::true_t,
                      sycl::ext::oneapi::accessor_property_list<>>
diff --git a/sycl/test-e2e/Basic/range_offset_fit_in_int.cpp b/sycl/test-e2e/Basic/range_offset_fit_in_int.cpp
index 12821742f97cb..e3950d13a8a8f 100644
--- a/sycl/test-e2e/Basic/range_offset_fit_in_int.cpp
+++ b/sycl/test-e2e/Basic/range_offset_fit_in_int.cpp
@@ -64,7 +64,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_ROL>(RangeOutOfLimits,
                                      [=](S::id<2> Id) { Acc[0] += 1; });
@@ -81,7 +81,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_RIL>(RangeInLimits,
                                      [Acc](S::id<2> Id) { Acc[0] += 1; });
@@ -94,7 +94,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_RIL_POL>(RangeInLimits_POL,
                                          [Acc](S::id<2> Id) { Acc[0] += 1; });
@@ -111,7 +111,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_ROL_OIL>(RangeOutOfLimits, OffsetInLimits,
                                          [Acc](S::id<2> Id) { Acc[0] += 1; });
@@ -128,7 +128,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_RIL_OIL_SOL>(
           RangeInLimits_Large, OffsetInLimits_Large,
@@ -146,7 +146,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_RIL_OOL>(RangeInLimits, OffsetOutOfLimits,
                                          [Acc](S::id<2> Id) { Acc[0] += 1; });
@@ -163,7 +163,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_RIL_OIL>(RangeInLimits, OffsetInLimits,
                                          [Acc](S::id<2> Id) { Acc[0] += 1; });
@@ -176,7 +176,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_ND_GOL_LIL_OIL>(
           NDRange_ROL_LIL_OIL, [Acc](S::nd_item<2> Id) { Acc[0] += 1; });
@@ -193,7 +193,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_ND_GIL_LIL_OOL>(
           NDRange_RIL_LIL_OOL, [Acc](S::nd_item<2> Id) { Acc[0] += 1; });
@@ -210,7 +210,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_ND_GIL_LIL_OIL>(
           NDRange_RIL_LIL_OIL, [Acc](S::nd_item<2> Id) { Acc[0] += 1; });
@@ -223,7 +223,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_ND_GIL_LIL_OIL_POL>(
           NDRange_RIL_LIL_OIL_POL, [Acc](S::nd_item<2> Id) { Acc[0] += 1; });
@@ -240,7 +240,7 @@ void test() {
   try {
     S::buffer<int, 1> Buf{&Data, 1};
     Queue.submit([&](S::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
 
       CGH.parallel_for<class PF_ND_GIL_LIL_OIL_SOL>(
           NDRange_RIL_LIL_OIL_POL, [Acc](S::nd_item<2> Id) { Acc[0] += 1; });
diff --git a/sycl/test-e2e/Basic/span.cpp b/sycl/test-e2e/Basic/span.cpp
index 2a112ba4740d5..730c4e5cf209b 100644
--- a/sycl/test-e2e/Basic/span.cpp
+++ b/sycl/test-e2e/Basic/span.cpp
@@ -41,7 +41,7 @@ void testSpanCapture() {
   usm_span[0] += 100; // 101 modify first value using span affordance.
 
   event E = Q.submit([&](handler &cgh) {
-    auto can_read_from_span_acc = SpanRead.get_access<access::mode::write>(cgh);
+    auto can_read_from_span_acc = SpanRead.get_access<access_mode::write>(cgh);
     cgh.single_task<class hi>([=] {
       // read from the spans.
       can_read_from_span_acc[0] = vecUSM_span[0];
@@ -84,7 +84,7 @@ void testSpanOnDevice() {
   buffer<int, 1> SpanRead(NumberOfReadTestsRange);
 
   event E = Q.submit([&](handler &cgh) {
-    auto can_read_from_span_acc = SpanRead.get_access<access::mode::write>(cgh);
+    auto can_read_from_span_acc = SpanRead.get_access<access_mode::write>(cgh);
     cgh.single_task<class ha>([=] {
       // create a span on device, pass it to function that modifies it
       // read values back out.
diff --git a/sycl/test-e2e/Basic/subdevice_pi.cpp b/sycl/test-e2e/Basic/subdevice_pi.cpp
index 43595063abc1e..56fca44e0ab50 100644
--- a/sycl/test-e2e/Basic/subdevice_pi.cpp
+++ b/sycl/test-e2e/Basic/subdevice_pi.cpp
@@ -22,7 +22,7 @@ static void log_pi(const char *msg) { std::cout << msg << std::endl; }
 
 static void use_mem(buffer<int, 1> buf, queue q) {
   q.submit([&](handler &cgh) {
-    auto acc = buf.get_access<access::mode::read_write>(cgh);
+    auto acc = buf.get_access<access_mode::read_write>(cgh);
     cgh.parallel_for<class sum1>(range<1>(buf.size()),
                                  [=](item<1> itemID) { acc[itemID] += 1; });
   });
diff --git a/sycl/test-e2e/Basic/swizzle_op.cpp b/sycl/test-e2e/Basic/swizzle_op.cpp
index 0d800faa5769b..42186afb2511b 100644
--- a/sycl/test-e2e/Basic/swizzle_op.cpp
+++ b/sycl/test-e2e/Basic/swizzle_op.cpp
@@ -22,7 +22,7 @@ int main() {
       buffer<float, 1> b(results, range<1>(3));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::write>(cgh);
+        auto B = b.get_access<access_mode::write>(cgh);
         cgh.single_task<class test_1>([=]() {
           float2 ab = {4, 2};
           float c = ab.x() * ab.y();
@@ -43,7 +43,7 @@ int main() {
       buffer<float, 1> b(results, range<1>(3));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::write>(cgh);
+        auto B = b.get_access<access_mode::write>(cgh);
         cgh.single_task<class test_2>([=]() {
           float2 ab = {4, 2};
           float c = ab.x() * 2;
@@ -64,7 +64,7 @@ int main() {
       buffer<float, 1> b(results, range<1>(3));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::write>(cgh);
+        auto B = b.get_access<access_mode::write>(cgh);
         cgh.single_task<class test_3>([=]() {
           float2 ab = {4, 2};
           float c = 4 * ab.y();
@@ -85,7 +85,7 @@ int main() {
       buffer<float, 1> b(results, range<1>(4));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::write>(cgh);
+        auto B = b.get_access<access_mode::write>(cgh);
         cgh.single_task<class test_4>([=]() {
           float2 ab = {4, 2};
           float2 c = {0, 0};
@@ -109,7 +109,7 @@ int main() {
       buffer<float, 1> b(results, range<1>(4));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::write>(cgh);
+        auto B = b.get_access<access_mode::write>(cgh);
         cgh.single_task<class test_5>([=]() {
           float2 ab = {4, 2};
           float2 c = {0, 0};
@@ -133,7 +133,7 @@ int main() {
       buffer<float, 1> b(results, range<1>(4));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::write>(cgh);
+        auto B = b.get_access<access_mode::write>(cgh);
         cgh.single_task<class test_6>([=]() {
           float2 ab = {4, 2};
           float2 c = {0, 0};
@@ -157,7 +157,7 @@ int main() {
       buffer<float, 1> b(results, range<1>(6));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::write>(cgh);
+        auto B = b.get_access<access_mode::write>(cgh);
         cgh.single_task<class test_7>([=]() {
           uchar4 abc = {4, 2, 1, 0};
 
@@ -192,7 +192,7 @@ int main() {
       buffer<float, 1> b(results, range<1>(4));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::write>(cgh);
+        auto B = b.get_access<access_mode::write>(cgh);
         cgh.single_task<class test_8>([=]() {
           uchar4 cba;
           unsigned char x = 1;
@@ -232,7 +232,7 @@ int main() {
       buffer<unsigned int, 1> b(results, range<1>(4));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::write>(cgh);
+        auto B = b.get_access<access_mode::write>(cgh);
         cgh.single_task<class test_9>([=]() {
           uchar4 vec;
           unsigned int add = 254;
@@ -261,7 +261,7 @@ int main() {
       buffer<int3, 1> b((int3 *)FF, range<1>(2));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::read_write>(cgh);
+        auto B = b.get_access<access_mode::read_write>(cgh);
         cgh.parallel_for<class test_10>(
             range<1>{2}, [=](id<1> ID) { B[ID] = int3{(int3)ID[0]} / B[ID]; });
       });
@@ -279,7 +279,7 @@ int main() {
       buffer<int3, 1> b(&result, range<1>(1));
       queue myQueue;
       myQueue.submit([&](handler &cgh) {
-        auto B = b.get_access<access::mode::write>(cgh);
+        auto B = b.get_access<access_mode::write>(cgh);
         cgh.single_task<class test_11>([=]() {
           int3 testVec1 = {2, 2, 2};
           int3 testVec2 = {1, 1, 1};
diff --git a/sycl/test-e2e/Basic/sycl-namespace.cpp b/sycl/test-e2e/Basic/sycl-namespace.cpp
index e4c8a64e611cf..af06eb1b48f17 100644
--- a/sycl/test-e2e/Basic/sycl-namespace.cpp
+++ b/sycl/test-e2e/Basic/sycl-namespace.cpp
@@ -9,7 +9,7 @@ int main() {
   {
     sycl::buffer<int, 1> b(&r, 1);
     q.submit([&](sycl::handler &h) {
-      auto a = b.get_access<sycl::access::mode::write>(h);
+      auto a = b.get_access<sycl::access_mode::write>(h);
       h.single_task<class T>([=]() { a[0] = 42; });
     });
   }
diff --git a/sycl/test-e2e/Basic/unused_pointer.cpp b/sycl/test-e2e/Basic/unused_pointer.cpp
index 89e24720ff738..7e0f6f6549bde 100644
--- a/sycl/test-e2e/Basic/unused_pointer.cpp
+++ b/sycl/test-e2e/Basic/unused_pointer.cpp
@@ -30,7 +30,7 @@ int main(int argc, char **argv) {
   {
     sycl::buffer<int, 1> buf(&data, 1);
     queue.submit([&](sycl::handler &cgh) {
-      auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+      auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
       cgh.single_task<class test>([=]() { acc[0] = obj.data; });
     });
   }
diff --git a/sycl/test-e2e/Basic/use_pinned_host_memory.cpp b/sycl/test-e2e/Basic/use_pinned_host_memory.cpp
index cba9c575e8497..b4c557ab50ad6 100644
--- a/sycl/test-e2e/Basic/use_pinned_host_memory.cpp
+++ b/sycl/test-e2e/Basic/use_pinned_host_memory.cpp
@@ -20,7 +20,7 @@ int main() {
 
   sycl::queue Q;
   Q.submit([&](sycl::handler &CGH) {
-    auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+    auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
     CGH.single_task<class init_a>([=]() {});
   });
 
diff --git a/sycl/test-e2e/Basic/vector/byte.cpp b/sycl/test-e2e/Basic/vector/byte.cpp
index d74ef5f97f7c4..212b1f549d83a 100644
--- a/sycl/test-e2e/Basic/vector/byte.cpp
+++ b/sycl/test-e2e/Basic/vector/byte.cpp
@@ -72,7 +72,7 @@ int main() {
     sycl::queue Queue;
     Queue
         .submit([&](sycl::handler &cgh) {
-          auto Acc = Buf.get_access<sycl::access::mode::read_write>(cgh);
+          auto Acc = Buf.get_access<sycl::access_mode::read_write>(cgh);
           cgh.single_task<class st>([=]() {
             // load
             sycl::multi_ptr<std::byte,
diff --git a/sycl/test-e2e/Basic/vector/operators.cpp b/sycl/test-e2e/Basic/vector/operators.cpp
index d56cc6cdc8cb5..17a3789b2d3c0 100644
--- a/sycl/test-e2e/Basic/vector/operators.cpp
+++ b/sycl/test-e2e/Basic/vector/operators.cpp
@@ -49,7 +49,7 @@ int main() {
     {
       s::buffer<vec_type, 1> Buf(&res, s::range<1>(1));
       Queue.submit([&](s::handler &cgh) {
-        auto Acc = Buf.get_access<s::access::mode::write>(cgh);
+        auto Acc = Buf.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isequal_vec_op_1_elem>([=]() {
           vec_type vec1(2);
           vec_type vec2(2);
@@ -69,7 +69,7 @@ int main() {
     {
       s::buffer<vec_type, 1> Buf(&res, s::range<1>(1));
       Queue.submit([&](s::handler &cgh) {
-        auto Acc = Buf.get_access<s::access::mode::write>(cgh);
+        auto Acc = Buf.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isequal_vec_op_1_elem_scalar>([=]() {
           vec_type vec(2);
           char rhs_scalar = 2;
@@ -95,7 +95,7 @@ int main() {
     {
       s::buffer<res_vec_type, 1> Buf(&res, s::range<1>(1));
       Queue.submit([&](s::handler &cgh) {
-        auto Acc = Buf.get_access<s::access::mode::write>(cgh);
+        auto Acc = Buf.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isequal_vec_op>([=]() {
           s::uint4 vec1(42, 42, 42, 0);
           s::uint4 vec2(0, 42, 42, 0);
@@ -114,7 +114,7 @@ int main() {
     {
       s::buffer<res_vec_type, 1> Buf(&res, s::range<1>(1));
       Queue.submit([&](s::handler &cgh) {
-        auto Acc = Buf.get_access<s::access::mode::write>(cgh);
+        auto Acc = Buf.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isless_vec_op>([=]() {
           s::double4 vec1(0.5, 10.1, 10.2, 10.3);
           s::double4 vec2(10.5, 0.1, 0.2, 0.3);
@@ -133,7 +133,7 @@ int main() {
     {
       s::buffer<res_vec_type, 1> Buf(&res, s::range<1>(1));
       Queue.submit([&](s::handler &cgh) {
-        auto Acc = Buf.get_access<s::access::mode::write>(cgh);
+        auto Acc = Buf.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isgreater_vec_op>([=]() {
           s::char4 vec1(0, 0, 42, 42);
           s::char4 vec2(42, 0, 0, -42);
@@ -152,7 +152,7 @@ int main() {
     {
       s::buffer<res_vec_type, 1> Buf(&res, s::range<1>(1));
       Queue.submit([&](s::handler &cgh) {
-        auto Acc = Buf.get_access<s::access::mode::write>(cgh);
+        auto Acc = Buf.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isnotgreater_vec_op>([=]() {
           s::half4 vec1(0, 0, 42, 42);
           s::half4 vec2(42, 0, 0, -42);
@@ -173,7 +173,7 @@ int main() {
     {
       s::buffer<res_vec_type, 1> Buf(&res, s::range<1>(1));
       Queue.submit([&](s::handler &cgh) {
-        auto Acc = Buf.get_access<s::access::mode::write>(cgh);
+        auto Acc = Buf.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isnotless_vec_op>([=]() {
           s::ulong4 vec1(0, 0, 42, 42);
           s::ulong4 vec2{42, 0, 0, 0};
@@ -192,7 +192,7 @@ int main() {
     {
       s::buffer<res_vec_type, 1> Buf(&res, s::range<1>(1));
       Queue.submit([&](s::handler &cgh) {
-        auto Acc = Buf.get_access<s::access::mode::write>(cgh);
+        auto Acc = Buf.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isnotequal_vec_op>([=]() {
           s::ushort4 vec1(0, 0, 42, 42);
           s::ushort4 vec2{42, 0, 0, 42};
@@ -211,7 +211,7 @@ int main() {
     {
       s::buffer<res_vec_type, 1> Buf(&res, s::range<1>(1));
       Queue.submit([&](s::handler &cgh) {
-        auto Acc = Buf.get_access<s::access::mode::write>(cgh);
+        auto Acc = Buf.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class logical_and_vec_op>([=]() {
           s::int4 vec1(0, 0, 42, 42);
           s::int4 vec2{42, 0, 0, 42};
@@ -230,7 +230,7 @@ int main() {
     {
       s::buffer<res_vec_type, 1> Buf(&res, s::range<1>(1));
       Queue.submit([&](s::handler &cgh) {
-        auto Acc = Buf.get_access<s::access::mode::write>(cgh);
+        auto Acc = Buf.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class logical_or_vec_op>([=]() {
           s::int4 vec1(0, 0, 42, 42);
           s::int4 vec2{42, 0, 0, 42};
@@ -250,7 +250,7 @@ int main() {
     {
       s::buffer<res_vec_type, 1> Buf(&res, s::range<1>(1));
       Queue.submit([&](s::handler &cgh) {
-        auto Acc = Buf.get_access<s::access::mode::write>(cgh);
+        auto Acc = Buf.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class as_op>([=]() {
           s::float4 vec1(4.5f, 0, 3.5f, -10.0f);
           Acc[0] = vec1.template as<res_vec_type>();
diff --git a/sycl/test-e2e/ClusterLaunch/enqueueLaunchCustom_check_event_deps.cpp b/sycl/test-e2e/ClusterLaunch/enqueueLaunchCustom_check_event_deps.cpp
index 50a488d861874..3a69d39fdda36 100644
--- a/sycl/test-e2e/ClusterLaunch/enqueueLaunchCustom_check_event_deps.cpp
+++ b/sycl/test-e2e/ClusterLaunch/enqueueLaunchCustom_check_event_deps.cpp
@@ -53,7 +53,7 @@ int main() {
   {
     sycl::buffer<int, 1> Buff(HostArray.data(), 4096);
     Queue.submit([&](sycl::handler &CGH) {
-      auto Acc = Buff.template get_access<sycl::access::mode::write>(CGH);
+      auto Acc = Buff.template get_access<sycl::access_mode::write>(CGH);
       CGH.parallel_for(4096, [=](auto i) { Acc[i] = 1; });
     });
     Queue.submit([&](sycl::handler &CGH) {
@@ -61,12 +61,12 @@ int main() {
 
       cuda::cluster_size ClusterDims(sycl::range{2});
       properties ClusterLaunchProperty{ClusterDims};
-      auto Acc = Buff.template get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buff.template get_access<sycl::access_mode::read_write>(CGH);
       CGH.parallel_for(sycl::nd_range({4096}, {32}),
                        KernelFunctor(ClusterLaunchProperty, Acc));
     });
     Queue.submit([&](sycl::handler &CGH) {
-      auto Acc = Buff.template get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buff.template get_access<sycl::access_mode::read_write>(CGH);
       CGH.parallel_for(4096, [=](auto i) { Acc[i] *= 5; });
     });
   }
diff --git a/sycl/test-e2e/Config/env_vars.cpp b/sycl/test-e2e/Config/env_vars.cpp
index 7316ed5095dad..8c972bf4c7c7a 100644
--- a/sycl/test-e2e/Config/env_vars.cpp
+++ b/sycl/test-e2e/Config/env_vars.cpp
@@ -26,7 +26,7 @@ int main() {
   bool shouldCrash = env::isDefined("SHOULD_CRASH");
   try {
     myQueue.submit([&](handler &cgh) {
-      auto B = buf.get_access<access::mode::read_write>(cgh);
+      auto B = buf.get_access<access_mode::read_write>(cgh);
       cgh.single_task<class kernel_name1>([=]() { B[0] = 0; });
     });
     assert(!shouldCrash);
diff --git a/sycl/test-e2e/Config/kernel_from_file.cpp b/sycl/test-e2e/Config/kernel_from_file.cpp
index c8b880e6c9ff5..d9182d72ecce2 100644
--- a/sycl/test-e2e/Config/kernel_from_file.cpp
+++ b/sycl/test-e2e/Config/kernel_from_file.cpp
@@ -26,7 +26,7 @@ int main(int argc, char **argv) {
     buffer<int, 1> buf(&data, range<1>(1));
 
     event e = myQueue.submit([&](handler &cgh) {
-      auto ptr = buf.get_access<access::mode::read_write>(cgh);
+      auto ptr = buf.get_access<access_mode::read_write>(cgh);
 
       cgh.single_task<class my_kernel>([=]() {
 #ifdef USED_KERNEL
diff --git a/sycl/test-e2e/DeprecatedFeatures/DiscardEvents/discard_events_accessors.cpp b/sycl/test-e2e/DeprecatedFeatures/DiscardEvents/discard_events_accessors.cpp
index fffd5d22625f7..b0c7afd42170e 100644
--- a/sycl/test-e2e/DeprecatedFeatures/DiscardEvents/discard_events_accessors.cpp
+++ b/sycl/test-e2e/DeprecatedFeatures/DiscardEvents/discard_events_accessors.cpp
@@ -69,7 +69,7 @@ int main(int Argc, const char *Argv[]) {
   RunKernelHelper(Q, [&](int *Harray) {
     sycl::buffer<int, 1> Buf(Range);
     Q.submit([&](sycl::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
       CGH.parallel_for<class kernel_using_buffer_accessor>(
           Range, [=](sycl::item<1> itemID) {
             size_t i = itemID.get_id(0);
diff --git a/sycl/test-e2e/DeprecatedFeatures/set_arg_interop.cpp b/sycl/test-e2e/DeprecatedFeatures/set_arg_interop.cpp
index 84381d070d0d7..cbe74b2a2f222 100644
--- a/sycl/test-e2e/DeprecatedFeatures/set_arg_interop.cpp
+++ b/sycl/test-e2e/DeprecatedFeatures/set_arg_interop.cpp
@@ -58,8 +58,8 @@ int main() {
     buffer<float, 1> FirstBuffer(Array, range<1>(1));
     buffer<int, 1> SecondBuffer(&Value, range<1>(1));
     Queue.submit([&](handler &CGH) {
-      CGH.set_arg(0, FirstBuffer.get_access<access::mode::write>(CGH));
-      CGH.set_arg(1, SecondBuffer.get_access<access::mode::write>(CGH));
+      CGH.set_arg(0, FirstBuffer.get_access<access_mode::write>(CGH));
+      CGH.set_arg(1, SecondBuffer.get_access<access_mode::write>(CGH));
       CGH.single_task(FirstKernel);
     });
   }
@@ -71,8 +71,8 @@ int main() {
   {
     buffer<float, 1> FirstBuffer(Array, range<1>(Count));
     Queue.submit([&](handler &CGH) {
-      auto Acc = FirstBuffer.get_access<access::mode::read_write>(CGH);
-      CGH.set_arg(0, FirstBuffer.get_access<access::mode::read_write>(CGH));
+      auto Acc = FirstBuffer.get_access<access_mode::read_write>(CGH);
+      CGH.set_arg(0, FirstBuffer.get_access<access_mode::read_write>(CGH));
       CGH.parallel_for(range<1>{Count}, SecondKernel);
     });
   }
@@ -105,9 +105,9 @@ int main() {
   {
     buffer<float, 1> FirstBuffer(Array, range<1>(Count));
     Queue.submit([&](handler &CGH) {
-      auto Acc = FirstBuffer.get_access<access::mode::read_write>(CGH);
-      CGH.set_arg(0, FirstBuffer.get_access<access::mode::read_write>(CGH));
-      CGH.set_arg(1, sycl::accessor<float, 1, sycl::access::mode::read_write,
+      auto Acc = FirstBuffer.get_access<access_mode::read_write>(CGH);
+      CGH.set_arg(0, FirstBuffer.get_access<access_mode::read_write>(CGH));
+      CGH.set_arg(1, sycl::accessor<float, 1, sycl::access_mode::read_write,
                                     sycl::access::target::local>(
                          sycl::range<1>(Count), CGH));
       CGH.parallel_for(range<1>{Count}, ThirdKernel);
diff --git a/sycl/test-e2e/DeprecatedFeatures/subbuffer_interop.cpp b/sycl/test-e2e/DeprecatedFeatures/subbuffer_interop.cpp
index bb41c3e0ebe95..37d6a41ebcbbb 100644
--- a/sycl/test-e2e/DeprecatedFeatures/subbuffer_interop.cpp
+++ b/sycl/test-e2e/DeprecatedFeatures/subbuffer_interop.cpp
@@ -93,8 +93,8 @@ int main() {
       kernel TestKernel(clKernel, TestQueue.get_context());
 
       TestQueue.submit([&](handler &cgh) {
-        auto a_acc = BufA.get_access<access::mode::read>(cgh);
-        auto b_acc = BufB.get_access<access::mode::write>(cgh);
+        auto a_acc = BufA.get_access<access_mode::read>(cgh);
+        auto b_acc = BufB.get_access<access_mode::write>(cgh);
         cgh.set_arg(0, a_acc);
         cgh.set_arg(1, b_acc);
 
@@ -159,9 +159,9 @@ int main() {
       kernel TestKernel(clKernel, TestQueue.get_context());
 
       TestQueue.submit([&](handler &cgh) {
-        auto a_acc = BufA.get_access<access::mode::read>(cgh);
-        auto b_acc = BufB.get_access<access::mode::write>(cgh);
-        auto c_acc = BufC.get_access<access::mode::write>(cgh);
+        auto a_acc = BufA.get_access<access_mode::read>(cgh);
+        auto b_acc = BufB.get_access<access_mode::write>(cgh);
+        auto c_acc = BufC.get_access<access_mode::write>(cgh);
         cgh.set_arg(0, a_acc);
         cgh.set_arg(1, b_acc);
         cgh.set_arg(2, c_acc);
@@ -241,8 +241,8 @@ int main() {
       kernel TestKernel2(clKernel2, TestQueue.get_context());
 
       TestQueue.submit([&](handler &cgh) {
-        auto a_acc = BufA.get_access<access::mode::read>(cgh);
-        auto b_acc = BufB.get_access<access::mode::write>(cgh);
+        auto a_acc = BufA.get_access<access_mode::read>(cgh);
+        auto b_acc = BufB.get_access<access_mode::write>(cgh);
         cgh.set_arg(0, a_acc);
         cgh.set_arg(1, b_acc);
 
@@ -250,8 +250,8 @@ int main() {
       });
 
       TestQueue.submit([&](handler &cgh) {
-        auto a_acc = BufA.get_access<access::mode::read>(cgh);
-        auto c_acc = BufC.get_access<access::mode::write>(cgh);
+        auto a_acc = BufA.get_access<access_mode::read>(cgh);
+        auto c_acc = BufC.get_access<access_mode::write>(cgh);
         cgh.set_arg(0, a_acc);
         cgh.set_arg(1, c_acc);
 
@@ -314,13 +314,13 @@ int main() {
 
     // Test offsets
     {
-      auto host_acc = subbuf_copy->get_access<sycl::access::mode::read>();
+      auto host_acc = subbuf_copy->get_access<sycl::access_mode::read>();
       std::cout << "On host: offset = " << host_acc[0] << std::endl;
       assert(host_acc[0] == 256 && "Invalid subbuffer origin");
     }
 
     Q.submit([&](sycl::handler &cgh) {
-      auto acc = subbuf_copy->get_access<sycl::access::mode::write>(cgh);
+      auto acc = subbuf_copy->get_access<sycl::access_mode::write>(cgh);
       cgh.set_args(acc);
       cgh.single_task(kernel_sycl);
     });
@@ -328,7 +328,7 @@ int main() {
     Q.wait_and_throw();
 
     {
-      auto host_acc = subbuf_copy->get_access<sycl::access::mode::read>();
+      auto host_acc = subbuf_copy->get_access<sycl::access_mode::read>();
       std::cout << "On host: offset = " << host_acc[0] << std::endl;
       assert(host_acc[0] == 256 * 3 && "Invalid subbuffer origin");
     }
diff --git a/sycl/test-e2e/DeviceArchitecture/device_architecture_on_device_aot.cpp b/sycl/test-e2e/DeviceArchitecture/device_architecture_on_device_aot.cpp
index 0050f08c752a5..c728a8cbdae6c 100644
--- a/sycl/test-e2e/DeviceArchitecture/device_architecture_on_device_aot.cpp
+++ b/sycl/test-e2e/DeviceArchitecture/device_architecture_on_device_aot.cpp
@@ -22,7 +22,7 @@ int main() {
 
     // test if_architecture_is
     q.submit([&](handler &cgh) {
-      auto acc = buf.get_access<access::mode::read_write>(cgh);
+      auto acc = buf.get_access<access_mode::read_write>(cgh);
       cgh.single_task([=]() {
         if_architecture_is<architecture::x86_64>([&]() {
           acc[0] = 1;
@@ -32,7 +32,7 @@ int main() {
 
     // test else_if_architecture_is
     q.submit([&](handler &cgh) {
-      auto acc = buf.get_access<access::mode::read_write>(cgh);
+      auto acc = buf.get_access<access_mode::read_write>(cgh);
       cgh.single_task([=]() {
         if_architecture_is<architecture::intel_gpu_dg1>([&]() {
           acc[1] = 0;
@@ -44,7 +44,7 @@ int main() {
 
     // test otherwise
     q.submit([&](handler &cgh) {
-      auto acc = buf.get_access<access::mode::read_write>(cgh);
+      auto acc = buf.get_access<access_mode::read_write>(cgh);
       cgh.single_task([=]() {
         if_architecture_is<architecture::intel_gpu_dg1>([&]() {
           acc[2] = 0;
@@ -55,7 +55,7 @@ int main() {
     // test more than one architecture template parameter is passed to
     // if_architecture_is
     q.submit([&](handler &cgh) {
-      auto acc = buf.get_access<access::mode::read_write>(cgh);
+      auto acc = buf.get_access<access_mode::read_write>(cgh);
       cgh.single_task([=]() {
         if_architecture_is<architecture::intel_gpu_dg1, architecture::x86_64>(
             [&]() { acc[3] = 4; })
diff --git a/sycl/test-e2e/DeviceGlobal/device_global_arrow.hpp b/sycl/test-e2e/DeviceGlobal/device_global_arrow.hpp
index ba869734243f9..4807adc34f05f 100644
--- a/sycl/test-e2e/DeviceGlobal/device_global_arrow.hpp
+++ b/sycl/test-e2e/DeviceGlobal/device_global_arrow.hpp
@@ -32,7 +32,7 @@ int test() {
   {
     buffer<int, 1> OutBuf{Out, 2};
     Q.submit([&](handler &CGH) {
-      auto OutAcc = OutBuf.get_access<access::mode::write>(CGH);
+      auto OutAcc = OutBuf.get_access<access_mode::write>(CGH);
       CGH.single_task([=]() {
         OutAcc[0] = DeviceGlobalVar1->getX();
         OutAcc[1] = DeviceGlobalVar2->getX();
diff --git a/sycl/test-e2e/DeviceGlobal/device_global_device_only.hpp b/sycl/test-e2e/DeviceGlobal/device_global_device_only.hpp
index e5406bb0a3679..58bb3d206d244 100644
--- a/sycl/test-e2e/DeviceGlobal/device_global_device_only.hpp
+++ b/sycl/test-e2e/DeviceGlobal/device_global_device_only.hpp
@@ -15,7 +15,7 @@ int test() {
   {
     buffer<int, 1> OutBuf(&OutVal, 1);
     Q.submit([&](handler &CGH) {
-      auto OutAcc = OutBuf.get_access<access::mode::write>(CGH);
+      auto OutAcc = OutBuf.get_access<access_mode::write>(CGH);
       CGH.single_task([=]() { OutAcc[0] = DeviceGlobalVar.get()[0]; });
     });
   }
diff --git a/sycl/test-e2e/DeviceGlobal/device_global_operator_passthrough.hpp b/sycl/test-e2e/DeviceGlobal/device_global_operator_passthrough.hpp
index 514176b53b413..719e3cfe7e762 100644
--- a/sycl/test-e2e/DeviceGlobal/device_global_operator_passthrough.hpp
+++ b/sycl/test-e2e/DeviceGlobal/device_global_operator_passthrough.hpp
@@ -19,7 +19,7 @@ int test() {
   {
     buffer<int, 1> OutBuf{&Out, 1};
     Q.submit([&](handler &CGH) {
-      auto OutAcc = OutBuf.get_access<access::mode::write>(CGH);
+      auto OutAcc = OutBuf.get_access<access_mode::write>(CGH);
       CGH.single_task([=]() { OutAcc[0] = DeviceGlobalVar; });
     });
   }
diff --git a/sycl/test-e2e/DeviceGlobal/device_global_static.cpp b/sycl/test-e2e/DeviceGlobal/device_global_static.cpp
index 0202c10bbfe44..a6a054766b619 100644
--- a/sycl/test-e2e/DeviceGlobal/device_global_static.cpp
+++ b/sycl/test-e2e/DeviceGlobal/device_global_static.cpp
@@ -27,7 +27,7 @@ int main() {
   {
     buffer<int, 1> OutBuf(&OutVal, 1);
     Q.submit([&](handler &CGH) {
-      auto OutAcc = OutBuf.get_access<access::mode::write>(CGH);
+      auto OutAcc = OutBuf.get_access<access_mode::write>(CGH);
       CGH.single_task([=]() { OutAcc[0] = DeviceGlobalVar.get()[0]; });
     });
   }
diff --git a/sycl/test-e2e/DeviceGlobal/device_global_subscript.hpp b/sycl/test-e2e/DeviceGlobal/device_global_subscript.hpp
index 475a1f10dd17d..b8753d2890e9e 100644
--- a/sycl/test-e2e/DeviceGlobal/device_global_subscript.hpp
+++ b/sycl/test-e2e/DeviceGlobal/device_global_subscript.hpp
@@ -22,7 +22,7 @@ int test() {
   {
     buffer<int, 1> OutBuf{Out, 2};
     Q.submit([&](handler &CGH) {
-      auto OutAcc = OutBuf.get_access<access::mode::write>(CGH);
+      auto OutAcc = OutBuf.get_access<access_mode::write>(CGH);
       CGH.single_task([=]() {
         OutAcc[0] = DeviceGlobalVar1[2];
         OutAcc[1] = DeviceGlobalVar2[1];
diff --git a/sycl/test-e2e/DeviceLib/ITTAnnotations/atomic.cpp b/sycl/test-e2e/DeviceLib/ITTAnnotations/atomic.cpp
index 272c21885365f..c1a301d8dce39 100644
--- a/sycl/test-e2e/DeviceLib/ITTAnnotations/atomic.cpp
+++ b/sycl/test-e2e/DeviceLib/ITTAnnotations/atomic.cpp
@@ -19,7 +19,7 @@ int main() {
     // ITT start/finish annotations and ITT atomic start/finish annotations.
     q.submit([&](handler &cgh) {
       auto source_acc =
-          source_buf.template get_access<access::mode::read_write>(cgh);
+          source_buf.template get_access<access_mode::read_write>(cgh);
       auto target_acc =
           target_buf.template get_access<access::mode::discard_write>(cgh);
       cgh.single_task<class simple_atomic_kernel>([=]() {
diff --git a/sycl/test-e2e/DeviceLib/ITTAnnotations/barrier.cpp b/sycl/test-e2e/DeviceLib/ITTAnnotations/barrier.cpp
index e748e1253dde4..281f22783f7c8 100644
--- a/sycl/test-e2e/DeviceLib/ITTAnnotations/barrier.cpp
+++ b/sycl/test-e2e/DeviceLib/ITTAnnotations/barrier.cpp
@@ -19,7 +19,7 @@ int main() {
     // Ensure that a simple kernel gets run when instrumented with
     // ITT start/finish annotations and ITT wg_barrier/wi_resume annotations.
     q.submit([&](handler &cgh) {
-      auto acc = buf.get_access<access::mode::read_write>(cgh);
+      auto acc = buf.get_access<access_mode::read_write>(cgh);
       local_accessor<int, 1> local_acc(local_range, cgh);
       cgh.parallel_for<class simple_barrier_kernel>(
           nd_range<1>(num_items, local_range), [=](nd_item<1> item) {
diff --git a/sycl/test-e2e/DeviceLib/bfloat16_conversion_dlopen_test.hpp b/sycl/test-e2e/DeviceLib/bfloat16_conversion_dlopen_test.hpp
index c879cdc2b3180..6260912b20d16 100644
--- a/sycl/test-e2e/DeviceLib/bfloat16_conversion_dlopen_test.hpp
+++ b/sycl/test-e2e/DeviceLib/bfloat16_conversion_dlopen_test.hpp
@@ -7,8 +7,8 @@
 
 using namespace sycl;
 
-constexpr access::mode sycl_read = access::mode::read;
-constexpr access::mode sycl_write = access::mode::write;
+constexpr access_mode sycl_read = access_mode::read;
+constexpr access_mode sycl_write = access_mode::write;
 
 using BFP = sycl::ext::oneapi::bfloat16;
 
diff --git a/sycl/test-e2e/DeviceLib/bfloat16_conversion_test.hpp b/sycl/test-e2e/DeviceLib/bfloat16_conversion_test.hpp
index 5c36a78d0366f..c5b2f1e827406 100644
--- a/sycl/test-e2e/DeviceLib/bfloat16_conversion_test.hpp
+++ b/sycl/test-e2e/DeviceLib/bfloat16_conversion_test.hpp
@@ -4,8 +4,8 @@
 
 using namespace sycl;
 
-constexpr access::mode sycl_read = access::mode::read;
-constexpr access::mode sycl_write = access::mode::write;
+constexpr access_mode sycl_read = access_mode::read;
+constexpr access_mode sycl_write = access_mode::write;
 
 using BFP = sycl::ext::oneapi::bfloat16;
 
diff --git a/sycl/test-e2e/DeviceLib/built-ins/ext_native_math_common.hpp b/sycl/test-e2e/DeviceLib/built-ins/ext_native_math_common.hpp
index a67320dcb6798..7c84f7f763a32 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/ext_native_math_common.hpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/ext_native_math_common.hpp
@@ -33,7 +33,7 @@ void native_tanh_tester(sycl::queue q, T val, T up, T lo) {
   {
     sycl::buffer<T, 1> BufR(&r, sycl::range<1>(1));
     q.submit([&](sycl::handler &cgh) {
-      auto AccR = BufR.template get_access<sycl::access::mode::read_write>(cgh);
+      auto AccR = BufR.template get_access<sycl::access_mode::read_write>(cgh);
       cgh.single_task([=]() {
         AccR[0] = sycl::ext::oneapi::experimental::native::tanh(AccR[0]);
       });
@@ -54,7 +54,7 @@ void native_exp2_tester(sycl::queue q, T val, T up, T lo) {
   {
     sycl::buffer<T, 1> BufR(&r, sycl::range<1>(1));
     q.submit([&](sycl::handler &cgh) {
-      auto AccR = BufR.template get_access<sycl::access::mode::read_write>(cgh);
+      auto AccR = BufR.template get_access<sycl::access_mode::read_write>(cgh);
       cgh.single_task([=]() {
         AccR[0] = sycl::ext::oneapi::experimental::native::exp2(AccR[0]);
       });
diff --git a/sycl/test-e2e/DeviceLib/built-ins/fast-math-flag.cpp b/sycl/test-e2e/DeviceLib/built-ins/fast-math-flag.cpp
index 0b5eae2289cc7..b9c5b840e4f91 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/fast-math-flag.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/fast-math-flag.cpp
@@ -32,9 +32,9 @@ bool checkEqual(marray<T, N> A, marray<T, N> B) {
       buffer<T, 1> input_buff(&input, 1);                                      \
       buffer<T, 1> res_buff(&res[0], sycl::range<1>(2));                       \
       deviceQueue.submit([&](handler &cgh) {                                   \
-        accessor<T, 1, access::mode::write, target::device> res_acc(res_buff,  \
-                                                                    cgh);      \
-        accessor<T, 1, access::mode::read, target::device> input_acc(          \
+        accessor<T, 1, access_mode::write, target::device> res_acc(res_buff,   \
+                                                                   cgh);       \
+        accessor<T, 1, access_mode::read, target::device> input_acc(           \
             input_buff, cgh);                                                  \
         cgh.single_task([=]() {                                                \
           res_acc[0] = sycl::native::func(input_acc[0]);                       \
@@ -54,9 +54,9 @@ bool checkEqual(marray<T, N> A, marray<T, N> B) {
       buffer<T, 1> input_buff(&input[0], range<1>(2));                         \
       buffer<T, 1> res_buff(&res[0], range<1>(2));                             \
       deviceQueue.submit([&](handler &cgh) {                                   \
-        accessor<T, 1, access::mode::write, target::device> res_acc(res_buff,  \
-                                                                    cgh);      \
-        accessor<T, 1, access::mode::read, target::device> input_acc(          \
+        accessor<T, 1, access_mode::write, target::device> res_acc(res_buff,   \
+                                                                   cgh);       \
+        accessor<T, 1, access_mode::read, target::device> input_acc(           \
             input_buff, cgh);                                                  \
         cgh.single_task([=]() {                                                \
           res_acc[0] = sycl::native::func(input_acc[0], input_acc[1]);         \
diff --git a/sycl/test-e2e/DeviceLib/built-ins/nan.cpp b/sycl/test-e2e/DeviceLib/built-ins/nan.cpp
index be75b76c17661..52c5fcbd9af31 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/nan.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/nan.cpp
@@ -25,7 +25,7 @@ template <typename T, typename R> void check_scalar_nan(s::queue &Queue) {
   {
     s::buffer<R, 1> Buf(&Data, s::range<1>(1));
     Queue.submit([&](s::handler &Cgh) {
-      auto Acc = Buf.template get_access<s::access::mode::write>(Cgh);
+      auto Acc = Buf.template get_access<s::access_mode::write>(Cgh);
       Cgh.single_task<test_scalar<T, R>>([=]() { Acc[0] = s::nan(T{0}); });
     });
     Queue.wait_and_throw();
@@ -40,7 +40,7 @@ template <typename T, typename R> void check_vec_nan(s::queue &Queue) {
   {
     s::buffer<s::vec<R, 2>, 1> VBuf(&VData, s::range<1>(1));
     Queue.submit([&](s::handler &Cgh) {
-      auto VAcc = VBuf.template get_access<s::access::mode::write>(Cgh);
+      auto VAcc = VBuf.template get_access<s::access_mode::write>(Cgh);
       Cgh.single_task<test_vec<T, R>>(
           [=]() { VAcc[0] = s::nan(s::vec<T, 2>{0}); });
     });
diff --git a/sycl/test-e2e/DeviceLib/built-ins/scalar_common.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_common.cpp
index 5e12037006e91..83812a0e3da42 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/scalar_common.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_common.cpp
@@ -17,7 +17,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class maxF1F1>(
             [=]() { AccR[0] = s::max(float{0.5f}, float{2.3f}); });
       });
diff --git a/sycl/test-e2e/DeviceLib/built-ins/scalar_geometric.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_geometric.cpp
index 634706c578ccf..8223729ad12aa 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/scalar_geometric.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_geometric.cpp
@@ -17,7 +17,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class dotF1F1>(
             [=]() { AccR[0] = s::dot(float{0.5}, float{1.6}); });
       });
@@ -32,7 +32,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class distanceF1>(
             [=]() { AccR[0] = s::distance(float{1.f}, float{3.f}); });
       });
@@ -47,7 +47,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class lengthF1>(
             [=]() { AccR[0] = s::length(float{1.f}); });
       });
@@ -62,7 +62,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class normalizeF1>(
             [=]() { AccR[0] = s::normalize(float{2.f}); });
       });
@@ -77,7 +77,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fast_distanceF1>(
             [=]() { AccR[0] = s::fast_distance(float{1.f}, float{3.f}); });
       });
@@ -92,7 +92,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fast_lengthF1>(
             [=]() { AccR[0] = s::fast_length(float{2.f}); });
       });
@@ -107,7 +107,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fast_normalizeF1>(
             [=]() { AccR[0] = s::fast_normalize(float{2.f}); });
       });
diff --git a/sycl/test-e2e/DeviceLib/built-ins/scalar_integer.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_integer.cpp
index 0c359e10fc8d2..b879ce8c3ba25 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/scalar_integer.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_integer.cpp
@@ -18,7 +18,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class maxSI1SI1>([=]() { AccR[0] = s::max(5, 2); });
       });
     }
@@ -32,7 +32,7 @@ int main() {
       s::buffer<unsigned int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class maxUI1UI1>([=]() { AccR[0] = s::max(5u, 2u); });
       });
     }
@@ -46,7 +46,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class minSI1SI1>([=]() { AccR[0] = s::min(5, 2); });
       });
     }
@@ -60,7 +60,7 @@ int main() {
       s::buffer<long long, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class minSLL1SLL1>(
             [=]() { AccR[0] = s::min(5ll, 2ll); });
       });
@@ -75,7 +75,7 @@ int main() {
       s::buffer<unsigned int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class minUI1UI1>([=]() { AccR[0] = s::min(5u, 2u); });
       });
     }
@@ -89,7 +89,7 @@ int main() {
       s::buffer<unsigned long long, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class minULL1ULL1>(
             [=]() { AccR[0] = s::min(5ull, 2ull); });
       });
@@ -104,7 +104,7 @@ int main() {
       s::buffer<unsigned int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class absSI1>([=]() { AccR[0] = s::abs(-5); });
       });
     }
@@ -118,7 +118,7 @@ int main() {
       s::buffer<unsigned int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class abs_diffSI1SI1>(
             [=]() { AccR[0] = s::abs_diff(-5, -1); });
       });
@@ -133,7 +133,7 @@ int main() {
       s::buffer<unsigned char, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class abs_diffUC1UC1>([=]() {
           AccR[0] = s::abs_diff((unsigned char)3, (unsigned char)250);
         });
@@ -149,7 +149,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class add_satSI1SI1>(
             [=]() { AccR[0] = s::add_sat(0x7FFFFFFF, 100); });
       });
@@ -164,7 +164,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class haddSI1SI1>(
             [=]() { AccR[0] = s::hadd(0x0000007F, 0x00000020); });
       });
@@ -179,7 +179,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class rhaddSI1SI1>(
             [=]() { AccR[0] = s::rhadd(0x0000007F, 0x00000020); });
       });
@@ -194,7 +194,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class clampSI1SI1SI1>(
             [=]() { AccR[0] = s::clamp(5, 10, 30); });
       });
@@ -209,7 +209,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class clzSI1>([=]() { AccR[0] = s::clz(0x0FFFFFFF); });
       });
     }
@@ -223,7 +223,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class ctzSI1>(
             [=]() { AccR[0] = s::ctz(0x7FFFFFF0); });
       });
@@ -238,7 +238,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mad_hiSI1SI1SI1>([=]() {
           AccR[0] = s::mad_hi(0x10000000, 0x00000100, 0x00000001);
         }); // 2^28 * 2^8 = 2^36 -> 0x10 00000000.
@@ -254,7 +254,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mad_satSI1SI1SI1>([=]() {
           AccR[0] = s::mad_sat(0x10000000, 0x00000100, 0x00000001);
         }); // 2^31 * 2^8 = 2^39 -> 0x80 00000000 -> reuslt is saturated in the
@@ -272,7 +272,7 @@ int main() {
       sycl::buffer<char, 1> buf(&r, sycl::range<1>(1));
       sycl::queue q;
       q.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::write>(cgh);
         cgh.single_task<class kernel>([=]() {
           signed char inputData_0(-17);
           signed char inputData_1(-10);
@@ -292,7 +292,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mul_hiSI1SI1>([=]() {
           AccR[0] = s::mul_hi(0x10000000, 0x00000100);
         }); // 2^28 * 2^8 = 2^36 -> 0x10 00000000.
@@ -308,7 +308,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mul_hiSI1SI2>([=]() {
           AccR[0] = s::mul_hi(-0x10000000, 0x00000100);
         }); // -2^28 * 2^8 = -2^36 -> -0x10 (FFFFFFF0) 00000000.
@@ -324,7 +324,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mul_hiSI1SI3>([=]() {
           AccR[0] = s::mul_hi(-0x10000000, 0x00000101);
         }); // -2^28 * (2^8 + 1) = -2^36 - 2^28 -> -0x11 (FFFFFFEF) -0x10000000
@@ -341,7 +341,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class rotateSI1SI1>(
             [=]() { AccR[0] = s::rotate(0x11100000, 12); });
       });
@@ -356,7 +356,7 @@ int main() {
       s::buffer<char, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class rotateSI1SI2>(
             [=]() { AccR[0] = s::rotate((char)0xe0, (char)50); });
       });
@@ -371,7 +371,7 @@ int main() {
         s::buffer<int, 1> BufR(&r, s::range<1>(1));
         s::queue myQueue;
         myQueue.submit([&](s::handler &cgh) {
-          auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+          auto AccR = BufR.get_access<s::access_mode::write>(cgh);
           cgh.single_task<class sub_satSI1SI1>(
               [=]() { AccR[0] = s::sub_sat(x, y); });
         });
@@ -396,7 +396,7 @@ int main() {
       s::buffer<unsigned short, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleUC1UC1>([=]() {
           AccR[0] = s::upsample((unsigned char)0x10, (unsigned char)0x10);
         });
@@ -412,7 +412,7 @@ int main() {
       s::buffer<short, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleSC1UC1>(
             [=]() { AccR[0] = s::upsample((int8_t)0x10, (uint8_t)0x10); });
       });
@@ -427,7 +427,7 @@ int main() {
       s::buffer<unsigned int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleUS1US1>([=]() {
           AccR[0] = s::upsample((unsigned short)0x0010, (unsigned short)0x0010);
         });
@@ -443,7 +443,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleSS1US1>([=]() {
           AccR[0] = s::upsample((short)0x0010, (unsigned short)0x0010);
         });
@@ -459,7 +459,7 @@ int main() {
       s::buffer<unsigned long long, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleUI1UI1>(
             [=]() { AccR[0] = s::upsample(0x00000010u, 0x00000010u); });
       });
@@ -474,7 +474,7 @@ int main() {
       s::buffer<long long, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleSI1UI1>(
             [=]() { AccR[0] = s::upsample(0x00000010, 0x00000010u); });
       });
@@ -489,7 +489,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class popcountSI1>(
             [=]() { AccR[0] = s::popcount(0x000000FF); });
       });
@@ -504,7 +504,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mad24SI1SI1SI1>(
             [=]() { AccR[0] = s::mad24((int)0xFFFFFFFF, (int)20, (int)20); });
       });
@@ -519,7 +519,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mul24SI1SI1>(
             [=]() { AccR[0] = s::mul24((int)0xFFFFFFFF, (int)20); });
       });
diff --git a/sycl/test-e2e/DeviceLib/built-ins/scalar_math.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_math.cpp
index ffd405ef5b21b..1e0bd105455ea 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/scalar_math.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_math.cpp
@@ -21,7 +21,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class acosF1>([=]() { AccR[0] = s::acos(float{0.5}); });
       });
     }
@@ -35,7 +35,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class acoshF1>(
             [=]() { AccR[0] = s::acosh(float{2.4}); });
       });
@@ -50,7 +50,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class asinF1>([=]() { AccR[0] = s::asin(float{0.5}); });
       });
     }
@@ -64,7 +64,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class asinhF1>(
             [=]() { AccR[0] = s::asinh(float{0.5}); });
       });
@@ -79,7 +79,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class atanF1>([=]() { AccR[0] = s::atan(float{0.5}); });
       });
     }
@@ -93,7 +93,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class atanhF1>(
             [=]() { AccR[0] = s::atanh(float{0.5}); });
       });
@@ -108,7 +108,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class cbrtF1>(
             [=]() { AccR[0] = s::cbrt(float{27.0}); });
       });
@@ -123,7 +123,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class ceilF1>([=]() { AccR[0] = s::ceil(float{0.5}); });
       });
     }
@@ -137,7 +137,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class cosF1>([=]() { AccR[0] = s::cos(float{0.5}); });
       });
     }
@@ -151,7 +151,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class coshF1>([=]() { AccR[0] = s::cosh(float{0.5}); });
       });
     }
@@ -165,7 +165,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class cospiF1>(
             [=]() { AccR[0] = s::cospi(float{0.1}); });
       });
@@ -180,7 +180,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class erfcF1>([=]() { AccR[0] = s::erfc(float{0.5}); });
       });
     }
@@ -194,7 +194,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class erfF1>([=]() { AccR[0] = s::erf(float{0.5}); });
       });
     }
@@ -208,7 +208,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class expF1>([=]() { AccR[0] = s::exp(float{0.5}); });
       });
     }
@@ -222,7 +222,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class exp2F1>([=]() { AccR[0] = s::exp2(float{8.0}); });
       });
     }
@@ -236,7 +236,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class exp10F1>([=]() { AccR[0] = s::exp10(float{2}); });
       });
     }
@@ -250,7 +250,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class expm1F1>(
             [=]() { AccR[0] = s::expm1(float{0.5}); });
       });
@@ -265,7 +265,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fabsF1>(
             [=]() { AccR[0] = s::fabs(float{-0.5}); });
       });
@@ -280,7 +280,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class floorF1>(
             [=]() { AccR[0] = s::floor(float{0.5}); });
       });
@@ -295,7 +295,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fmaxF1F1>(
             [=]() { AccR[0] = s::fmax(float{0.5}, float{0.8}); });
       });
@@ -310,7 +310,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fminF1F1>(
             [=]() { AccR[0] = s::fmin(float{0.5}, float{0.8}); });
       });
@@ -325,7 +325,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fmodF1F1>(
             [=]() { AccR[0] = s::fmod(float{5.1}, float{3.0}); });
       });
@@ -340,7 +340,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
         cgh.single_task<class lgammaF1>(
             [=]() { AccR[0] = s::lgamma(float{10.f}); });
       });
@@ -355,7 +355,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
         cgh.single_task<class lgammaF1_neg>(
             [=]() { AccR[0] = s::lgamma(float{-2.4f}); });
       });
diff --git a/sycl/test-e2e/DeviceLib/built-ins/scalar_math_2.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_math_2.cpp
index 919e6c8d13dae..aa92a8d8685e8 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/scalar_math_2.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_math_2.cpp
@@ -20,7 +20,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class acospiF1>(
             [=]() { AccR[0] = s::acospi(float{0.5}); });
       });
@@ -35,7 +35,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class asinpiF1>(
             [=]() { AccR[0] = s::asinpi(float{0.5}); });
       });
@@ -50,7 +50,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class atan2F1F1>(
             [=]() { AccR[0] = s::atan2(float{0.5}, float{0.5}); });
       });
@@ -65,7 +65,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class atanpiF1>(
             [=]() { AccR[0] = s::atanpi(float{0.5}); });
       });
@@ -80,7 +80,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class atan2piF1F1>(
             [=]() { AccR[0] = s::atan2pi(float{0.5}, float{0.5}); });
       });
@@ -95,7 +95,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class copysignF1F1>(
             [=]() { AccR[0] = s::copysign(float{1}, float{-0.5}); });
       });
@@ -110,7 +110,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fdimF1F1>(
             [=]() { AccR[0] = s::fdim(float{1.6}, float{0.6}); });
       });
@@ -125,7 +125,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fmaF1F1F1>(
             [=]() { AccR[0] = s::fma(float{0.5}, float{10.0}, float{3.0}); });
       });
@@ -143,8 +143,8 @@ int main() {
                                {s::property::buffer::use_host_ptr()});
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
-        auto AccI = BufI.get_access<s::access::mode::read_write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
+        auto AccI = BufI.get_access<s::access_mode::read_write>(cgh);
         cgh.single_task<class fractF1GF1>([=]() {
           s::global_ptr<float> Iptr(AccI);
           AccR[0] = s::fract(float{1.5}, Iptr);
@@ -165,8 +165,8 @@ int main() {
                                {s::property::buffer::use_host_ptr()});
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
-        auto AccI = BufI.get_access<s::access::mode::read_write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
+        auto AccI = BufI.get_access<s::access_mode::read_write>(cgh);
         cgh.single_task<class fractF1PF1>([=]() {
           float temp(0.0);
           s::private_ptr<float> Iptr(&temp);
@@ -189,8 +189,8 @@ int main() {
                              {s::property::buffer::use_host_ptr()});
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
-        auto AccI = BufI.get_access<s::access::mode::read_write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
+        auto AccI = BufI.get_access<s::access_mode::read_write>(cgh);
         cgh.single_task<class lgamma_rF1PI1>([=]() {
           int temp(0.0);
           s::private_ptr<int> Iptr(&temp);
@@ -213,8 +213,8 @@ int main() {
                              {s::property::buffer::use_host_ptr()});
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
-        auto AccI = BufI.get_access<s::access::mode::read_write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
+        auto AccI = BufI.get_access<s::access_mode::read_write>(cgh);
         cgh.single_task<class lgamma_rF1PI1_neg>([=]() {
           int temp(0.0);
           s::private_ptr<int> Iptr(&temp);
diff --git a/sycl/test-e2e/DeviceLib/built-ins/scalar_relational.cpp b/sycl/test-e2e/DeviceLib/built-ins/scalar_relational.cpp
index d67cc5d79e5df..f493a8108f3e0 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/scalar_relational.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/scalar_relational.cpp
@@ -20,7 +20,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isequalF1F1>(
             [=]() { AccR[0] = s::isequal(float{10.5f}, float{10.5f}); });
       });
@@ -34,7 +34,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isnotequalF1F1>(
             [=]() { AccR[0] = s::isnotequal(float{0.4f}, float{0.5f}); });
       });
@@ -48,7 +48,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isgreaterF1F1>(
             [=]() { AccR[0] = s::isgreater(float{0.6f}, float{0.5f}); });
       });
@@ -62,7 +62,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isgreaterequalF1F1>(
             [=]() { AccR[0] = s::isgreaterequal(float{0.5f}, float{0.5f}); });
       });
@@ -76,7 +76,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class islessF1F1>(
             [=]() { AccR[0] = s::isless(float{0.4f}, float{0.5f}); });
       });
@@ -90,7 +90,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class islessequalF1F1>(
             [=]() { AccR[0] = s::islessequal(float{0.5f}, float{0.5f}); });
       });
@@ -104,7 +104,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class islessgreaterF1F1>(
             [=]() { AccR[0] = s::islessgreater(float{0.5f}, float{0.5f}); });
       });
@@ -118,7 +118,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isfiniteF1>(
             [=]() { AccR[0] = s::isfinite(float{NAN}); });
       });
@@ -132,7 +132,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isinfF1>(
             [=]() { AccR[0] = s::isinf(float{INFINITY}); });
       });
@@ -146,7 +146,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isnanF1>(
             [=]() { AccR[0] = s::isnan(float{NAN}); });
       });
@@ -160,7 +160,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isnormalF1>(
             [=]() { AccR[0] = s::isnormal(float{INFINITY}); });
       });
@@ -174,7 +174,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isnormalD1>(
             [=]() { AccR[0] = s::isnormal(double{INFINITY}); });
       });
@@ -188,7 +188,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isorderedF1F1>(
             [=]() { AccR[0] = s::isordered(float{4.0f}, float{NAN}); });
       });
@@ -202,7 +202,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isunorderedF1F1>(
             [=]() { AccR[0] = s::isunordered(float{4.0f}, float{NAN}); });
       });
@@ -216,7 +216,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class signbitF1>(
             [=]() { AccR[0] = s::signbit(float{-12.0f}); });
       });
@@ -230,7 +230,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class anyF1positive>(
             [=]() { AccR[0] = s::any(int{12}); });
       });
@@ -243,7 +243,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class anyF1zero>([=]() { AccR[0] = s::any(int{0}); });
       });
     }
@@ -256,7 +256,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class anyF1negative>(
             [=]() { AccR[0] = s::any(int{-12}); });
       });
@@ -270,7 +270,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class allF1positive>(
             [=]() { AccR[0] = s::all(int{12}); });
       });
@@ -284,7 +284,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class allF1zero>([=]() { AccR[0] = s::all(int{0}); });
       });
     }
@@ -297,7 +297,7 @@ int main() {
     {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class allF1negative>(
             [=]() { AccR[0] = s::all(int{-12}); });
       });
@@ -311,7 +311,7 @@ int main() {
     {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class bitselectF1F1F1>([=]() {
           AccR[0] = s::bitselect(float{112.112}, float{34.34}, float{3.3});
         });
@@ -326,7 +326,7 @@ int main() {
     {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class selectF1F1I1positive>([=]() {
           AccR[0] = s::select(float{34.34}, float{123.123}, int{1});
         });
@@ -341,7 +341,7 @@ int main() {
     {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class selectF1F1I1zero>([=]() {
           AccR[0] = s::select(float{34.34}, float{123.123}, int{0});
         });
@@ -356,7 +356,7 @@ int main() {
     {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class selectF1F1I1negative>([=]() {
           AccR[0] = s::select(float{34.34}, float{123.123}, int{-1});
         });
@@ -372,7 +372,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class selectF1F1B1true>(
             [=]() { AccR[0] = s::select(34.34f, 123.123f, true); });
       });
@@ -387,7 +387,7 @@ int main() {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class selectF1F1B1false>(
             [=]() { AccR[0] = s::select(34.34f, 123.123f, false); });
       });
diff --git a/sycl/test-e2e/DeviceLib/built-ins/vector_common.cpp b/sycl/test-e2e/DeviceLib/built-ins/vector_common.cpp
index d817eacf61079..d12e009972cce 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/vector_common.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/vector_common.cpp
@@ -17,7 +17,7 @@ int main() {
       s::buffer<s::float2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class maxF2F2>([=]() {
           AccR[0] = s::max(s::float2{0.5f, 3.4f}, s::float2{2.3f, 0.4f});
         });
@@ -36,7 +36,7 @@ int main() {
       s::buffer<s::float2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class maxF2F1>([=]() {
           AccR[0] = s::max(s::float2{0.5f, 3.4f}, float{3.0f});
         });
diff --git a/sycl/test-e2e/DeviceLib/built-ins/vector_geometric.cpp b/sycl/test-e2e/DeviceLib/built-ins/vector_geometric.cpp
index 6fa9948e77c5c..1fa4108a4917f 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/vector_geometric.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/vector_geometric.cpp
@@ -23,7 +23,7 @@ int main() {
     {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class dotF2F2>([=]() {
           AccR[0] = s::dot(
               s::float2{
@@ -43,7 +43,7 @@ int main() {
     {
       s::buffer<s::float4, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class crossF4>([=]() {
           AccR[0] = s::cross(
               s::float4{
@@ -79,7 +79,7 @@ int main() {
     {
       s::buffer<s::double4, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class crossD4>([=]() {
           AccR[0] = s::cross(
               s::double4{
@@ -115,7 +115,7 @@ int main() {
     {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class distanceF2>([=]() {
           AccR[0] = s::distance(
               s::float2{
@@ -138,7 +138,7 @@ int main() {
     {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class lengthF2>([=]() {
           AccR[0] = s::length(s::float2{
               1.f,
@@ -156,7 +156,7 @@ int main() {
     {
       s::buffer<s::float2, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class normalizeF2>([=]() {
           AccR[0] = s::normalize(s::float2{
               1.f,
@@ -178,7 +178,7 @@ int main() {
     {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fast_distanceF2>([=]() {
           AccR[0] = s::fast_distance(
               s::float2{
@@ -201,7 +201,7 @@ int main() {
     {
       s::buffer<float, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fast_lengthF2>([=]() {
           AccR[0] = s::fast_length(s::float2{
               1.f,
@@ -219,7 +219,7 @@ int main() {
     {
       s::buffer<s::float2, 1> BufR(&r, s::range<1>(1));
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fast_normalizeF2>([=]() {
           AccR[0] = s::fast_normalize(s::float2{
               1.f,
diff --git a/sycl/test-e2e/DeviceLib/built-ins/vector_integer.cpp b/sycl/test-e2e/DeviceLib/built-ins/vector_integer.cpp
index 876f800743769..90003329ec9fb 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/vector_integer.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/vector_integer.cpp
@@ -18,7 +18,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class maxSI2SI2>([=]() {
           AccR[0] = s::max(s::int2{5, 3}, s::int2{2, 7});
         });
@@ -37,7 +37,7 @@ int main() {
       s::buffer<s::uint2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class maxUI2UI2>([=]() {
           AccR[0] = s::max(s::uint2{5, 3}, s::uint2{2, 7});
         });
@@ -56,7 +56,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class maxSI2SI1>([=]() {
           AccR[0] = s::max(s::int2{5, 3}, int{2});
         });
@@ -76,7 +76,7 @@ int main() {
       s::buffer<T, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class maxSLL2SLL1>(
             [=]() { AccR[0] = s::max(T{5, 3}, 2ll); });
       });
@@ -94,7 +94,7 @@ int main() {
       s::buffer<s::uint2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class maxUI2UI1>([=]() {
           AccR[0] = s::max(s::uint2{5, 3}, 2u);
         });
@@ -114,7 +114,7 @@ int main() {
       s::buffer<T, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class maxULL2ULL1>(
             [=]() { AccR[0] = s::max(T{5, 3}, 2ull); });
       });
@@ -132,7 +132,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class minSI2SI2>([=]() {
           AccR[0] = s::min(s::int2{5, 3}, s::int2{2, 7});
         });
@@ -151,7 +151,7 @@ int main() {
       s::buffer<s::uint2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class minUI2UI2>([=]() {
           AccR[0] = s::min(s::uint2{5, 3}, s::uint2{2, 7});
         });
@@ -170,7 +170,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class minSI2SI1>([=]() {
           AccR[0] = s::min(s::int2{5, 3}, int{2});
         });
@@ -189,7 +189,7 @@ int main() {
       s::buffer<s::uint2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class minUI2UI1>([=]() {
           AccR[0] = s::min(s::uint2{5, 3}, 2u);
         });
@@ -208,7 +208,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class absSI2>([=]() {
           AccR[0] = s::abs(s::int2{-5, -2});
         });
@@ -228,7 +228,7 @@ int main() {
       s::buffer<T, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class absSL2>([=]() { AccR[0] = s::abs(T{-5, -2}); });
       });
     }
@@ -245,7 +245,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class abs_diffSI2SI2>([=]() {
           AccR[0] = s::abs_diff(s::int2{-5, -2}, s::int2{-1, -1});
         });
@@ -264,7 +264,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class add_satSI2SI2>([=]() {
           AccR[0] =
               s::add_sat(s::int2{0x7FFFFFFF, 0x7FFFFFFF}, s::int2{100, 90});
@@ -284,7 +284,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class haddSI2SI2>([=]() {
           AccR[0] = s::hadd(s::int2{0x0000007F, 0x0000007F},
                             s::int2{0x00000020, 0x00000020});
@@ -304,7 +304,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class rhaddSI2SI2>([=]() {
           AccR[0] = s::rhadd(s::int2{0x0000007F, 0x0000007F},
                              s::int2{0x00000020, 0x00000020});
@@ -324,7 +324,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class clampSI2SI2SI2>([=]() {
           AccR[0] = s::clamp(s::int2{5, 5}, s::int2{10, 10}, s::int2{30, 30});
         });
@@ -343,7 +343,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class clampSI2SI1SI1>([=]() {
           AccR[0] = s::clamp(s::int2{5, 5}, int{10}, int{30});
         });
@@ -362,7 +362,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class clzSI2>([=]() {
           AccR[0] = s::clz(s::int2{0x0FFFFFFF, 0x0FFFFFFF});
         });
@@ -381,7 +381,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class ctzSI2>([=]() {
           AccR[0] = s::ctz(s::int2{0x7FFFFFF0, 0x7FFFFFF0});
         });
@@ -400,7 +400,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mad_hiSI2SI2SI2>([=]() {
           AccR[0] = s::mad_hi(s::int2{0x10000000, 0x10000000},
                               s::int2{0x00000100, 0x00000100}, s::int2{1, 1});
@@ -420,7 +420,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mad_satSI2SI2SI2>([=]() {
           AccR[0] = s::mad_sat(s::int2{0x10000000, 0x10000000},
                                s::int2{0x00000100, 0x00000100}, s::int2{1, 1});
@@ -440,7 +440,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mul_hiSI2SI2>([=]() {
           AccR[0] = s::mul_hi(s::int2{0x10000000, 0x10000000},
                               s::int2{0x00000100, 0x00000100});
@@ -460,7 +460,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class rotateSI2SI2>([=]() {
           AccR[0] = s::rotate(s::int2{0x11100000, 0x11100000}, s::int2{12, 12});
         });
@@ -480,7 +480,7 @@ int main() {
         s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
         s::queue myQueue;
         myQueue.submit([&](s::handler &cgh) {
-          auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+          auto AccR = BufR.get_access<s::access_mode::write>(cgh);
           cgh.single_task<class sub_satSI2SI2>(
               [=]() { AccR[0] = s::sub_sat(x, y); });
         });
@@ -512,7 +512,7 @@ int main() {
       s::buffer<s::ushort2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleUC2UC2>([=]() {
           AccR[0] = s::upsample(s::uchar2{0x10, 0x10}, s::uchar2{0x10, 0x10});
         });
@@ -531,7 +531,7 @@ int main() {
       s::buffer<s::short2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleSC2UC2>([=]() {
           AccR[0] = s::upsample(s::char2{0x10, 0x10}, s::uchar2{0x10, 0x10});
         });
@@ -550,7 +550,7 @@ int main() {
       s::buffer<s::uint2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleUS2US2>([=]() {
           AccR[0] = s::upsample(s::ushort2{0x0010, 0x0010},
                                 s::ushort2{0x0010, 0x0010});
@@ -570,7 +570,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleSS2US2>([=]() {
           AccR[0] = s::upsample(s::short2{0x0010, 0x0010},
                                 s::ushort2{0x0010, 0x0010});
@@ -590,7 +590,7 @@ int main() {
       s::buffer<s::ulong2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleUI2UI2>([=]() {
           AccR[0] = s::upsample(s::uint2{0x00000010, 0x00000010},
                                 s::uint2{0x00000010, 0x00000010});
@@ -610,7 +610,7 @@ int main() {
       s::buffer<s::long2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class upsampleSI2UI2>([=]() {
           AccR[0] = s::upsample(s::int2{0x00000010, 0x00000010},
                                 s::uint2{0x00000010, 0x00000010});
@@ -630,7 +630,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class popcountSI2>([=]() {
           AccR[0] = s::popcount(s::int2{0x000000FF, 0x000000FF});
         });
@@ -649,7 +649,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mad24SI2SI2SI2>([=]() {
           AccR[0] = s::mad24(s::int2{0xFFFFFFFF, 0xFFFFFFFF}, s::int2{20, 20},
                              s::int2{20, 20});
@@ -669,7 +669,7 @@ int main() {
       s::buffer<s::int2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class mul24SI2SI2SI2>([=]() {
           AccR[0] = s::mul24(s::int2{0xFFFFFFFF, 0xFFFFFFFF}, s::int2{20, 20});
         });
diff --git a/sycl/test-e2e/DeviceLib/built-ins/vector_math.cpp b/sycl/test-e2e/DeviceLib/built-ins/vector_math.cpp
index a47101562556d..dba593e17ea9d 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/vector_math.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/vector_math.cpp
@@ -20,7 +20,7 @@ int main() {
       s::buffer<s::float2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fminF2F2>([=]() {
           AccR[0] = s::fmin(s::float2{0.5f, 3.4f}, s::float2{2.3f, 0.4f});
         });
@@ -39,7 +39,7 @@ int main() {
       s::buffer<s::float2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class fabsF2>([=]() {
           AccR[0] = s::fabs(s::float2{-1.0f, 2.0f});
         });
@@ -58,7 +58,7 @@ int main() {
       s::buffer<s::float2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class floorF2>([=]() {
           AccR[0] = s::floor(s::float2{1.4f, 2.8f});
         });
@@ -77,7 +77,7 @@ int main() {
       s::buffer<s::float2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class ceilF2>([=]() {
           AccR[0] = s::ceil(s::float2{1.4f, 2.8f});
         });
@@ -99,8 +99,8 @@ int main() {
 
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
-        auto AccI = BufI.get_access<s::access::mode::read_write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
+        auto AccI = BufI.get_access<s::access_mode::read_write>(cgh);
         cgh.single_task<class fractF2GF2>([=]() {
           s::global_ptr<s::float2> Iptr(AccI);
           AccR[0] = s::fract(s::float2{1.5f, 2.5f}, Iptr);
@@ -128,8 +128,8 @@ int main() {
       s::buffer<s::float2, 1> BufI(&i, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
-        auto AccI = BufI.get_access<s::access::mode::read_write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
+        auto AccI = BufI.get_access<s::access_mode::read_write>(cgh);
         cgh.single_task<class fractF2PF2>([=]() {
           s::float2 temp(0.0);
           s::private_ptr<s::float2> Iptr(&temp);
@@ -157,7 +157,7 @@ int main() {
       s::buffer<s::float2, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
         cgh.single_task<class lgamma_rF2>([=]() {
           AccR[0] = s::lgamma(s::float2{10.f, -2.4f});
         });
@@ -180,8 +180,8 @@ int main() {
       s::buffer<s::int2, 1> BufI(&i, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
-        auto AccI = BufI.get_access<s::access::mode::read_write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
+        auto AccI = BufI.get_access<s::access_mode::read_write>(cgh);
         cgh.single_task<class lgamma_rF2PF2>([=]() {
           s::int2 temp(0.0);
           s::private_ptr<s::int2> Iptr(&temp);
diff --git a/sycl/test-e2e/DeviceLib/built-ins/vector_relational.cpp b/sycl/test-e2e/DeviceLib/built-ins/vector_relational.cpp
index 77a80886d8756..ad7bccbacea5d 100644
--- a/sycl/test-e2e/DeviceLib/built-ins/vector_relational.cpp
+++ b/sycl/test-e2e/DeviceLib/built-ins/vector_relational.cpp
@@ -20,7 +20,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isequalF4F4>([=]() {
           AccR[0] = s::isequal(s::float4{0.5f, 0.6f, NAN, INFINITY},
                                s::float4{0.5f, 0.5f, 0.5f, 0.5f});
@@ -45,7 +45,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isnotequalF4F4>([=]() {
           AccR[0] = s::isnotequal(s::float4{0.5f, 0.6f, NAN, INFINITY},
                                   s::float4{0.5f, 0.5f, 0.5f, 0.5f});
@@ -70,7 +70,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isgreaterF4F4>([=]() {
           AccR[0] = s::isgreater(s::float4{0.5f, 0.6f, NAN, INFINITY},
                                  s::float4{0.5f, 0.5f, 0.5f, 0.5f});
@@ -95,7 +95,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isgreaterequalF4F4>([=]() {
           AccR[0] = s::isgreaterequal(s::float4{0.5f, 0.6f, NAN, INFINITY},
                                       s::float4{0.5f, 0.5f, 0.5f, 0.5f});
@@ -120,7 +120,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class islessF4F4>([=]() {
           AccR[0] = s::isless(s::float4{0.5f, 0.4f, NAN, INFINITY},
                               s::float4{0.5f, 0.5f, 0.5f, 0.5f});
@@ -145,7 +145,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class islessequalF4F4>([=]() {
           AccR[0] = s::islessequal(s::float4{0.5f, 0.4f, NAN, INFINITY},
                                    s::float4{0.5f, 0.5f, 0.5f, 0.5f});
@@ -170,7 +170,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class islessgreaterF4F4>([=]() {
           AccR[0] = s::islessgreater(s::float4{0.5f, 0.4f, NAN, INFINITY},
                                      s::float4{0.5f, 0.5f, 0.5f, INFINITY});
@@ -196,7 +196,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isfiniteF4F4>([=]() {
           AccR[0] = s::isfinite(s::float4{0.5f, 0.4f, NAN, INFINITY});
         });
@@ -220,7 +220,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isinfF4F4>([=]() {
           AccR[0] = s::isinf(s::float4{0.5f, 0.4f, NAN, INFINITY});
         });
@@ -244,7 +244,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isnanF4F4>([=]() {
           AccR[0] = s::isnan(s::float4{0.5f, 0.4f, NAN, INFINITY});
         });
@@ -268,7 +268,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isnormalF4F4>([=]() {
           AccR[0] = s::isnormal(s::float4{0.5f, 0.4f, NAN, INFINITY});
         });
@@ -292,7 +292,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isorderedF4F4>([=]() {
           AccR[0] = s::isordered(s::float4{0.5f, 0.6f, NAN, INFINITY},
                                  s::float4{0.5f, 0.5f, 0.5f, 0.5f});
@@ -317,7 +317,7 @@ int main() {
       s::buffer<s::int4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class isunorderedF4F4>([=]() {
           AccR[0] = s::isunordered(s::float4{0.5f, 0.6f, NAN, INFINITY},
                                    s::float4{0.5f, 0.5f, 0.5f, 0.5f});
@@ -342,7 +342,7 @@ int main() {
       s::buffer<s::int3, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class signbitF3>([=]() {
           AccR[0] = s::signbit(s::float3{0.5f, -12.0f, INFINITY});
         });
@@ -365,7 +365,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class anyI4>([=]() {
           AccR[0] = s::any(s::int4{-12, -12, 0, 1});
         });
@@ -384,7 +384,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class anyI4negative>([=]() {
           AccR[0] = s::any(s::int4{-12, -12, -12, -12});
         });
@@ -403,7 +403,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class anyI4zero>([=]() {
           AccR[0] = s::any(s::int4{0, 0, 0, 0});
         });
@@ -422,7 +422,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class anyI4positive>([=]() {
           AccR[0] = s::any(s::int4{12, 12, 12, 12});
         });
@@ -441,7 +441,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class allI4>([=]() {
           AccR[0] = s::all(s::int4{-12, -12, -12, -12});
           // Infinity (positive or negative) or Nan are not integers.
@@ -463,7 +463,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class allI4negative>([=]() {
           AccR[0] = s::all(s::int4{-12, -12, -12, -12});
         });
@@ -482,7 +482,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class allI4zero>([=]() {
           AccR[0] = s::all(s::int4{0, 0, 0, 0});
         });
@@ -501,7 +501,7 @@ int main() {
       s::buffer<int, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class allI4positive>([=]() {
           AccR[0] = s::all(s::int4{12, 12, 12, 12});
         });
@@ -519,7 +519,7 @@ int main() {
       s::buffer<s::float4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class bitselectF4F4F4>([=]() {
           AccR[0] = s::bitselect(s::float4{112.112f, 12.12f, 0, 0.0f},
                                  s::float4{34.34f, 23.23f, 1, 0.0f},
@@ -546,7 +546,7 @@ int main() {
       s::buffer<s::float4, 1> BufR(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccR = BufR.get_access<s::access::mode::write>(cgh);
+        auto AccR = BufR.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class selectF4F4I4>([=]() {
           AccR[0] = s::select(s::float4{112.112f, 34.34f, 112.112f, 34.34f},
                               s::float4{34.34f, 112.112f, 34.34f, 112.112f},
@@ -579,10 +579,10 @@ int main() {
       s::buffer<s::vec<int, 4>> R(&r, s::range<1>(1));
       s::queue myQueue;
       myQueue.submit([&](s::handler &cgh) {
-        auto AccA = A.get_access<s::access::mode::read>(cgh);
-        auto AccB = B.get_access<s::access::mode::read>(cgh);
-        auto AccM = M.get_access<s::access::mode::read>(cgh);
-        auto AccR = R.get_access<s::access::mode::write>(cgh);
+        auto AccA = A.get_access<s::access_mode::read>(cgh);
+        auto AccB = B.get_access<s::access_mode::read>(cgh);
+        auto AccM = M.get_access<s::access_mode::read>(cgh);
+        auto AccR = R.get_access<s::access_mode::write>(cgh);
         cgh.single_task<class selectI4I4U4>(
             [=]() { AccR[0] = s::select(AccA[0], AccB[0], AccM[0]); });
       });
diff --git a/sycl/test-e2e/DeviceLib/c99_complex_math_fp64_test.cpp b/sycl/test-e2e/DeviceLib/c99_complex_math_fp64_test.cpp
index 617cd67a559cc..30e40e8c2a747 100644
--- a/sycl/test-e2e/DeviceLib/c99_complex_math_fp64_test.cpp
+++ b/sycl/test-e2e/DeviceLib/c99_complex_math_fp64_test.cpp
@@ -58,7 +58,7 @@ double _Complex catanh(double _Complex z);
 }
 
 namespace s = sycl;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 bool approx_equal_cmplx_d(double _Complex x, double _Complex y) {
   return approx_equal_fp(__real__ x, __real__ y) &&
diff --git a/sycl/test-e2e/DeviceLib/c99_complex_math_test.cpp b/sycl/test-e2e/DeviceLib/c99_complex_math_test.cpp
index 8f9e1de2bd023..160b19ea412e8 100644
--- a/sycl/test-e2e/DeviceLib/c99_complex_math_test.cpp
+++ b/sycl/test-e2e/DeviceLib/c99_complex_math_test.cpp
@@ -58,7 +58,7 @@ float _Complex catanhf(float _Complex z);
 }
 
 namespace s = sycl;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 bool approx_equal_cmplx_f(float _Complex x, float _Complex y) {
   return approx_equal_fp(__real__ x, __real__ y) &&
diff --git a/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp b/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp
index 5a8ba80a547d9..423e0d984571c 100644
--- a/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp
+++ b/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp
@@ -14,8 +14,8 @@
 #include <sycl/usm.hpp>
 
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 #define TEST_NUM 75
 
diff --git a/sycl/test-e2e/DeviceLib/cmath_test.cpp b/sycl/test-e2e/DeviceLib/cmath_test.cpp
index c774e53ad3b8e..d3aa2cc266daa 100644
--- a/sycl/test-e2e/DeviceLib/cmath_test.cpp
+++ b/sycl/test-e2e/DeviceLib/cmath_test.cpp
@@ -18,8 +18,8 @@
 #include <sycl/usm.hpp>
 
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 #define TEST_NUM 71
 
diff --git a/sycl/test-e2e/DeviceLib/complex_utils.hpp b/sycl/test-e2e/DeviceLib/complex_utils.hpp
index 26bd41fa489c1..d75342f6ac38c 100644
--- a/sycl/test-e2e/DeviceLib/complex_utils.hpp
+++ b/sycl/test-e2e/DeviceLib/complex_utils.hpp
@@ -309,9 +309,9 @@ int device_complex_test_mul(sycl::queue &deviceQueue,
         complex_mul_result.data(), numOfMulOutput);
     deviceQueue.submit([&](sycl::handler &cgh) {
       auto complex_mul_access =
-          buffer_complex_mul.template get_access<sycl::access::mode::read>(cgh);
+          buffer_complex_mul.template get_access<sycl::access_mode::read>(cgh);
       auto complex_mul_res_access =
-          buffer_complex_mul_res.template get_access<sycl::access::mode::write>(
+          buffer_complex_mul_res.template get_access<sycl::access_mode::write>(
               cgh);
       cgh.single_task<class DeviceComplexMulTest>([=]() {
         size_t i, j;
@@ -349,9 +349,9 @@ int device_complex_test_div(sycl::queue &deviceQueue,
         complex_div_result.data(), numOfDivOutput);
     deviceQueue.submit([&](sycl::handler &cgh) {
       auto complex_div_access =
-          buffer_complex_div.template get_access<sycl::access::mode::read>(cgh);
+          buffer_complex_div.template get_access<sycl::access_mode::read>(cgh);
       auto complex_div_res_access =
-          buffer_complex_div_res.template get_access<sycl::access::mode::write>(
+          buffer_complex_div_res.template get_access<sycl::access_mode::write>(
               cgh);
       cgh.single_task<class DeviceComplexDivTest>([=]() {
         size_t i, j;
diff --git a/sycl/test-e2e/DeviceLib/imf/fp32_test.cpp b/sycl/test-e2e/DeviceLib/imf/fp32_test.cpp
index 2db3f16209bfa..e7d48256a70f7 100644
--- a/sycl/test-e2e/DeviceLib/imf/fp32_test.cpp
+++ b/sycl/test-e2e/DeviceLib/imf/fp32_test.cpp
@@ -5,8 +5,8 @@
 #include "imf_utils.hpp"
 #include <sycl/ext/intel/math.hpp>
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 int main(int, char **) {
   s::queue device_queue(s::default_selector_v);
diff --git a/sycl/test-e2e/DeviceLib/imf/fp64_test.cpp b/sycl/test-e2e/DeviceLib/imf/fp64_test.cpp
index 89c94e176e470..59351289eccaa 100644
--- a/sycl/test-e2e/DeviceLib/imf/fp64_test.cpp
+++ b/sycl/test-e2e/DeviceLib/imf/fp64_test.cpp
@@ -7,8 +7,8 @@
 #include <sycl/ext/intel/math.hpp>
 
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 int main(int, char **) {
   s::queue device_queue(s::default_selector_v);
diff --git a/sycl/test-e2e/DeviceLib/imf/simd_emulate_test.cpp b/sycl/test-e2e/DeviceLib/imf/simd_emulate_test.cpp
index 72ff03f6568e4..69a4548dabad5 100644
--- a/sycl/test-e2e/DeviceLib/imf/simd_emulate_test.cpp
+++ b/sycl/test-e2e/DeviceLib/imf/simd_emulate_test.cpp
@@ -7,8 +7,8 @@
 #include <sycl/ext/intel/math.hpp>
 
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 void run_vabs2_4_test(s::queue &queue) {
   bool pass = true;
diff --git a/sycl/test-e2e/DeviceLib/math_fp64_test.cpp b/sycl/test-e2e/DeviceLib/math_fp64_test.cpp
index 2e3eb85c6f7da..7384c704d58f5 100644
--- a/sycl/test-e2e/DeviceLib/math_fp64_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_fp64_test.cpp
@@ -12,8 +12,8 @@
 #include <sycl/detail/core.hpp>
 
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 #define TEST_NUM 62
 
diff --git a/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp b/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
index a228324c43400..bc74864605c6b 100644
--- a/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp
@@ -11,8 +11,8 @@
 #include <sycl/detail/core.hpp>
 
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 #define TEST_NUM 38
 
diff --git a/sycl/test-e2e/DeviceLib/math_override_test.cpp b/sycl/test-e2e/DeviceLib/math_override_test.cpp
index 0a1f4e6cb4220..c0f83d31796ea 100644
--- a/sycl/test-e2e/DeviceLib/math_override_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_override_test.cpp
@@ -5,8 +5,8 @@
 
 #include "math_utils.hpp"
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 // Dummy function provided by user to override device library
 // version.
diff --git a/sycl/test-e2e/DeviceLib/math_test.cpp b/sycl/test-e2e/DeviceLib/math_test.cpp
index f96f7b8be97f8..76eb8513182d1 100644
--- a/sycl/test-e2e/DeviceLib/math_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_test.cpp
@@ -10,8 +10,8 @@
 #include <sycl/detail/core.hpp>
 
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 #define TEST_NUM 60
 
diff --git a/sycl/test-e2e/DeviceLib/math_test_marray_vec_common.hpp b/sycl/test-e2e/DeviceLib/math_test_marray_vec_common.hpp
index ad5dcd766ab65..989174c2e056c 100644
--- a/sycl/test-e2e/DeviceLib/math_test_marray_vec_common.hpp
+++ b/sycl/test-e2e/DeviceLib/math_test_marray_vec_common.hpp
@@ -33,9 +33,9 @@ template <typename T, size_t N> bool checkEqual(marray<T, N> A, size_t B) {
       buffer<T, 1> buffer1(&result, 1);                                        \
       buffer<T, 1> buffer2(&input, 1);                                         \
       deviceQueue.submit([&](handler &cgh) {                                   \
-        accessor<T, 1, access::mode::write, target::device> res_access(        \
-            buffer1, cgh);                                                     \
-        accessor<T, 1, access::mode::read, target::device> input_access(       \
+        accessor<T, 1, access_mode::write, target::device> res_access(buffer1, \
+                                                                      cgh);    \
+        accessor<T, 1, access_mode::read, target::device> input_access(        \
             buffer2, cgh);                                                     \
         cgh.single_task<TypeHelper<class a##NAME, T>>(                         \
             [=]() { res_access[0] = NAME(input_access[0]); });                 \
@@ -94,11 +94,11 @@ OPERATOR(trunc)
       buffer<T, 1> buffer2(&input1, 1);                                        \
       buffer<T, 1> buffer3(&input2, 1);                                        \
       deviceQueue.submit([&](handler &cgh) {                                   \
-        accessor<T, 1, access::mode::write, target::device> res_access(        \
-            buffer1, cgh);                                                     \
-        accessor<T, 1, access::mode::read, target::device> input1_access(      \
+        accessor<T, 1, access_mode::write, target::device> res_access(buffer1, \
+                                                                      cgh);    \
+        accessor<T, 1, access_mode::read, target::device> input1_access(       \
             buffer2, cgh);                                                     \
-        accessor<T, 1, access::mode::read, target::device> input2_access(      \
+        accessor<T, 1, access_mode::read, target::device> input2_access(       \
             buffer3, cgh);                                                     \
         cgh.single_task<TypeHelper<class a##NAME, T>>([=]() {                  \
           res_access[0] = NAME(input1_access[0], input2_access[0]);            \
@@ -135,13 +135,13 @@ OPERATOR_2(remainder)
       buffer<T, 1> buffer3(&input2, 1);                                        \
       buffer<T, 1> buffer4(&input3, 1);                                        \
       deviceQueue.submit([&](handler &cgh) {                                   \
-        accessor<T, 1, access::mode::write, target::device> res_access(        \
-            buffer1, cgh);                                                     \
-        accessor<T, 1, access::mode::read, target::device> input1_access(      \
+        accessor<T, 1, access_mode::write, target::device> res_access(buffer1, \
+                                                                      cgh);    \
+        accessor<T, 1, access_mode::read, target::device> input1_access(       \
             buffer2, cgh);                                                     \
-        accessor<T, 1, access::mode::read, target::device> input2_access(      \
+        accessor<T, 1, access_mode::read, target::device> input2_access(       \
             buffer3, cgh);                                                     \
-        accessor<T, 1, access::mode::read, target::device> input3_access(      \
+        accessor<T, 1, access_mode::read, target::device> input3_access(       \
             buffer4, cgh);                                                     \
         cgh.single_task<TypeHelper<class a##NAME, T>>([=]() {                  \
           res_access[0] =                                                      \
diff --git a/sycl/test-e2e/DeviceLib/math_windows_test.cpp b/sycl/test-e2e/DeviceLib/math_windows_test.cpp
index e03a9498aae7f..63b15de65b2dc 100644
--- a/sycl/test-e2e/DeviceLib/math_windows_test.cpp
+++ b/sycl/test-e2e/DeviceLib/math_windows_test.cpp
@@ -13,8 +13,8 @@
 #include <sycl/detail/core.hpp>
 
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 #define TEST_NUM 35
 
diff --git a/sycl/test-e2e/DeviceLib/rand_test.cpp b/sycl/test-e2e/DeviceLib/rand_test.cpp
index 6a29935dfcf36..150145d0dbec8 100644
--- a/sycl/test-e2e/DeviceLib/rand_test.cpp
+++ b/sycl/test-e2e/DeviceLib/rand_test.cpp
@@ -40,7 +40,7 @@ int main() {
     // Submit a command group to the queue
     Q.submit([&](sycl::handler &cgh) {
       // Get access to the buffers
-      auto accessC = bufferC.get_access<sycl::access::mode::write>(cgh);
+      auto accessC = bufferC.get_access<sycl::access_mode::write>(cgh);
 
       // Execute the kernel
       cgh.parallel_for<class vector_addition>(
diff --git a/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp b/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp
index c3fa5003e764d..1b206c6c09f1d 100644
--- a/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp
+++ b/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp
@@ -11,8 +11,8 @@
 
 using std::complex;
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 template <typename T> bool approx_equal_cmplx(complex<T> x, complex<T> y) {
   return approx_equal_fp(x.real(), y.real()) &&
diff --git a/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp b/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp
index 45950309fa90f..06714e5762da5 100644
--- a/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp
+++ b/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp
@@ -10,8 +10,8 @@
 
 using std::complex;
 namespace s = sycl;
-constexpr s::access::mode sycl_read = s::access::mode::read;
-constexpr s::access::mode sycl_write = s::access::mode::write;
+constexpr s::access_mode sycl_read = s::access_mode::read;
+constexpr s::access_mode sycl_write = s::access_mode::write;
 
 template <typename T> bool approx_equal_cmplx(complex<T> x, complex<T> y) {
   return approx_equal_fp(x.real(), y.real()) &&
diff --git a/sycl/test-e2e/DeviceLib/string_test.cpp b/sycl/test-e2e/DeviceLib/string_test.cpp
index 66dca441ddeed..35d39a87d7ad7 100644
--- a/sycl/test-e2e/DeviceLib/string_test.cpp
+++ b/sycl/test-e2e/DeviceLib/string_test.cpp
@@ -31,8 +31,8 @@ bool kernel_test_memcpy(sycl::queue &deviceQueue) {
     sycl::buffer<char, 1> buffer1(src, sycl::range<1>(20));
     sycl::buffer<char, 1> buffer2(dst, sycl::range<1>(20));
     deviceQueue.submit([&](sycl::handler &cgh) {
-      auto dst_acc = buffer2.get_access<sycl::access::mode::write>(cgh);
-      auto src_acc = buffer1.get_access<sycl::access::mode::read>(cgh);
+      auto dst_acc = buffer2.get_access<sycl::access_mode::write>(cgh);
+      auto src_acc = buffer1.get_access<sycl::access_mode::read>(cgh);
       cgh.single_task<class KernelTestMemcpy>([=]() {
         memcpy(dst_acc.get_multi_ptr<sycl::access::decorated::no>().get(),
                src_acc.get_multi_ptr<sycl::access::decorated::no>().get(), 20);
@@ -59,7 +59,7 @@ bool kernel_test_strcpy(sycl::queue &deviceQueue) {
   {
     sycl::buffer<CStr, 1> dst_buffer(dst, sycl::range<1>(5));
     deviceQueue.submit([&](sycl::handler &cgh) {
-      auto dst_acc = dst_buffer.get_access<sycl::access::mode::write>(cgh);
+      auto dst_acc = dst_buffer.get_access<sycl::access_mode::write>(cgh);
       cgh.single_task<class KernelTestStrcpy>([=]() {
         char str[20] = "abcdefg012345xyzvvv";
         strcpy(dst_acc[0], str);
@@ -101,7 +101,7 @@ bool kernel_test_strncpy(sycl::queue &deviceQueue) {
   {
     sycl::buffer<CStr, 1> dst_buffer(dst, sycl::range<1>(3));
     deviceQueue.submit([&](sycl::handler &cgh) {
-      auto dst_acc = dst_buffer.get_access<sycl::access::mode::write>(cgh);
+      auto dst_acc = dst_buffer.get_access<sycl::access_mode::write>(cgh);
       cgh.single_task<class KernelTestStrncpy>([=]() {
         char str[20] = "abcdefg012345xyzvvv";
         strncpy(dst_acc[0], str, 19);
@@ -148,7 +148,7 @@ bool kernel_test_strcmp(sycl::queue &deviceQueue) {
   {
     sycl::buffer<int, 1> res_buffer(res, sycl::range<1>(5));
     deviceQueue.submit([&](sycl::handler &cgh) {
-      auto res_acc = res_buffer.get_access<sycl::access::mode::write>(cgh);
+      auto res_acc = res_buffer.get_access<sycl::access_mode::write>(cgh);
       cgh.single_task<class KernelTestStrcmp>([=]() {
         char str1[20] = "abcdefg012";
         char str2[20] = "abcd";
@@ -175,7 +175,7 @@ bool kernel_test_strncmp(sycl::queue &deviceQueue) {
   {
     sycl::buffer<int, 1> res_buffer(res, sycl::range<1>(10));
     deviceQueue.submit([&](sycl::handler &cgh) {
-      auto res_acc = res_buffer.get_access<sycl::access::mode::write>(cgh);
+      auto res_acc = res_buffer.get_access<sycl::access_mode::write>(cgh);
       cgh.single_task<class KernelTestStrncmp>([=]() {
         char str1[20] = "abcdefg012";
         char str2[20] = "abcd";
@@ -216,8 +216,8 @@ bool kernel_test_strlen(sycl::queue &deviceQueue) {
     sycl::buffer<char, 1> buffer1(src, sycl::range<1>(20));
     sycl::buffer<size_t, 1> buffer2(len, sycl::range<1>(5));
     deviceQueue.submit([&](sycl::handler &cgh) {
-      auto len_acc = buffer2.get_access<sycl::access::mode::write>(cgh);
-      auto src_acc = buffer1.get_access<sycl::access::mode::read_write>(cgh);
+      auto len_acc = buffer2.get_access<sycl::access_mode::write>(cgh);
+      auto src_acc = buffer1.get_access<sycl::access_mode::read_write>(cgh);
       cgh.single_task<class KernelTestStrlen>([=]() {
         len_acc[0] =
             strlen(src_acc.get_multi_ptr<sycl::access::decorated::no>().get());
@@ -348,7 +348,7 @@ bool kernel_test_memset(sycl::queue &deviceQueue) {
   {
     sycl::buffer<unsigned char, 1> buffer1(dst, sycl::range<1>(20));
     deviceQueue.submit([&](sycl::handler &cgh) {
-      auto dst_acc = buffer1.get_access<sycl::access::mode::write>(cgh);
+      auto dst_acc = buffer1.get_access<sycl::access_mode::write>(cgh);
       cgh.single_task<class KernelTestMemset>([=]() {
         memset(dst_acc.get_multi_ptr<sycl::access::decorated::no>().get(), 'P',
                18);
@@ -459,15 +459,15 @@ bool kernel_test_memcmp(sycl::queue &deviceQueue) {
     sycl::buffer<char, 1> buffer_str7(str7, sycl::range<1>(sizeof(str7)));
     sycl::buffer<char, 1> buffer_str8(str8, sycl::range<1>(sizeof(str8)));
     deviceQueue.submit([&](sycl::handler &cgh) {
-      auto results_acc = buffer1.get_access<sycl::access::mode::write>(cgh);
-      auto str1_acc = buffer_str1.get_access<sycl::access::mode::read>(cgh);
-      auto str2_acc = buffer_str2.get_access<sycl::access::mode::read>(cgh);
-      auto str3_acc = buffer_str3.get_access<sycl::access::mode::read>(cgh);
-      auto str4_acc = buffer_str4.get_access<sycl::access::mode::read>(cgh);
-      auto str5_acc = buffer_str5.get_access<sycl::access::mode::read>(cgh);
-      auto str6_acc = buffer_str6.get_access<sycl::access::mode::read>(cgh);
-      auto str7_acc = buffer_str7.get_access<sycl::access::mode::read>(cgh);
-      auto str8_acc = buffer_str8.get_access<sycl::access::mode::read>(cgh);
+      auto results_acc = buffer1.get_access<sycl::access_mode::write>(cgh);
+      auto str1_acc = buffer_str1.get_access<sycl::access_mode::read>(cgh);
+      auto str2_acc = buffer_str2.get_access<sycl::access_mode::read>(cgh);
+      auto str3_acc = buffer_str3.get_access<sycl::access_mode::read>(cgh);
+      auto str4_acc = buffer_str4.get_access<sycl::access_mode::read>(cgh);
+      auto str5_acc = buffer_str5.get_access<sycl::access_mode::read>(cgh);
+      auto str6_acc = buffer_str6.get_access<sycl::access_mode::read>(cgh);
+      auto str7_acc = buffer_str7.get_access<sycl::access_mode::read>(cgh);
+      auto str8_acc = buffer_str8.get_access<sycl::access_mode::read>(cgh);
       cgh.single_task<class KernelTestMemcmp>([=]() {
         results_acc[0] = memcmp(
             str1_acc.get_multi_ptr<sycl::access::decorated::no>().get(),
@@ -521,7 +521,7 @@ bool kernel_test_memcmp_align(sycl::queue &deviceQueue) {
   {
     sycl::buffer<int, 1> cmp_buf(cmps, sycl::range<1>{16});
     deviceQueue.submit([&](sycl::handler &cgh) {
-      auto cmp_acc = cmp_buf.get_access<sycl::access::mode::write>(cgh);
+      auto cmp_acc = cmp_buf.get_access<sycl::access_mode::write>(cgh);
       cgh.single_task<class KernelTestMemcmpAlign>([=]() {
         uint8_t s1_buf[32], s2_buf[32];
         uint8_t *s1_ptr = &s1_buf[0];
@@ -592,19 +592,19 @@ bool kernel_test_memcpy_addr_space(sycl::queue &deviceQueue) {
     sycl::buffer<char, 1> buffer2(dst, sycl::range<1>(16));
     sycl::buffer<char, 1> buffer3(dst1, sycl::range<1>(16));
     deviceQueue.submit([&](sycl::handler &cgh) {
-      sycl::accessor<char, 1, sycl::access::mode::read,
+      sycl::accessor<char, 1, sycl::access_mode::read,
                      sycl::access::target::device,
                      sycl::access::placeholder::false_t>
           src_acc(buffer1, cgh);
 
       sycl::local_accessor<char, 1> local_acc(sycl::range<1>(16), cgh);
 
-      sycl::accessor<char, 1, sycl::access::mode::write,
+      sycl::accessor<char, 1, sycl::access_mode::write,
                      sycl::access::target::device,
                      sycl::access::placeholder::false_t>
           dst_acc(buffer2, cgh);
 
-      sycl::accessor<char, 1, sycl::access::mode::write,
+      sycl::accessor<char, 1, sycl::access_mode::write,
                      sycl::access::target::device,
                      sycl::access::placeholder::false_t>
           dst1_acc(buffer3, cgh);
diff --git a/sycl/test-e2e/DotProduct/dot_product_int_test.cpp b/sycl/test-e2e/DotProduct/dot_product_int_test.cpp
index 0a0542149d866..ecdeae9bfa854 100644
--- a/sycl/test-e2e/DotProduct/dot_product_int_test.cpp
+++ b/sycl/test-e2e/DotProduct/dot_product_int_test.cpp
@@ -66,10 +66,10 @@ static bool testss(queue &Q) {
   buffer<int, 1> Dbuf(D, range<1>(RangeLength));
 
   Q.submit([&](handler &cgh) {
-    auto Ap = Abuf.get_access<access::mode::read>(cgh);
-    auto Bp = Bbuf.get_access<access::mode::read>(cgh);
-    auto Cp = Cbuf.get_access<access::mode::read>(cgh);
-    auto Dp = Dbuf.get_access<access::mode::write>(cgh);
+    auto Ap = Abuf.get_access<access_mode::read>(cgh);
+    auto Bp = Bbuf.get_access<access_mode::read>(cgh);
+    auto Cp = Cbuf.get_access<access_mode::read>(cgh);
+    auto Dp = Dbuf.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class tss>(range<1>(RangeLength), [=](id<1> I) {
       Dp[I] = dot_acc(Ap[I], Bp[I], Cp[I]);
@@ -105,10 +105,10 @@ static bool testuu(queue &Q) {
   buffer<int, 1> Dbuf(D, range<1>(RangeLength));
 
   Q.submit([&](handler &cgh) {
-    auto Ap = Abuf.get_access<access::mode::read>(cgh);
-    auto Bp = Bbuf.get_access<access::mode::read>(cgh);
-    auto Cp = Cbuf.get_access<access::mode::read>(cgh);
-    auto Dp = Dbuf.get_access<access::mode::write>(cgh);
+    auto Ap = Abuf.get_access<access_mode::read>(cgh);
+    auto Bp = Bbuf.get_access<access_mode::read>(cgh);
+    auto Cp = Cbuf.get_access<access_mode::read>(cgh);
+    auto Dp = Dbuf.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class tuu>(range<1>(RangeLength), [=](id<1> I) {
       Dp[I] = dot_acc(Ap[I], Bp[I], Cp[I]);
@@ -144,10 +144,10 @@ static bool testsu(queue &Q) {
   buffer<int, 1> Dbuf(D, range<1>(RangeLength));
 
   Q.submit([&](handler &cgh) {
-    auto Ap = Abuf.get_access<access::mode::read>(cgh);
-    auto Bp = Bbuf.get_access<access::mode::read>(cgh);
-    auto Cp = Cbuf.get_access<access::mode::read>(cgh);
-    auto Dp = Dbuf.get_access<access::mode::write>(cgh);
+    auto Ap = Abuf.get_access<access_mode::read>(cgh);
+    auto Bp = Bbuf.get_access<access_mode::read>(cgh);
+    auto Cp = Cbuf.get_access<access_mode::read>(cgh);
+    auto Dp = Dbuf.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class tsu>(range<1>(RangeLength), [=](id<1> I) {
       Dp[I] = dot_acc(Ap[I], Bp[I], Cp[I]);
@@ -183,10 +183,10 @@ static bool testus(queue &Q) {
   buffer<int, 1> Dbuf(D, range<1>(RangeLength));
 
   Q.submit([&](handler &cgh) {
-    auto Ap = Abuf.get_access<access::mode::read>(cgh);
-    auto Bp = Bbuf.get_access<access::mode::read>(cgh);
-    auto Cp = Cbuf.get_access<access::mode::read>(cgh);
-    auto Dp = Dbuf.get_access<access::mode::write>(cgh);
+    auto Ap = Abuf.get_access<access_mode::read>(cgh);
+    auto Bp = Bbuf.get_access<access_mode::read>(cgh);
+    auto Cp = Cbuf.get_access<access_mode::read>(cgh);
+    auto Dp = Dbuf.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class tus>(range<1>(RangeLength), [=](id<1> I) {
       Dp[I] = dot_acc(Ap[I], Bp[I], Cp[I]);
diff --git a/sycl/test-e2e/DotProduct/dot_product_vec_test.cpp b/sycl/test-e2e/DotProduct/dot_product_vec_test.cpp
index 28ac47cc66993..0ecf18f1f4487 100644
--- a/sycl/test-e2e/DotProduct/dot_product_vec_test.cpp
+++ b/sycl/test-e2e/DotProduct/dot_product_vec_test.cpp
@@ -66,10 +66,10 @@ static bool testss(queue &Q) {
   buffer<int32_t, 1> Dbuf(D, range<1>(RangeLength));
 
   Q.submit([&](handler &cgh) {
-    auto Ap = Abuf.get_access<access::mode::read>(cgh);
-    auto Bp = Bbuf.get_access<access::mode::read>(cgh);
-    auto Cp = Cbuf.get_access<access::mode::read>(cgh);
-    auto Dp = Dbuf.get_access<access::mode::write>(cgh);
+    auto Ap = Abuf.get_access<access_mode::read>(cgh);
+    auto Bp = Bbuf.get_access<access_mode::read>(cgh);
+    auto Cp = Cbuf.get_access<access_mode::read>(cgh);
+    auto Dp = Dbuf.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class tss>(range<1>(RangeLength), [=](id<1> I) {
       Dp[I] = dot_acc(Ap[I], Bp[I], Cp[I]);
@@ -105,10 +105,10 @@ static bool testuu(queue &Q) {
   buffer<int32_t, 1> Dbuf(D, range<1>(RangeLength));
 
   Q.submit([&](handler &cgh) {
-    auto Ap = Abuf.get_access<access::mode::read>(cgh);
-    auto Bp = Bbuf.get_access<access::mode::read>(cgh);
-    auto Cp = Cbuf.get_access<access::mode::read>(cgh);
-    auto Dp = Dbuf.get_access<access::mode::write>(cgh);
+    auto Ap = Abuf.get_access<access_mode::read>(cgh);
+    auto Bp = Bbuf.get_access<access_mode::read>(cgh);
+    auto Cp = Cbuf.get_access<access_mode::read>(cgh);
+    auto Dp = Dbuf.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class tuu>(range<1>(RangeLength), [=](id<1> I) {
       Dp[I] = dot_acc(Ap[I], Bp[I], Cp[I]);
@@ -144,10 +144,10 @@ static bool testsu(queue &Q) {
   buffer<int32_t, 1> Dbuf(D, range<1>(RangeLength));
 
   Q.submit([&](handler &cgh) {
-    auto Ap = Abuf.get_access<access::mode::read>(cgh);
-    auto Bp = Bbuf.get_access<access::mode::read>(cgh);
-    auto Cp = Cbuf.get_access<access::mode::read>(cgh);
-    auto Dp = Dbuf.get_access<access::mode::write>(cgh);
+    auto Ap = Abuf.get_access<access_mode::read>(cgh);
+    auto Bp = Bbuf.get_access<access_mode::read>(cgh);
+    auto Cp = Cbuf.get_access<access_mode::read>(cgh);
+    auto Dp = Dbuf.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class tsu>(range<1>(RangeLength), [=](id<1> I) {
       Dp[I] = dot_acc(Ap[I], Bp[I], Cp[I]);
@@ -183,10 +183,10 @@ static bool testus(queue &Q) {
   buffer<int32_t, 1> Dbuf(D, range<1>(RangeLength));
 
   Q.submit([&](handler &cgh) {
-    auto Ap = Abuf.get_access<access::mode::read>(cgh);
-    auto Bp = Bbuf.get_access<access::mode::read>(cgh);
-    auto Cp = Cbuf.get_access<access::mode::read>(cgh);
-    auto Dp = Dbuf.get_access<access::mode::write>(cgh);
+    auto Ap = Abuf.get_access<access_mode::read>(cgh);
+    auto Bp = Bbuf.get_access<access_mode::read>(cgh);
+    auto Cp = Cbuf.get_access<access_mode::read>(cgh);
+    auto Dp = Dbuf.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class tus>(range<1>(RangeLength), [=](id<1> I) {
       Dp[I] = dot_acc(Ap[I], Bp[I], Cp[I]);
diff --git a/sycl/test-e2e/Experimental/launch_queries/max_num_work_groups.cpp b/sycl/test-e2e/Experimental/launch_queries/max_num_work_groups.cpp
index 133176ef36430..bd6d638dc3ad5 100644
--- a/sycl/test-e2e/Experimental/launch_queries/max_num_work_groups.cpp
+++ b/sycl/test-e2e/Experimental/launch_queries/max_num_work_groups.cpp
@@ -20,7 +20,7 @@ namespace kernels {
 
 template <class T, size_t Dim>
 using sycl_global_accessor =
-    sycl::accessor<T, Dim, sycl::access::mode::read_write,
+    sycl::accessor<T, Dim, sycl::access_mode::read_write,
                    sycl::access::target::global_buffer>;
 
 class TestKernel {
@@ -110,7 +110,7 @@ int test_max_num_work_groups(sycl::queue &q, const sycl::device &dev) {
   auto launch_range = sycl::nd_range<1>{sycl::range<1>{NumWorkItems},
                                         sycl::range<1>{workGroupSize}};
   q.submit([&](sycl::handler &cgh) {
-     auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+     auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
      if constexpr (KernelName::HasLocalMemory) {
        sycl::local_accessor<value_type, 1> loc_acc{
            sycl::range<1>{workGroupSize}, cgh};
@@ -142,7 +142,7 @@ int test_max_num_work_groups(sycl::queue &q, const sycl::device &dev) {
                                    sycl::range<1>{workGroupSize}};
 
   q.submit([&](sycl::handler &cgh) {
-     auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+     auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
      if constexpr (KernelName::HasLocalMemory) {
        sycl::local_accessor<value_type, 1> loc_acc{sycl::range<1>{localSize},
                                                    cgh};
@@ -179,7 +179,7 @@ int test_max_num_work_groups(sycl::queue &q, const sycl::device &dev) {
                                      sycl::range<1>{workGroupSize}};
 
     q.submit([&](sycl::handler &cgh) {
-       auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+       auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
        if constexpr (KernelName::HasLocalMemory) {
          sycl::local_accessor<value_type, 1> loc_acc{sycl::range<1>{localSize},
                                                      cgh};
diff --git a/sycl/test-e2e/Experimental/launch_queries/max_sub_group_size.cpp b/sycl/test-e2e/Experimental/launch_queries/max_sub_group_size.cpp
index 406ba3b3afbd3..f826c0de45ca0 100644
--- a/sycl/test-e2e/Experimental/launch_queries/max_sub_group_size.cpp
+++ b/sycl/test-e2e/Experimental/launch_queries/max_sub_group_size.cpp
@@ -25,7 +25,7 @@ namespace kernels {
 
 template <class T, size_t Dim>
 using sycl_global_accessor =
-    sycl::accessor<T, Dim, sycl::access::mode::read_write,
+    sycl::accessor<T, Dim, sycl::access_mode::read_write,
                    sycl::access::target::global_buffer>;
 
 class TestKernel {
@@ -54,7 +54,7 @@ int main() {
   sycl::buffer<value_type, 1> buf{sycl::range<1>{1}};
   auto launchRange = sycl::nd_range<1>{sycl::range<1>{1}, sycl::range<1>{1}};
   q.submit([&](sycl::handler &cgh) {
-     auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+     auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
      cgh.parallel_for<class kernels::TestKernel>(launchRange,
                                                  kernels::TestKernel{acc});
    }).wait();
diff --git a/sycl/test-e2e/Experimental/launch_queries/max_sub_groups.cpp b/sycl/test-e2e/Experimental/launch_queries/max_sub_groups.cpp
index 9b0e71864dfca..3985e786db09c 100644
--- a/sycl/test-e2e/Experimental/launch_queries/max_sub_groups.cpp
+++ b/sycl/test-e2e/Experimental/launch_queries/max_sub_groups.cpp
@@ -21,7 +21,7 @@ namespace kernels {
 
 template <class T, size_t Dim>
 using sycl_global_accessor =
-    sycl::accessor<T, Dim, sycl::access::mode::read_write,
+    sycl::accessor<T, Dim, sycl::access_mode::read_write,
                    sycl::access::target::global_buffer>;
 
 class TestKernel {
@@ -50,7 +50,7 @@ int main() {
   sycl::buffer<value_type, 1> buf{sycl::range<1>{1}};
   auto launchRange = sycl::nd_range<1>{sycl::range<1>{1}, sycl::range<1>{1}};
   q.submit([&](sycl::handler &cgh) {
-     auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+     auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
      cgh.parallel_for<class kernels::TestKernel>(launchRange,
                                                  kernels::TestKernel{acc});
    }).wait();
diff --git a/sycl/test-e2e/Experimental/launch_queries/max_work_group_size.cpp b/sycl/test-e2e/Experimental/launch_queries/max_work_group_size.cpp
index 0de747e8a18f3..eddaaba1251e2 100644
--- a/sycl/test-e2e/Experimental/launch_queries/max_work_group_size.cpp
+++ b/sycl/test-e2e/Experimental/launch_queries/max_work_group_size.cpp
@@ -15,7 +15,7 @@ namespace kernels {
 
 template <class T, size_t Dim>
 using sycl_global_accessor =
-    sycl::accessor<T, Dim, sycl::access::mode::read_write,
+    sycl::accessor<T, Dim, sycl::access_mode::read_write,
                    sycl::access::target::global_buffer>;
 class TestKernel {
 public:
@@ -54,7 +54,7 @@ int main() {
   auto launch_range =
       sycl::nd_range<1>{sycl::range<1>{numWorkItems}, sycl::range<1>{1}};
   q.submit([&](sycl::handler &cgh) {
-     auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+     auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
      cgh.parallel_for<class kernels::TestKernel>(launch_range,
                                                  kernels::TestKernel{acc});
    }).wait();
diff --git a/sycl/test-e2e/Experimental/launch_queries/max_work_item_sizes.cpp b/sycl/test-e2e/Experimental/launch_queries/max_work_item_sizes.cpp
index 75278f40f6aa3..7872ec35eff11 100644
--- a/sycl/test-e2e/Experimental/launch_queries/max_work_item_sizes.cpp
+++ b/sycl/test-e2e/Experimental/launch_queries/max_work_item_sizes.cpp
@@ -17,7 +17,7 @@ namespace kernels {
 
 template <class T, size_t Dim>
 using sycl_global_accessor =
-    sycl::accessor<T, Dim, sycl::access::mode::read_write,
+    sycl::accessor<T, Dim, sycl::access_mode::read_write,
                    sycl::access::target::global_buffer>;
 
 class TestKernel {
@@ -74,7 +74,7 @@ int main() {
   auto LaunchRange = sycl::nd_range<1>{sycl::range<1>{MaxWorkGroupSizeActual},
                                        sycl::range<1>{MaxWorkGroupSizeActual}};
   Q.submit([&](sycl::handler &cgh) {
-     auto Acc = Buf.get_access<sycl::access::mode::read_write>(cgh);
+     auto Acc = Buf.get_access<sycl::access_mode::read_write>(cgh);
      cgh.parallel_for<class kernels::TestKernel>(LaunchRange,
                                                  kernels::TestKernel{Acc});
    }).wait();
diff --git a/sycl/test-e2e/Experimental/reusable_events/cross_queue_dependency.cpp b/sycl/test-e2e/Experimental/reusable_events/cross_queue_dependency.cpp
index 9533249683cbf..b97384106481f 100644
--- a/sycl/test-e2e/Experimental/reusable_events/cross_queue_dependency.cpp
+++ b/sycl/test-e2e/Experimental/reusable_events/cross_queue_dependency.cpp
@@ -32,7 +32,7 @@ int main() {
 
   // Launch kernel on q1
   q1.submit([&](sycl::handler &cgh) {
-    auto acc1 = buf1.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc1 = buf1.get_access<sycl::access_mode::read_write>(cgh);
     cgh.parallel_for<class KernelQ1>(
         sycl::range<1>(N), [=](sycl::id<1> idx) { acc1[idx] = acc1[idx] * 2; });
   });
@@ -45,9 +45,9 @@ int main() {
 
   // Launch kernel on q2
   q2.submit([&](sycl::handler &cgh) {
-    auto acc1 = buf1.get_access<sycl::access::mode::read>(cgh);
-    auto acc2 = buf2.get_access<sycl::access::mode::read>(cgh);
-    auto acc_result = buf_result.get_access<sycl::access::mode::write>(cgh);
+    auto acc1 = buf1.get_access<sycl::access_mode::read>(cgh);
+    auto acc2 = buf2.get_access<sycl::access_mode::read>(cgh);
+    auto acc_result = buf_result.get_access<sycl::access_mode::write>(cgh);
     cgh.parallel_for<class KernelQ2>(sycl::range<1>(N), [=](sycl::id<1> idx) {
       acc_result[idx] = acc1[idx] + acc2[idx];
     });
diff --git a/sycl/test-e2e/Experimental/reusable_events/event_as_dependency.cpp b/sycl/test-e2e/Experimental/reusable_events/event_as_dependency.cpp
index 4eb97915e4a46..c7131f54dca7d 100644
--- a/sycl/test-e2e/Experimental/reusable_events/event_as_dependency.cpp
+++ b/sycl/test-e2e/Experimental/reusable_events/event_as_dependency.cpp
@@ -23,7 +23,7 @@ int main() {
 
   // First kernel
   q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::write>(cgh);
     cgh.parallel_for<class DepKernel1>(sycl::range<1>(N),
                                        [=](sycl::id<1> idx) { acc[idx] = 10; });
   });
@@ -32,7 +32,7 @@ int main() {
   // Second kernel depends on event
   q.submit([&](sycl::handler &cgh) {
     cgh.depends_on(event);
-    auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
     cgh.parallel_for<class DepKernel2>(
         sycl::range<1>(N), [=](sycl::id<1> idx) { acc[idx] = acc[idx] + 7; });
   });
diff --git a/sycl/test-e2e/Experimental/reusable_events/event_reassociation_dependency.cpp b/sycl/test-e2e/Experimental/reusable_events/event_reassociation_dependency.cpp
index 7dc45633512c0..4920fa261e772 100644
--- a/sycl/test-e2e/Experimental/reusable_events/event_reassociation_dependency.cpp
+++ b/sycl/test-e2e/Experimental/reusable_events/event_reassociation_dependency.cpp
@@ -25,7 +25,7 @@ int main() {
 
   // First operation
   q.submit([&](sycl::handler &cgh) {
-    auto acc = buf1.get_access<sycl::access::mode::write>(cgh);
+    auto acc = buf1.get_access<sycl::access_mode::write>(cgh);
     cgh.parallel_for<class ReassocOp1>(sycl::range<1>(N),
                                        [=](sycl::id<1> idx) { acc[idx] = 10; });
   });
@@ -34,7 +34,7 @@ int main() {
   // Second operation depends on event
   auto evt2 = q.submit([&](sycl::handler &cgh) {
     cgh.depends_on(event);
-    auto acc = buf2.get_access<sycl::access::mode::write>(cgh);
+    auto acc = buf2.get_access<sycl::access_mode::write>(cgh);
     cgh.parallel_for<class ReassocOp2>(sycl::range<1>(N),
                                        [=](sycl::id<1> idx) { acc[idx] = 20; });
   });
diff --git a/sycl/test-e2e/Experimental/reusable_events/event_reuse.cpp b/sycl/test-e2e/Experimental/reusable_events/event_reuse.cpp
index f1cf3440223f4..b9030a28d3812 100644
--- a/sycl/test-e2e/Experimental/reusable_events/event_reuse.cpp
+++ b/sycl/test-e2e/Experimental/reusable_events/event_reuse.cpp
@@ -23,7 +23,7 @@ int main() {
 
   // First operation
   q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::write>(cgh);
     cgh.parallel_for<class Kernel1>(sycl::range<1>(N),
                                     [=](sycl::id<1> idx) { acc[idx] = 1; });
   });
@@ -32,7 +32,7 @@ int main() {
 
   // Reuse event for second operation
   q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
     cgh.parallel_for<class Kernel2>(
         sycl::range<1>(N), [=](sycl::id<1> idx) { acc[idx] = acc[idx] + 10; });
   });
@@ -41,7 +41,7 @@ int main() {
 
   // Reuse event for third operation
   q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
     cgh.parallel_for<class Kernel3>(
         sycl::range<1>(N), [=](sycl::id<1> idx) { acc[idx] = acc[idx] * 2; });
   });
diff --git a/sycl/test-e2e/Experimental/reusable_events/in_order_queue_signal.cpp b/sycl/test-e2e/Experimental/reusable_events/in_order_queue_signal.cpp
index 31a10fdafda5d..8c84aeb905245 100644
--- a/sycl/test-e2e/Experimental/reusable_events/in_order_queue_signal.cpp
+++ b/sycl/test-e2e/Experimental/reusable_events/in_order_queue_signal.cpp
@@ -23,13 +23,13 @@ int main() {
 
   // Submit multiple operations
   q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::write>(cgh);
     cgh.parallel_for<class InOrderOp1>(sycl::range<1>(N),
                                        [=](sycl::id<1> idx) { acc[idx] = 1; });
   });
 
   q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
     cgh.parallel_for<class InOrderOp2>(
         sycl::range<1>(N), [=](sycl::id<1> idx) { acc[idx] = acc[idx] + 2; });
   });
diff --git a/sycl/test-e2e/Experimental/reusable_events/kernel_timing.cpp b/sycl/test-e2e/Experimental/reusable_events/kernel_timing.cpp
index fccae8afa3ab7..5a7f9e41f0c8c 100644
--- a/sycl/test-e2e/Experimental/reusable_events/kernel_timing.cpp
+++ b/sycl/test-e2e/Experimental/reusable_events/kernel_timing.cpp
@@ -32,7 +32,7 @@ int main() {
   syclex::enqueue_signal_event(q, start_event);
 
   q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
     cgh.parallel_for<class TimingKernel1>(sycl::range<1>(N),
                                           [=](sycl::id<1> idx) {
                                             for (int i = 0; i < 100; ++i) {
@@ -42,7 +42,7 @@ int main() {
   });
 
   q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
     cgh.parallel_for<class TimingKernel2>(sycl::range<1>(N),
                                           [=](sycl::id<1> idx) {
                                             for (int i = 0; i < 100; ++i) {
diff --git a/sycl/test-e2e/Experimental/reusable_events/out_of_order_queue_signal.cpp b/sycl/test-e2e/Experimental/reusable_events/out_of_order_queue_signal.cpp
index c9fe4341d8f4b..971c674f3801e 100644
--- a/sycl/test-e2e/Experimental/reusable_events/out_of_order_queue_signal.cpp
+++ b/sycl/test-e2e/Experimental/reusable_events/out_of_order_queue_signal.cpp
@@ -21,7 +21,7 @@ int main() {
   sycl::buffer<int> buf(data.data(), sycl::range<1>(N));
 
   q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::write>(cgh);
     cgh.parallel_for<class OutOfOrderOp1>(
         sycl::range<1>(N), [=](sycl::id<1> idx) { acc[idx] = 5; });
   });
diff --git a/sycl/test-e2e/Experimental/reusable_events/queue_returned_events.cpp b/sycl/test-e2e/Experimental/reusable_events/queue_returned_events.cpp
index e3e6216bf4240..4d4ea7097e9f4 100644
--- a/sycl/test-e2e/Experimental/reusable_events/queue_returned_events.cpp
+++ b/sycl/test-e2e/Experimental/reusable_events/queue_returned_events.cpp
@@ -19,7 +19,7 @@ int main() {
   sycl::buffer<int> buf(data.data(), sycl::range<1>(N));
 
   auto event = q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::write>(cgh);
     cgh.parallel_for<class QueueEvent>(sycl::range<1>(N),
                                        [=](sycl::id<1> idx) { acc[idx] = 42; });
   });
diff --git a/sycl/test-e2e/Experimental/reusable_events/wait_multiple_events.cpp b/sycl/test-e2e/Experimental/reusable_events/wait_multiple_events.cpp
index f5ee50c6c0572..7e76ee5c78681 100644
--- a/sycl/test-e2e/Experimental/reusable_events/wait_multiple_events.cpp
+++ b/sycl/test-e2e/Experimental/reusable_events/wait_multiple_events.cpp
@@ -34,7 +34,7 @@ int main() {
 
   // Launch on q1
   q1.submit([&](sycl::handler &cgh) {
-    auto acc = buf1.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc = buf1.get_access<sycl::access_mode::read_write>(cgh);
     cgh.parallel_for<class MultiQ1>(
         sycl::range<1>(N), [=](sycl::id<1> idx) { acc[idx] = acc[idx] * 3; });
   });
@@ -42,7 +42,7 @@ int main() {
 
   // Launch on q2
   q2.submit([&](sycl::handler &cgh) {
-    auto acc = buf2.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc = buf2.get_access<sycl::access_mode::read_write>(cgh);
     cgh.parallel_for<class MultiQ2>(
         sycl::range<1>(N), [=](sycl::id<1> idx) { acc[idx] = acc[idx] * 5; });
   });
@@ -54,9 +54,9 @@ int main() {
 
   // Combine results on q3
   q3.submit([&](sycl::handler &cgh) {
-    auto acc1 = buf1.get_access<sycl::access::mode::read>(cgh);
-    auto acc2 = buf2.get_access<sycl::access::mode::read>(cgh);
-    auto acc_result = buf_result.get_access<sycl::access::mode::write>(cgh);
+    auto acc1 = buf1.get_access<sycl::access_mode::read>(cgh);
+    auto acc2 = buf2.get_access<sycl::access_mode::read>(cgh);
+    auto acc_result = buf_result.get_access<sycl::access_mode::write>(cgh);
     cgh.parallel_for<class MultiQ3>(sycl::range<1>(N), [=](sycl::id<1> idx) {
       acc_result[idx] = acc1[idx] + acc2[idx];
     });
diff --git a/sycl/test-e2e/FreeFunctionKernels/accessor_as_kernel_parameter.cpp b/sycl/test-e2e/FreeFunctionKernels/accessor_as_kernel_parameter.cpp
index cd4bcfa532451..ebd6ba2fdd96b 100644
--- a/sycl/test-e2e/FreeFunctionKernels/accessor_as_kernel_parameter.cpp
+++ b/sycl/test-e2e/FreeFunctionKernels/accessor_as_kernel_parameter.cpp
@@ -18,7 +18,7 @@ namespace ns {
 template <int Dims>
 SYCL_EXT_ONEAPI_FUNCTION_PROPERTY((syclexp::nd_range_kernel<Dims>))
 void nsNdRangeFreeFunc(
-    sycl::accessor<int, Dims, sycl::access::mode::read_write> Accessor,
+    sycl::accessor<int, Dims, sycl::access_mode::read_write> Accessor,
     int Value) {
   auto Item = syclext::this_work_item::get_nd_item<Dims>().get_global_id();
   Accessor[Item] = Value;
@@ -28,11 +28,11 @@ void nsNdRangeFreeFunc(
 template <int Dims>
 SYCL_EXT_ONEAPI_FUNCTION_PROPERTY((syclexp::nd_range_kernel<Dims>))
 void ndRangeFreeFuncMultipleParameters(
-    sycl::accessor<int, Dims, sycl::access::mode::read,
+    sycl::accessor<int, Dims, sycl::access_mode::read,
                    sycl::access::target::device>
         InputAAcc,
     sycl::accessor<int, Dims> InputBAcc,
-    sycl::accessor<int, Dims, sycl::access::mode::write> ResultAcc) {
+    sycl::accessor<int, Dims, sycl::access_mode::write> ResultAcc) {
   auto Item = syclext::this_work_item::get_nd_item<Dims>().get_global_id();
   ResultAcc[Item] = InputAAcc[Item] + InputBAcc[Item];
 }
@@ -97,13 +97,13 @@ int runNdRangeTestMultipleParameters(sycl::queue &Queue, sycl::context &Context,
     sycl::buffer<int, Dims> ResultBuffer(ResultData.data(),
                                          NdRange.get_global_range());
     Queue.submit([&](sycl::handler &Handler) {
-      sycl::accessor<int, Dims, sycl::access::mode::read,
+      sycl::accessor<int, Dims, sycl::access_mode::read,
                      sycl::access::target::device>
           InputAAcc{InputABuffer, Handler};
-      sycl::accessor<int, Dims, sycl::access::mode::read,
+      sycl::accessor<int, Dims, sycl::access_mode::read,
                      sycl::access::target::device>
           InputBAcc{InputBBuffer, Handler};
-      sycl::accessor<int, Dims, sycl::access::mode::write> ResultAcc{
+      sycl::accessor<int, Dims, sycl::access_mode::write> ResultAcc{
           ResultBuffer, Handler};
       Handler.set_args(InputAAcc, InputBAcc, ResultAcc);
       Handler.parallel_for(NdRange, UsedKernel);
diff --git a/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp b/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
index 76d7c62ae54a2..718740a4f2e53 100644
--- a/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
+++ b/sycl/test-e2e/FreeFunctionKernels/enum_parameter.cpp
@@ -9,20 +9,20 @@
 #include <sycl/ext/oneapi/free_function_queries.hpp>
 
 using namespace sycl;
-using rAccType = sycl::accessor<int, 1, sycl::access::mode::read>;
-using wAccType = sycl::accessor<int, 1, sycl::access::mode::write>;
-using rwAccType = sycl::accessor<int, 1, sycl::access::mode::read_write>;
+using rAccType = sycl::accessor<int, 1, sycl::access_mode::read>;
+using wAccType = sycl::accessor<int, 1, sycl::access_mode::write>;
+using rwAccType = sycl::accessor<int, 1, sycl::access_mode::read_write>;
 
 using flagType = sycl::accessor<bool, 1>;
 
-template <typename T, int Dims, access::mode modeT>
-bool hasAccessorMode(sycl::accessor<T, Dims, modeT> acc, access::mode mode) {
+template <typename T, int Dims, access_mode modeT>
+bool hasAccessorMode(sycl::accessor<T, Dims, modeT> acc, access_mode mode) {
   return modeT == mode;
 }
 
 template <typename AccType>
 SYCL_EXT_ONEAPI_FUNCTION_PROPERTY((syclexp::single_task_kernel))
-void verifyAccessorMode(AccType acc, access::mode accMode, flagType flagAcc) {
+void verifyAccessorMode(AccType acc, access_mode accMode, flagType flagAcc) {
   flagAcc[0] = hasAccessorMode(acc, accMode);
 }
 
@@ -33,9 +33,9 @@ int main() {
   sycl::kernel Kernel2 = getKernel<verifyAccessorMode<wAccType>>(Context);
   sycl::kernel Kernel3 = getKernel<verifyAccessorMode<rwAccType>>(Context);
 
-  const auto rMode = sycl::access::mode::read;
-  const auto wMode = sycl::access::mode::write;
-  const auto rwMode = sycl::access::mode::read_write;
+  const auto rMode = sycl::access_mode::read;
+  const auto wMode = sycl::access_mode::write;
+  const auto rwMode = sycl::access_mode::read_write;
 
   bool flag1, flag2, flag3;
   flag1 = (flag2 = (flag3 = false));
diff --git a/sycl/test-e2e/FreeFunctionKernels/template_specialization.cpp b/sycl/test-e2e/FreeFunctionKernels/template_specialization.cpp
index 3d0a0b9b6be7d..d7129e6707e54 100644
--- a/sycl/test-e2e/FreeFunctionKernels/template_specialization.cpp
+++ b/sycl/test-e2e/FreeFunctionKernels/template_specialization.cpp
@@ -140,7 +140,7 @@ void test_accessor() {
   kernel Kernel = bundle.get_kernel(id);
   sycl::buffer<int, 1> buf(data, sycl::range<1>(N));
   Q.submit([&](handler &h) {
-    auto acc = buf.get_access<sycl::access::mode::write>(h);
+    auto acc = buf.get_access<sycl::access_mode::write>(h);
     h.set_args(acc);
     h.parallel_for(nd_range{{1}, {1}}, Kernel);
   });
diff --git a/sycl/test-e2e/Functor/functor_inheritance.cpp b/sycl/test-e2e/Functor/functor_inheritance.cpp
index bcb8f2d9394cc..4b83b288917e1 100644
--- a/sycl/test-e2e/Functor/functor_inheritance.cpp
+++ b/sycl/test-e2e/Functor/functor_inheritance.cpp
@@ -4,7 +4,7 @@
 #include <cassert>
 #include <sycl/detail/core.hpp>
 
-constexpr auto sycl_read_write = sycl::access::mode::read_write;
+constexpr auto sycl_read_write = sycl::access_mode::read_write;
 constexpr auto sycl_device = sycl::access::target::device;
 
 struct SecondBase {
diff --git a/sycl/test-e2e/Functor/kernel_functor.cpp b/sycl/test-e2e/Functor/kernel_functor.cpp
index a4b8a7579f4cb..dc271b8ed6b1a 100644
--- a/sycl/test-e2e/Functor/kernel_functor.cpp
+++ b/sycl/test-e2e/Functor/kernel_functor.cpp
@@ -14,7 +14,7 @@
 
 #include <cassert>
 
-constexpr auto sycl_read_write = sycl::access::mode::read_write;
+constexpr auto sycl_read_write = sycl::access_mode::read_write;
 constexpr auto sycl_device = sycl::access::target::device;
 
 // Case 1:
diff --git a/sycl/test-e2e/GroupAlgorithm/back_to_back_collectives.cpp b/sycl/test-e2e/GroupAlgorithm/back_to_back_collectives.cpp
index 5678ae9412de5..d4f574a653ec2 100644
--- a/sycl/test-e2e/GroupAlgorithm/back_to_back_collectives.cpp
+++ b/sycl/test-e2e/GroupAlgorithm/back_to_back_collectives.cpp
@@ -35,10 +35,10 @@ int main() {
     buffer<int> EScanBuf(EScan.data(), N);
     buffer<int> IScanBuf(IScan.data(), N);
     q.submit([&](handler &h) {
-      auto Input = InputBuf.get_access<access::mode::read>(h);
-      auto Sum = SumBuf.get_access<access::mode::write>(h);
-      auto EScan = EScanBuf.get_access<access::mode::write>(h);
-      auto IScan = IScanBuf.get_access<access::mode::write>(h);
+      auto Input = InputBuf.get_access<access_mode::read>(h);
+      auto Sum = SumBuf.get_access<access_mode::write>(h);
+      auto EScan = EScanBuf.get_access<access_mode::write>(h);
+      auto IScan = IScanBuf.get_access<access_mode::write>(h);
       h.parallel_for<back_to_back>(nd_range<1>(N, N), [=](nd_item<1> it) {
         size_t i = it.get_global_id(0);
         auto g = it.get_group();
diff --git a/sycl/test-e2e/GroupAlgorithm/barrier.cpp b/sycl/test-e2e/GroupAlgorithm/barrier.cpp
index d6c85823fe430..0d521de41d7b6 100644
--- a/sycl/test-e2e/GroupAlgorithm/barrier.cpp
+++ b/sycl/test-e2e/GroupAlgorithm/barrier.cpp
@@ -23,7 +23,7 @@ void basic() {
     buffer<int> buf(data.data(), N);
 
     q.submit([&](handler &cgh) {
-      auto acc = buf.get_access<access::mode::read_write>(cgh);
+      auto acc = buf.get_access<access_mode::read_write>(cgh);
       local_accessor<int, 1> loc(N, cgh);
       local_accessor<barrier, 1> loc_barrier(2, cgh);
       cgh.parallel_for(nd_range<1>(N, N), [=](nd_item<1> item) {
@@ -66,9 +66,9 @@ void interface() {
     buffer<int> test2_buf(test2.data(), N);
 
     q.submit([&](handler &cgh) {
-      auto data_acc = data_buf.get_access<access::mode::read_write>(cgh);
-      auto test1_acc = test1_buf.get_access<access::mode::read_write>(cgh);
-      auto test2_acc = test2_buf.get_access<access::mode::read_write>(cgh);
+      auto data_acc = data_buf.get_access<access_mode::read_write>(cgh);
+      auto test1_acc = test1_buf.get_access<access_mode::read_write>(cgh);
+      auto test2_acc = test2_buf.get_access<access_mode::read_write>(cgh);
       local_accessor<int, 1> loc(N, cgh);
       local_accessor<barrier, 1> loc_barrier(2, cgh);
       cgh.parallel_for(nd_range<1>(N, N), [=](nd_item<1> item) {
diff --git a/sycl/test-e2e/GroupAlgorithm/leader.cpp b/sycl/test-e2e/GroupAlgorithm/leader.cpp
index 7b23f27c1c7ea..e4ad383b48d35 100644
--- a/sycl/test-e2e/GroupAlgorithm/leader.cpp
+++ b/sycl/test-e2e/GroupAlgorithm/leader.cpp
@@ -17,7 +17,7 @@ void test(queue q) {
     buffer<int> out_buf(&out, 1);
 
     q.submit([&](handler &cgh) {
-      auto out = out_buf.template get_access<access::mode::read_write>(cgh);
+      auto out = out_buf.template get_access<access_mode::read_write>(cgh);
       cgh.parallel_for(nd_range<2>(R, R), [=](nd_item<2> it) {
         group<2> g = it.get_group();
         if (g.leader()) {
diff --git a/sycl/test-e2e/GroupInterface/leader_of.cpp b/sycl/test-e2e/GroupInterface/leader_of.cpp
index 7931eae21b775..76d1ac5cbd361 100644
--- a/sycl/test-e2e/GroupInterface/leader_of.cpp
+++ b/sycl/test-e2e/GroupInterface/leader_of.cpp
@@ -17,7 +17,7 @@ void test(queue q) {
     buffer<int> out_buf(&out, 1);
 
     q.submit([&](handler &cgh) {
-      auto out = out_buf.template get_access<access::mode::read_write>(cgh);
+      auto out = out_buf.template get_access<access_mode::read_write>(cgh);
       cgh.parallel_for(nd_range<2>(R, R), [=](nd_item<2> it) {
         khr::work_group<2> g = it.get_group();
         if (khr::leader_of(g)) {
diff --git a/sycl/test-e2e/GroupLocalMemory/group_local_memory.cpp b/sycl/test-e2e/GroupLocalMemory/group_local_memory.cpp
index ca19a74d59a9a..7253cddb0f9ea 100644
--- a/sycl/test-e2e/GroupLocalMemory/group_local_memory.cpp
+++ b/sycl/test-e2e/GroupLocalMemory/group_local_memory.cpp
@@ -41,8 +41,8 @@ int main() {
     buffer<int, 1> CounterBuf{CounterVec.data(), range<1>(WgCount)};
 
     Q.submit([&](handler &Cgh) {
-      auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
-      auto CounterAcc = CounterBuf.get_access<access::mode::read_write>(Cgh);
+      auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
+      auto CounterAcc = CounterBuf.get_access<access_mode::read_write>(Cgh);
       Cgh.parallel_for<KernelA>(
           nd_range<1>(range<1>(Size), range<1>(WgSize)), [=](nd_item<1> Item) {
             // Some alternative (and functionally equivalent) ways to use this
@@ -80,7 +80,7 @@ int main() {
     buffer<int, 1> Buf{Vec.data(), range<1>(Size)};
 
     Q.submit([&](handler &Cgh) {
-      auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
+      auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
       Cgh.parallel_for<KernelB>(
           nd_range<1>(range<1>(Size), range<1>(WgSize)), [=](nd_item<1> Item) {
             multi_ptr<int[WgSize], access::address_space::local_space,
@@ -107,7 +107,7 @@ int main() {
     buffer<int, 1> Buf{Vec.data(), range<1>(Size)};
 
     Q.submit([&](handler &Cgh) {
-      auto Acc = Buf.get_access<access::mode::write>(Cgh);
+      auto Acc = Buf.get_access<access_mode::write>(Cgh);
       Cgh.parallel_for<KernelC>(
           nd_range<1>(range<1>(Size), range<1>(WgSize)), [=](nd_item<1> Item) {
             multi_ptr<Bar, access::address_space::local_space,
diff --git a/sycl/test-e2e/GroupLocalMemory/no_early_opt.cpp b/sycl/test-e2e/GroupLocalMemory/no_early_opt.cpp
index b0b3a0e8a8309..405e58727faeb 100644
--- a/sycl/test-e2e/GroupLocalMemory/no_early_opt.cpp
+++ b/sycl/test-e2e/GroupLocalMemory/no_early_opt.cpp
@@ -30,8 +30,8 @@ int main() {
     buffer<int *, 1> BufB{VecB.data(), range<1>(Size)};
 
     Q.submit([&](handler &Cgh) {
-      auto AccA = BufA.get_access<access::mode::read_write>(Cgh);
-      auto AccB = BufB.get_access<access::mode::read_write>(Cgh);
+      auto AccA = BufA.get_access<access_mode::read_write>(Cgh);
+      auto AccB = BufB.get_access<access_mode::read_write>(Cgh);
       Cgh.parallel_for<KernelA>(
           nd_range<1>(range<1>(Size), range<1>(WgSize)), [=](nd_item<1> Item) {
             multi_ptr<int, access::address_space::local_space,
diff --git a/sycl/test-e2e/HierPar/Inputs/hier_par_wgscope_impl.hpp b/sycl/test-e2e/HierPar/Inputs/hier_par_wgscope_impl.hpp
index 987af01a12361..2a131a557e953 100644
--- a/sycl/test-e2e/HierPar/Inputs/hier_par_wgscope_impl.hpp
+++ b/sycl/test-e2e/HierPar/Inputs/hier_par_wgscope_impl.hpp
@@ -42,7 +42,7 @@ static bool testWgScope(queue &Q) {
     int N = N_INNER_ITER;
 
     Q.submit([&](handler &cgh) {
-      auto DevPtr = Buf.get_access<access::mode::read_write>(cgh);
+      auto DevPtr = Buf.get_access<access_mode::read_write>(cgh);
 
       cgh.parallel_for_work_group<class hpar_hw>(
           range<1>(N_WG), range<1>(PHYS_WG_SIZE), [=](group<1> G) {
@@ -202,7 +202,7 @@ bool testPrivateMemory(queue &Q) {
   std::memset(Ptr, 0, RangeLength * sizeof(Ptr[0]));
   buffer<int, 1> Buf(Ptr, range<1>(RangeLength));
   Q.submit([&](handler &cgh) {
-    auto DevPtr = Buf.get_access<access::mode::read_write>(cgh);
+    auto DevPtr = Buf.get_access<access_mode::read_write>(cgh);
 
     cgh.parallel_for_work_group<class hpar_priv_mem>(
         range<2>(N_WG, 1), range<2>(WG_X_SIZE, WG_Y_SIZE), [=](group<2> G) {
diff --git a/sycl/test-e2e/HierPar/hier_par_basic.cpp b/sycl/test-e2e/HierPar/hier_par_basic.cpp
index 406ab94121f44..5fb4132150002 100644
--- a/sycl/test-e2e/HierPar/hier_par_basic.cpp
+++ b/sycl/test-e2e/HierPar/hier_par_basic.cpp
@@ -45,7 +45,7 @@ struct MyStruct {
 };
 
 using AccTy =
-    accessor<int, 1, access::mode::read_write, sycl::access::target::device>;
+    accessor<int, 1, access_mode::read_write, sycl::access::target::device>;
 
 struct PFWIFunctor {
   PFWIFunctor(size_t wg_chunk, size_t wg_size, size_t wg_offset,
@@ -134,7 +134,7 @@ int main() {
       const int addend = 10;
 
       myQueue.submit([&](handler &cgh) {
-        auto dev_ptr = buf.get_access<access::mode::read_write>(cgh);
+        auto dev_ptr = buf.get_access<access_mode::read_write>(cgh);
         // number of 'buf' elements per work group:
         size_t wg_chunk = (range_length + N_WG - 1) / N_WG;
         PFWGFunctor PFWG(wg_chunk, range_length, addend, N_ITER, dev_ptr);
@@ -154,7 +154,7 @@ int main() {
       std::memset(ptr, 0, range_length * sizeof(ptr[0]));
       buffer<int, 1> buf(ptr, range<1>(range_length));
       myQueue.submit([&](handler &cgh) {
-        auto dev_ptr = buf.get_access<access::mode::read_write>(cgh);
+        auto dev_ptr = buf.get_access<access_mode::read_write>(cgh);
 
         cgh.parallel_for_work_group<class hpar_flex>(
             range<1>(N_WG), range<1>(WG_SIZE_PHYSICAL), [=](group<1> g) {
@@ -194,7 +194,7 @@ int main() {
       std::memset(ptr, 0, range_length * sizeof(ptr[0]));
       buffer<int, 1> buf(ptr, range<1>(range_length));
       myQueue.submit([&](handler &cgh) {
-        auto dev_ptr = buf.get_access<access::mode::read_write>(cgh);
+        auto dev_ptr = buf.get_access<access_mode::read_write>(cgh);
 
         cgh.parallel_for_work_group<class hpar_hitem>(
             range<1>(N_WG), range<1>(WG_SIZE_PHYSICAL), [=](group<1> g) {
@@ -237,7 +237,7 @@ int main() {
       std::memset(ptr, 0, range_length * sizeof(ptr[0]));
       buffer<int, 1> buf(ptr, range<1>(range_length));
       myQueue.submit([&](handler &cgh) {
-        auto dev_ptr = buf.get_access<access::mode::read_write>(cgh);
+        auto dev_ptr = buf.get_access<access_mode::read_write>(cgh);
 
         cgh.parallel_for_work_group<class hpar_priv_mem>(
             range<2>(N_WG, 1), range<2>(WG_X_SIZE, WG_Y_SIZE), [=](group<2> g) {
@@ -278,7 +278,7 @@ int main() {
       std::memset(ptr, 0, range_length * sizeof(ptr[0]));
       buffer<int, 1> buf(ptr, range<1>(range_length));
       myQueue.submit([&](handler &cgh) {
-        auto dev_ptr = buf.get_access<access::mode::read_write>(cgh);
+        auto dev_ptr = buf.get_access<access_mode::read_write>(cgh);
 
         cgh.parallel_for_work_group<class hpar_ranges>(
             range<1>(N_WG), range<1>(WG_SIZE_PHYSICAL), [=](group<1> g) {
diff --git a/sycl/test-e2e/HostInteropTask/host-task-dependency4.cpp b/sycl/test-e2e/HostInteropTask/host-task-dependency4.cpp
index bb315329195bf..ca0e58b827b2f 100644
--- a/sycl/test-e2e/HostInteropTask/host-task-dependency4.cpp
+++ b/sycl/test-e2e/HostInteropTask/host-task-dependency4.cpp
@@ -6,7 +6,7 @@
 
 sycl::event submit(sycl::queue &Q, sycl::buffer<int> &B) {
   return Q.submit([&](sycl::handler &CGH) {
-    auto A = B.template get_access<sycl::access::mode::read_write>(CGH);
+    auto A = B.template get_access<sycl::access_mode::read_write>(CGH);
     CGH.host_task([=]() { (void)A; });
   });
 }
diff --git a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
index 3579ef55b4eee..426e05d734c2b 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_empty.cpp
@@ -15,7 +15,7 @@ template <typename T = dataType> struct KernelFunctor : WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
     cgh.parallel_for<KernelFunctor<T>>(
         sycl::range<1>{this->getOutputBufferSize()},
diff --git a/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp b/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
index e73772aa00885..d4bca3eb82966 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_matrix_mult.cpp
@@ -15,7 +15,7 @@ template <typename T = dataType> struct KernelFunctor : WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
     cgh.parallel_for<KernelFunctor<T>>(
         sycl::range<1>{this->getOutputBufferSize()},
diff --git a/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp b/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
index e73772aa00885..d4bca3eb82966 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_no_input_int.cpp
@@ -15,7 +15,7 @@ template <typename T = dataType> struct KernelFunctor : WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
     cgh.parallel_for<KernelFunctor<T>>(
         sycl::range<1>{this->getOutputBufferSize()},
diff --git a/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp b/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
index 289969b5e8c5a..55b80447eb090 100644
--- a/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_16_no_opts.cpp
@@ -15,7 +15,7 @@ template <typename T = dataType> struct KernelFunctor : WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
     cgh.parallel_for<KernelFunctor<T>>(
         sycl::range<1>{this->getOutputBufferSize()},
diff --git a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
index f784205bc6029..acbab149fae62 100644
--- a/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_8_empty.cpp
@@ -13,7 +13,7 @@ template <typename T = dataType> struct KernelFunctor : WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
     cgh.parallel_for<KernelFunctor<T>>(
         sycl::range<1>{this->getOutputBufferSize()},
diff --git a/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp b/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
index 7fba71b894bdb..cf7405532bf6f 100644
--- a/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_8_no_input_int.cpp
@@ -13,7 +13,7 @@ template <typename T = dataType> struct KernelFunctor : WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
     cgh.parallel_for<KernelFunctor<T>>(
         sycl::range<1>{this->getOutputBufferSize()},
diff --git a/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp b/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
index 86d3098648d83..7b418565e746b 100644
--- a/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_arbitrary_ops_order.cpp
@@ -19,16 +19,16 @@ struct KernelFunctor : WithInputBuffers<T, 3>, WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto A =
-        this->getInputBuffer(0).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(0).template get_access<sycl::access_mode::read>(
             cgh);
     auto B =
-        this->getInputBuffer(1).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(1).template get_access<sycl::access_mode::read>(
             cgh);
     auto C =
-        this->getInputBuffer(2).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(2).template get_access<sycl::access_mode::read>(
             cgh);
     auto D =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
 
     cgh.parallel_for<KernelFunctor<T>>(
diff --git a/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp b/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
index 3e642d09edc67..9884db6234db1 100644
--- a/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_decl_in_scope.cpp
@@ -18,13 +18,13 @@ struct KernelFunctor : WithInputBuffers<T, 2>, WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto A =
-        this->getInputBuffer(0).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(0).template get_access<sycl::access_mode::read>(
             cgh);
     auto B =
-        this->getInputBuffer(1).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(1).template get_access<sycl::access_mode::read>(
             cgh);
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
 
     cgh.parallel_for<KernelFunctor<T>>(
diff --git a/sycl/test-e2e/InlineAsm/asm_float_add.cpp b/sycl/test-e2e/InlineAsm/asm_float_add.cpp
index 0466540dfd494..9f3cbc60dc4bb 100644
--- a/sycl/test-e2e/InlineAsm/asm_float_add.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_float_add.cpp
@@ -19,13 +19,13 @@ struct KernelFunctor : WithInputBuffers<T, 2>, WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto A =
-        this->getInputBuffer(0).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(0).template get_access<sycl::access_mode::read>(
             cgh);
     auto B =
-        this->getInputBuffer(1).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(1).template get_access<sycl::access_mode::read>(
             cgh);
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
 
     cgh.parallel_for<KernelFunctor<T>>(
diff --git a/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp b/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
index dddeba3764ce6..242150d475412 100644
--- a/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_float_imm_arg.cpp
@@ -19,10 +19,10 @@ struct KernelFunctor : WithInputBuffers<T, 1>, WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto A =
-        this->getInputBuffer(0).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(0).template get_access<sycl::access_mode::read>(
             cgh);
     auto B =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
 
     cgh.parallel_for<KernelFunctor<T>>(
diff --git a/sycl/test-e2e/InlineAsm/asm_float_neg.cpp b/sycl/test-e2e/InlineAsm/asm_float_neg.cpp
index 89a6b2f249f0e..27ff61a407260 100644
--- a/sycl/test-e2e/InlineAsm/asm_float_neg.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_float_neg.cpp
@@ -17,10 +17,10 @@ struct KernelFunctor : WithInputBuffers<T, 1>, WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto A =
-        this->getInputBuffer().template get_access<sycl::access::mode::read>(
+        this->getInputBuffer().template get_access<sycl::access_mode::read>(
             cgh);
     auto B =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
 
     cgh.parallel_for<KernelFunctor<T>>(
diff --git a/sycl/test-e2e/InlineAsm/asm_if.cpp b/sycl/test-e2e/InlineAsm/asm_if.cpp
index 83b9a921fcc48..de6072c3b2798 100644
--- a/sycl/test-e2e/InlineAsm/asm_if.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_if.cpp
@@ -13,7 +13,7 @@ template <typename T = DataType> struct KernelFunctor : WithOutputBuffer<T> {
 
   void operator()(sycl::handler &CGH) {
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             CGH);
     bool switchField = false;
     CGH.parallel_for<KernelFunctor<T>>(
diff --git a/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp b/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
index 0cc620f806c63..553fdd53d36d1 100644
--- a/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_imm_arg.cpp
@@ -18,10 +18,10 @@ struct KernelFunctor : WithInputBuffers<T, 1>, WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto A =
-        this->getInputBuffer(0).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(0).template get_access<sycl::access_mode::read>(
             cgh);
     auto B =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
 
     cgh.parallel_for<KernelFunctor<T>>(
diff --git a/sycl/test-e2e/InlineAsm/asm_loop.cpp b/sycl/test-e2e/InlineAsm/asm_loop.cpp
index c9c74b835e2a0..dbf96ca05c21b 100644
--- a/sycl/test-e2e/InlineAsm/asm_loop.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_loop.cpp
@@ -19,13 +19,13 @@ struct KernelFunctor : WithInputBuffers<T, 2>, WithOutputBuffer<T> {
 
   void operator()(sycl::handler &CGH) {
     auto A =
-        this->getInputBuffer(0).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(0).template get_access<sycl::access_mode::read>(
             CGH);
     auto B =
-        this->getInputBuffer(1).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(1).template get_access<sycl::access_mode::read>(
             CGH);
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             CGH);
     CGH.parallel_for<KernelFunctor<T>>(
         sycl::range<1>{this->getOutputBufferSize()},
diff --git a/sycl/test-e2e/InlineAsm/asm_mul.cpp b/sycl/test-e2e/InlineAsm/asm_mul.cpp
index 6030bb5b144b9..ed37ebfc85439 100644
--- a/sycl/test-e2e/InlineAsm/asm_mul.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_mul.cpp
@@ -17,13 +17,13 @@ struct KernelFunctor : WithInputBuffers<T, 2>, WithOutputBuffer<T> {
                                                     input1.size()) {}
   void operator()(sycl::handler &cgh) {
     auto A =
-        this->getInputBuffer(0).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(0).template get_access<sycl::access_mode::read>(
             cgh);
     auto B =
-        this->getInputBuffer(1).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(1).template get_access<sycl::access_mode::read>(
             cgh);
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
 
     cgh.parallel_for<KernelFunctor<T>>(
diff --git a/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp b/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
index 0904725a47684..d67b341da5613 100644
--- a/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_multiple_instructions.cpp
@@ -22,15 +22,15 @@ struct KernelFunctor : WithInputBuffers<T, 3>, WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto A = this->getInputBuffer(0)
-                 .template get_access<sycl::access::mode::read_write>(cgh);
+                 .template get_access<sycl::access_mode::read_write>(cgh);
     auto B =
-        this->getInputBuffer(1).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(1).template get_access<sycl::access_mode::read>(
             cgh);
     auto C =
-        this->getInputBuffer(2).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(2).template get_access<sycl::access_mode::read>(
             cgh);
     auto D =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
 
     cgh.parallel_for<KernelFunctor<T>>(
diff --git a/sycl/test-e2e/InlineAsm/asm_no_output.cpp b/sycl/test-e2e/InlineAsm/asm_no_output.cpp
index 2445b56cf7cf3..e2143a00333f6 100644
--- a/sycl/test-e2e/InlineAsm/asm_no_output.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_no_output.cpp
@@ -15,7 +15,7 @@ template <typename T = dataType> struct KernelFunctor : WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
     cgh.parallel_for<KernelFunctor<T>>(
         sycl::range<1>{this->getOutputBufferSize()},
diff --git a/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp b/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
index 7ac0c3af60150..96b305016eba9 100644
--- a/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_plus_mod.cpp
@@ -17,10 +17,10 @@ struct KernelFunctor : WithInputBuffers<T, 1>, WithOutputBuffer<T> {
 
   void operator()(sycl::handler &cgh) {
     auto A =
-        this->getInputBuffer(0).template get_access<sycl::access::mode::read>(
+        this->getInputBuffer(0).template get_access<sycl::access_mode::read>(
             cgh);
     auto B =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             cgh);
 
     cgh.parallel_for<KernelFunctor<T>>(
diff --git a/sycl/test-e2e/InlineAsm/asm_switch.cpp b/sycl/test-e2e/InlineAsm/asm_switch.cpp
index 4d9c18eab108f..8dbb37ce6c810 100644
--- a/sycl/test-e2e/InlineAsm/asm_switch.cpp
+++ b/sycl/test-e2e/InlineAsm/asm_switch.cpp
@@ -13,7 +13,7 @@ template <typename T = DataType> struct KernelFunctor : WithOutputBuffer<T> {
 
   void operator()(sycl::handler &CGH) {
     auto C =
-        this->getOutputBuffer().template get_access<sycl::access::mode::write>(
+        this->getOutputBuffer().template get_access<sycl::access_mode::write>(
             CGH);
     int switchField = 2;
     CGH.parallel_for<KernelFunctor<T>>(
diff --git a/sycl/test-e2e/InorderQueue/in_order_buffs.cpp b/sycl/test-e2e/InorderQueue/in_order_buffs.cpp
index 52618ac084027..864bf0705c092 100644
--- a/sycl/test-e2e/InorderQueue/in_order_buffs.cpp
+++ b/sycl/test-e2e/InorderQueue/in_order_buffs.cpp
@@ -32,7 +32,7 @@ int main() {
     buffer<int, 1> bufA(dataA, range<1>(dataSize));
     buffer<int, 1> bufB(dataB, range<1>(dataSize));
     Queue.submit([&](handler &cgh) {
-      auto writeBuffer = bufA.get_access<access::mode::write>(cgh);
+      auto writeBuffer = bufA.get_access<access_mode::write>(cgh);
 
       // Create a range.
       auto myRange = range<1>(dataSize);
@@ -44,8 +44,8 @@ int main() {
     });
 
     Queue.submit([&](handler &cgh) {
-      auto writeBuffer = bufB.get_access<access::mode::write>(cgh);
-      auto readBuffer = bufA.get_access<access::mode::read>(cgh);
+      auto writeBuffer = bufB.get_access<access_mode::write>(cgh);
+      auto readBuffer = bufA.get_access<access_mode::read>(cgh);
 
       // Create a range.
       auto myRange = range<1>(dataSize);
diff --git a/sycl/test-e2e/IntermediateLib/Inputs/incrementing_lib.cpp b/sycl/test-e2e/IntermediateLib/Inputs/incrementing_lib.cpp
index 9c8faf38700cc..ea3dbe0c4565c 100644
--- a/sycl/test-e2e/IntermediateLib/Inputs/incrementing_lib.cpp
+++ b/sycl/test-e2e/IntermediateLib/Inputs/incrementing_lib.cpp
@@ -31,7 +31,7 @@ extern "C" API_EXPORT void performIncrementation(sycl::queue &q,
                                                  sycl::buffer<int, 1> &buf) {
   sycl::range<1> r = buf.get_range();
   q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::write>(cgh);
     cgh.parallel_for<class CLASSNAME>(
         r, [=](sycl::id<1> idx) { acc[idx] += INC; });
   });
diff --git a/sycl/test-e2e/KernelAndProgram/cache_env_vars.hpp b/sycl/test-e2e/KernelAndProgram/cache_env_vars.hpp
index a8a81fc270133..b4ceb2c4e73fa 100644
--- a/sycl/test-e2e/KernelAndProgram/cache_env_vars.hpp
+++ b/sycl/test-e2e/KernelAndProgram/cache_env_vars.hpp
@@ -90,7 +90,7 @@ int main(int argc, char **argv) {
       sycl::range<1> NumOfWorkItems{buf.size()};
 
       q.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.parallel_for<class Inc>(
             NumOfWorkItems, [=](sycl::id<1> WIid) { TARGET_IMAGE(acc[0]) });
       });
diff --git a/sycl/test-e2e/KernelCompiler/opencl.cpp b/sycl/test-e2e/KernelCompiler/opencl.cpp
index 5fbcfa994b507..de709fcff425b 100644
--- a/sycl/test-e2e/KernelCompiler/opencl.cpp
+++ b/sycl/test-e2e/KernelCompiler/opencl.cpp
@@ -62,8 +62,8 @@ void testSyclKernel(sycl::queue &Q, sycl::kernel Kernel, int multiplier,
   sycl::buffer OutputBuf(OutputArray, sycl::range<1>(N));
 
   Q.submit([&](sycl::handler &CGH) {
-    CGH.set_arg(0, InputBuf.get_access<sycl::access::mode::read>(CGH));
-    CGH.set_arg(1, OutputBuf.get_access<sycl::access::mode::write>(CGH));
+    CGH.set_arg(0, InputBuf.get_access<sycl::access_mode::read>(CGH));
+    CGH.set_arg(1, OutputBuf.get_access<sycl::access_mode::write>(CGH));
     CGH.parallel_for(sycl::range<1>{N}, Kernel);
   });
 
diff --git a/sycl/test-e2e/KernelCompiler/opencl_cache.cpp b/sycl/test-e2e/KernelCompiler/opencl_cache.cpp
index e154bfc7cdb7f..7b13ab079372a 100644
--- a/sycl/test-e2e/KernelCompiler/opencl_cache.cpp
+++ b/sycl/test-e2e/KernelCompiler/opencl_cache.cpp
@@ -53,8 +53,8 @@ void testSyclKernel(sycl::queue &Q, sycl::kernel Kernel, int multiplier,
   sycl::buffer OutputBuf(OutputArray, sycl::range<1>(N));
 
   Q.submit([&](sycl::handler &CGH) {
-    CGH.set_arg(0, InputBuf.get_access<sycl::access::mode::read>(CGH));
-    CGH.set_arg(1, OutputBuf.get_access<sycl::access::mode::write>(CGH));
+    CGH.set_arg(0, InputBuf.get_access<sycl::access_mode::read>(CGH));
+    CGH.set_arg(1, OutputBuf.get_access<sycl::access_mode::write>(CGH));
     CGH.parallel_for(sycl::range<1>{N}, Kernel);
   });
 
diff --git a/sycl/test-e2e/KernelCompiler/opencl_capabilities.cpp b/sycl/test-e2e/KernelCompiler/opencl_capabilities.cpp
index d661c6cfe66ea..d4324a0967a58 100644
--- a/sycl/test-e2e/KernelCompiler/opencl_capabilities.cpp
+++ b/sycl/test-e2e/KernelCompiler/opencl_capabilities.cpp
@@ -69,7 +69,7 @@ void test_local_accessor() {
   sycl::buffer<cl_int, 1> b(init, N_wg);
 
   q.submit([&](handler &cgh) {
-    auto acc_global = b.get_access<access::mode::write>(cgh);
+    auto acc_global = b.get_access<access_mode::write>(cgh);
     local_accessor<float, 1> acc_local(N_slm, cgh);
 
     cgh.set_arg(0, acc_global);
diff --git a/sycl/test-e2e/KernelCompiler/spirv.cpp b/sycl/test-e2e/KernelCompiler/spirv.cpp
index 3f39146643948..ef4ffd3a95ea6 100644
--- a/sycl/test-e2e/KernelCompiler/spirv.cpp
+++ b/sycl/test-e2e/KernelCompiler/spirv.cpp
@@ -61,8 +61,8 @@ void testSimpleKernel(sycl::queue &q, const sycl::kernel &kernel,
   sycl::buffer output_buffer(output_array.data(), sycl::range<1>(N));
 
   q.submit([&](sycl::handler &cgh) {
-    cgh.set_arg(0, input_buffer.get_access<sycl::access::mode::read>(cgh));
-    cgh.set_arg(1, output_buffer.get_access<sycl::access::mode::write>(cgh));
+    cgh.set_arg(0, input_buffer.get_access<sycl::access_mode::read>(cgh));
+    cgh.set_arg(1, output_buffer.get_access<sycl::access_mode::write>(cgh));
     cgh.parallel_for(sycl::range<1>{N}, kernel);
   });
 
@@ -98,7 +98,7 @@ void testParam(sycl::queue &q, const sycl::kernel &kernel) {
     cgh.set_arg(1, b_ptr);
     // Pass sycl::accessor for OpTypePointer(CrossWorkgroup) parameter.
     cgh.set_arg(
-        2, output_buffer.template get_access<sycl::access::mode::write>(cgh));
+        2, output_buffer.template get_access<sycl::access_mode::write>(cgh));
     // Pass sycl::local_accessor for OpTypePointer(Workgroup) parameter.
     cgh.set_arg(3, local);
     cgh.parallel_for(sycl::range<1>{1}, kernel);
diff --git a/sycl/test-e2e/KernelParams/array-kernel-param-nested-run.cpp b/sycl/test-e2e/KernelParams/array-kernel-param-nested-run.cpp
index 3ca90a0f07fe8..aad4a8e9d5e5b 100644
--- a/sycl/test-e2e/KernelParams/array-kernel-param-nested-run.cpp
+++ b/sycl/test-e2e/KernelParams/array-kernel-param-nested-run.cpp
@@ -58,7 +58,7 @@ bool test_accessor_array_in_struct(queue &myQueue) {
 
   myQueue.submit([&](handler &cgh) {
     using Accessor =
-        accessor<int, 1, access::mode::read_write, access::target::device>;
+        accessor<int, 1, access_mode::read_write, access::target::device>;
 
     struct S {
       int w;
@@ -68,11 +68,11 @@ bool test_accessor_array_in_struct(queue &myQueue) {
       int z;
     } S = {3,
            3,
-           {in_buffer1.get_access<access::mode::read_write>(cgh),
-            in_buffer2.get_access<access::mode::read_write>(cgh)},
+           {in_buffer1.get_access<access_mode::read_write>(cgh),
+            in_buffer2.get_access<access_mode::read_write>(cgh)},
            7,
            7};
-    auto output_accessor = out_buffer.get_access<access::mode::write>(cgh);
+    auto output_accessor = out_buffer.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class accessor_array_in_struct>(
         num_items, [=](sycl::id<1> index) {
@@ -103,8 +103,8 @@ bool test_templated_array_in_struct(queue &myQueue) {
 
   myQueue.submit([&](handler &cgh) {
     using Accessor =
-        accessor<int, 1, access::mode::read_write, access::target::device>;
-    auto output_accessor = out_buffer.get_access<access::mode::write>(cgh);
+        accessor<int, 1, access_mode::read_write, access::target::device>;
+    auto output_accessor = out_buffer.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class templated_array_in_struct>(
         num_items, [=](sycl::id<1> index) {
diff --git a/sycl/test-e2e/KernelParams/array-kernel-param-run.cpp b/sycl/test-e2e/KernelParams/array-kernel-param-run.cpp
index 87e93b1a60a9a..9301c1a546477 100644
--- a/sycl/test-e2e/KernelParams/array-kernel-param-run.cpp
+++ b/sycl/test-e2e/KernelParams/array-kernel-param-run.cpp
@@ -67,7 +67,7 @@ bool test_one_array(queue &myQueue) {
   auto out_buffer = buffer<int, 1>(&output[0], num_items);
 
   myQueue.submit([&](handler &cgh) {
-    auto output_accessor = out_buffer.get_access<access::mode::write>(cgh);
+    auto output_accessor = out_buffer.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class one_array>(num_items, [=](sycl::id<1> index) {
       output_accessor[index] = input1[0][index] + input2[2][1][index] + 1;
@@ -90,7 +90,7 @@ bool test_two_arrays(queue &myQueue) {
   auto out_buffer = buffer<int, 1>(&output[0], num_items);
 
   myQueue.submit([&](handler &cgh) {
-    auto output_accessor = out_buffer.get_access<access::mode::write>(cgh);
+    auto output_accessor = out_buffer.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class two_arrays>(num_items, [=](sycl::id<1> index) {
       output_accessor[index] = input1[index] + input2[index];
@@ -118,10 +118,10 @@ bool test_accessor_arrays_1(queue &myQueue) {
 
   myQueue.submit([&](handler &cgh) {
     using Accessor =
-        accessor<int, 1, access::mode::read_write, access::target::device>;
+        accessor<int, 1, access_mode::read_write, access::target::device>;
     Accessor a[2] = {
-        in_buffer1.get_access<access::mode::read_write>(cgh),
-        in_buffer2.get_access<access::mode::read_write>(cgh),
+        in_buffer1.get_access<access_mode::read_write>(cgh),
+        in_buffer2.get_access<access_mode::read_write>(cgh),
     };
 
     cgh.parallel_for<class accessor_arrays_1>(
@@ -150,12 +150,12 @@ bool test_accessor_arrays_2(queue &myQueue) {
 
   myQueue.submit([&](handler &cgh) {
     using Accessor =
-        accessor<int, 1, access::mode::read_write, access::target::device>;
-    Accessor a[4] = {in_buffer1.get_access<access::mode::read_write>(cgh),
-                     in_buffer2.get_access<access::mode::read_write>(cgh),
-                     in_buffer1.get_access<access::mode::read_write>(cgh),
-                     in_buffer2.get_access<access::mode::read_write>(cgh)};
-    auto output_accessor = out_buffer.get_access<access::mode::write>(cgh);
+        accessor<int, 1, access_mode::read_write, access::target::device>;
+    Accessor a[4] = {in_buffer1.get_access<access_mode::read_write>(cgh),
+                     in_buffer2.get_access<access_mode::read_write>(cgh),
+                     in_buffer1.get_access<access_mode::read_write>(cgh),
+                     in_buffer2.get_access<access_mode::read_write>(cgh)};
+    auto output_accessor = out_buffer.get_access<access_mode::write>(cgh);
 
     cgh.parallel_for<class accessor_arrays_2>(
         num_items, [=](sycl::id<1> index) {
diff --git a/sycl/test-e2e/KernelParams/non-standard-layout.cpp b/sycl/test-e2e/KernelParams/non-standard-layout.cpp
index 39d6640b97c4f..16271ea54962c 100644
--- a/sycl/test-e2e/KernelParams/non-standard-layout.cpp
+++ b/sycl/test-e2e/KernelParams/non-standard-layout.cpp
@@ -21,7 +21,7 @@ bool test0() {
     buffer<F, 1> Buf(&S0, range<1>(1));
     queue myQueue;
     myQueue.submit([&](handler &cgh) {
-      auto B = Buf.get_access<access::mode::write>(cgh);
+      auto B = Buf.get_access<access_mode::write>(cgh);
       cgh.single_task<class NonStandard>([=] { B[0] = S; });
     });
   }
diff --git a/sycl/test-e2e/KernelParams/struct_kernel_param.cpp b/sycl/test-e2e/KernelParams/struct_kernel_param.cpp
index bb9206b295762..a55a6986d6963 100644
--- a/sycl/test-e2e/KernelParams/struct_kernel_param.cpp
+++ b/sycl/test-e2e/KernelParams/struct_kernel_param.cpp
@@ -60,7 +60,7 @@ bool test0() {
     buffer<MyStruct, 1> Buf(&S0, range<1>(1));
     queue myQueue;
     myQueue.submit([&](handler &cgh) {
-      auto B = Buf.get_access<access::mode::write>(cgh);
+      auto B = Buf.get_access<access_mode::write>(cgh);
       cgh.single_task<class MyKernel>([=] { B[0] = S; });
     });
   }
@@ -87,7 +87,7 @@ bool test1() {
     buffer<unsigned int, 1> Buffer((unsigned int *)result, range<1>(4));
     queue myQueue;
     myQueue.submit([&](handler &cgh) {
-      auto B = Buffer.get_access<access::mode::write>(cgh);
+      auto B = Buffer.get_access<access_mode::write>(cgh);
       cgh.parallel_for<class bufferByRange_cap>(range<1>{4}, [=](id<1> index) {
         B[index.get(0)] = index.get(0) > 2 ? ice2 : ice.get(index.get(0));
       });
diff --git a/sycl/test-e2e/KernelParams/union_kernel_param.cpp b/sycl/test-e2e/KernelParams/union_kernel_param.cpp
index b81fe04cba0aa..cf1e30d5f5b1b 100644
--- a/sycl/test-e2e/KernelParams/union_kernel_param.cpp
+++ b/sycl/test-e2e/KernelParams/union_kernel_param.cpp
@@ -25,7 +25,7 @@ int main(int argc, char **argv) {
   {
     sycl::buffer<float, 1> buf(&myfloat, 1);
     queue.submit([&](sycl::handler &cgh) {
-      auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+      auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
       cgh.single_task<class test>([=]() { acc[0] = x.myfloat; });
     });
   }
diff --git a/sycl/test-e2e/OptionalKernelFeatures/throw-exception-for-out-of-registers-on-kernel-launch.cpp b/sycl/test-e2e/OptionalKernelFeatures/throw-exception-for-out-of-registers-on-kernel-launch.cpp
index 7915459199c93..9844edd108488 100644
--- a/sycl/test-e2e/OptionalKernelFeatures/throw-exception-for-out-of-registers-on-kernel-launch.cpp
+++ b/sycl/test-e2e/OptionalKernelFeatures/throw-exception-for-out-of-registers-on-kernel-launch.cpp
@@ -65,11 +65,11 @@ int main() {
 
   try {
     q.submit([&](sycl::handler &h) {
-       auto input1 = valuesBuf1.get_access<sycl::access::mode::read>(h);
-       auto input2 = valuesBuf2.get_access<sycl::access::mode::read>(h);
-       auto input3 = valuesBuf3.get_access<sycl::access::mode::read>(h);
-       auto input4 = valuesBuf4.get_access<sycl::access::mode::read>(h);
-       auto output = outputBuf.get_access<sycl::access::mode::write>(h);
+       auto input1 = valuesBuf1.get_access<sycl::access_mode::read>(h);
+       auto input2 = valuesBuf2.get_access<sycl::access_mode::read>(h);
+       auto input3 = valuesBuf3.get_access<sycl::access_mode::read>(h);
+       auto input4 = valuesBuf4.get_access<sycl::access_mode::read>(h);
+       auto output = outputBuf.get_access<sycl::access_mode::write>(h);
        h.parallel_for<kernel_vadd_and_sum>(
            sycl::nd_range<1>{{GLOBAL_WORK_SIZE}, {local_size}},
            [=](sycl::id<1> i) {
diff --git a/sycl/test-e2e/Reduction/reduction_big_data.cpp b/sycl/test-e2e/Reduction/reduction_big_data.cpp
index 6fc5468aaf92a..f317bea555d6c 100644
--- a/sycl/test-e2e/Reduction/reduction_big_data.cpp
+++ b/sycl/test-e2e/Reduction/reduction_big_data.cpp
@@ -52,7 +52,7 @@ int test(queue &Q, T Identity) {
 
   // Compute.
   Q.submit([&](handler &CGH) {
-    auto In = InBuf.template get_access<access::mode::read>(CGH);
+    auto In = InBuf.template get_access<access_mode::read>(CGH);
     CGH.parallel_for<Name>(NDRange, sycl::reduction(OutBuf, CGH, Identity, BOp),
                            [=](nd_item<1> NDIt, auto &Sum) {
                              if (NDIt.get_global_linear_id() < NWorkItems)
diff --git a/sycl/test-e2e/Reduction/reduction_ctor.cpp b/sycl/test-e2e/Reduction/reduction_ctor.cpp
index bf59f3b91a15b..b985835e36b79 100644
--- a/sycl/test-e2e/Reduction/reduction_ctor.cpp
+++ b/sycl/test-e2e/Reduction/reduction_ctor.cpp
@@ -59,8 +59,8 @@ void testKnown(T Identity, BinaryOperation BOp, T A, T B) {
   Q.submit([&](handler &CGH) {
     // Reduction needs a device accessor as a parameter.
     // This accessor is not really used in this test.
-    accessor<T, Dim, access::mode::read_write, access::target::device>
-        ReduRWAcc(ReduBuf, CGH);
+    accessor<T, Dim, access_mode::read_write, access::target::device> ReduRWAcc(
+        ReduBuf, CGH);
     accessor<T, Dim, access::mode::discard_write, access::target::device>
         ReduDWAcc(ReduBuf, CGH);
     auto Redu = sycl::reduction(ReduBuf, CGH, BOp);
@@ -91,8 +91,8 @@ void testUnknown(T Identity, BinaryOperation BOp, T A, T B) {
   Q.submit([&](handler &CGH) {
     // Reduction needs a device accessor as a parameter.
     // This accessor is not really used in this test.
-    accessor<T, Dim, access::mode::read_write, access::target::device>
-        ReduRWAcc(ReduBuf, CGH);
+    accessor<T, Dim, access_mode::read_write, access::target::device> ReduRWAcc(
+        ReduBuf, CGH);
     accessor<T, Dim, access::mode::discard_write, access::target::device>
         ReduDWAcc(ReduBuf, CGH);
     auto Redu = sycl::reduction(ReduBuf, CGH, Identity, BOp);
diff --git a/sycl/test-e2e/Reduction/reduction_nd_N_vars.cpp b/sycl/test-e2e/Reduction/reduction_nd_N_vars.cpp
index 28813bcc09ff1..a9bb32e874d75 100644
--- a/sycl/test-e2e/Reduction/reduction_nd_N_vars.cpp
+++ b/sycl/test-e2e/Reduction/reduction_nd_N_vars.cpp
@@ -12,8 +12,8 @@ using namespace sycl;
 template <typename... Ts> class KNameGroup;
 template <typename T, bool B> class KName;
 
-constexpr access::mode RW = access::mode::read_write;
-constexpr access::mode DW = access::mode::discard_write;
+constexpr access_mode RW = access_mode::read_write;
+constexpr access_mode DW = access_mode::discard_write;
 
 template <typename RangeT>
 void printNVarsTestLabel(const RangeT &Range, bool ToCERR = false) {
diff --git a/sycl/test-e2e/Reduction/reduction_nd_conditional.cpp b/sycl/test-e2e/Reduction/reduction_nd_conditional.cpp
index f8a6d0fb8027a..795567d5a889c 100644
--- a/sycl/test-e2e/Reduction/reduction_nd_conditional.cpp
+++ b/sycl/test-e2e/Reduction/reduction_nd_conditional.cpp
@@ -41,7 +41,7 @@ int test(queue &Q, T Identity, size_t WGSize, size_t NWItems) {
 
   // Compute.
   Q.submit([&](handler &CGH) {
-    auto In = InBuf.template get_access<access::mode::read>(CGH);
+    auto In = InBuf.template get_access<access_mode::read>(CGH);
     auto Redu = sycl::reduction(OutBuf, CGH, Identity, BOp);
     CGH.parallel_for<Name>(NDRange, Redu, [=](nd_item<1> NDIt, auto &Sum) {
       size_t I = NDIt.get_global_linear_id();
diff --git a/sycl/test-e2e/Reduction/reduction_nd_ext_type.hpp b/sycl/test-e2e/Reduction/reduction_nd_ext_type.hpp
index 54491ca236529..d8824049854e4 100644
--- a/sycl/test-e2e/Reduction/reduction_nd_ext_type.hpp
+++ b/sycl/test-e2e/Reduction/reduction_nd_ext_type.hpp
@@ -26,8 +26,8 @@ template <typename T> int runTests(sycl::aspect ExtAspect) {
     return 0;
   }
 
-  constexpr access::mode RW = access::mode::read_write;
-  constexpr access::mode DW = access::mode::discard_write;
+  constexpr access_mode RW = access_mode::read_write;
+  constexpr access_mode DW = access_mode::discard_write;
 
   tests<class A1, T>(Q, 1, 77, std::multiplies<T>{}, 4, 4, init_to_identity());
   tests<class A2, T>(Q, 1, 77, std::multiplies<T>{}, 4, 8);
diff --git a/sycl/test-e2e/Reduction/reduction_nd_lambda.cpp b/sycl/test-e2e/Reduction/reduction_nd_lambda.cpp
index aedd72bd89649..44ec77de22ed4 100644
--- a/sycl/test-e2e/Reduction/reduction_nd_lambda.cpp
+++ b/sycl/test-e2e/Reduction/reduction_nd_lambda.cpp
@@ -8,7 +8,7 @@
 
 using namespace sycl;
 
-template <typename T, access::mode M> class MName;
+template <typename T, access_mode M> class MName;
 
 int NumErrors = 0;
 
diff --git a/sycl/test-e2e/Reduction/reduction_range_1d_reducer_skip.cpp b/sycl/test-e2e/Reduction/reduction_range_1d_reducer_skip.cpp
index 2f5077c41f03f..405ebd5e56a76 100644
--- a/sycl/test-e2e/Reduction/reduction_range_1d_reducer_skip.cpp
+++ b/sycl/test-e2e/Reduction/reduction_range_1d_reducer_skip.cpp
@@ -31,7 +31,8 @@ int main() {
   size_t MaxWGSize =
       Q.get_device().get_info<info::device::max_work_group_size>();
 
-  constexpr access::mode RW = access::mode::read_write;
+  constexpr access_mode RW = access_mode::read_write;
+  constexpr access_mode DW = access_mode::discard_write;
   // Fast-reduce and Fast-atomics. Try various range types/sizes.
   tests<class A1, int>(Q, 0, 99, std::plus<int>{}, range<1>(1));
   tests<class A2, int>(Q, 0, 99, std::plus<>{}, range<1>(2));
diff --git a/sycl/test-e2e/Reduction/reduction_range_1d_rw.cpp b/sycl/test-e2e/Reduction/reduction_range_1d_rw.cpp
index 57d6f652aa8b3..c53e56d08687b 100644
--- a/sycl/test-e2e/Reduction/reduction_range_1d_rw.cpp
+++ b/sycl/test-e2e/Reduction/reduction_range_1d_rw.cpp
@@ -21,7 +21,7 @@ int main() {
   size_t MaxWGSize =
       Q.get_device().get_info<info::device::max_work_group_size>();
 
-  constexpr access::mode RW = access::mode::read_write;
+  constexpr access_mode RW = access_mode::read_write;
   // Fast-reduce and Fast-atomics. Try various range types/sizes.
   tests<class A1, int>(Q, 0, 99, std::plus<int>{}, range<1>(1));
   tests<class A2, int>(Q, 0, 99, std::plus<>{}, range<1>(2));
diff --git a/sycl/test-e2e/Reduction/reduction_range_N_vars.cpp b/sycl/test-e2e/Reduction/reduction_range_N_vars.cpp
index e3aec17126342..af5faa26db2dc 100644
--- a/sycl/test-e2e/Reduction/reduction_range_N_vars.cpp
+++ b/sycl/test-e2e/Reduction/reduction_range_N_vars.cpp
@@ -12,8 +12,8 @@ using namespace sycl;
 template <typename... Ts> class KNameGroup;
 template <typename T, bool B> class KName;
 
-constexpr access::mode RW = access::mode::read_write;
-constexpr access::mode DW = access::mode::discard_write;
+constexpr access_mode RW = access_mode::read_write;
+constexpr access_mode DW = access_mode::discard_write;
 
 template <typename RangeT>
 void printNVarsTestLabel(const RangeT &Range, bool ToCERR = false) {
diff --git a/sycl/test-e2e/Reduction/reduction_usm.cpp b/sycl/test-e2e/Reduction/reduction_usm.cpp
index 5f86545e878f3..f1d8e48131263 100644
--- a/sycl/test-e2e/Reduction/reduction_usm.cpp
+++ b/sycl/test-e2e/Reduction/reduction_usm.cpp
@@ -52,7 +52,7 @@ int test(queue &Q, OptionalIdentity<T, HasIdentity> Identity, T Init,
        }
      };
 
-     auto In = InBuf.template get_access<access::mode::read>(CGH);
+     auto In = InBuf.template get_access<access_mode::read>(CGH);
      auto Redu = CreateReduction();
      CGH.parallel_for<USMKName<Name, class Test>>(
          NDRange, Redu, [=](nd_item<1> NDIt, auto &Sum) {
diff --git a/sycl/test-e2e/Reduction/reduction_usm_dw.cpp b/sycl/test-e2e/Reduction/reduction_usm_dw.cpp
index a3ca89baeea56..1342e6612f159 100644
--- a/sycl/test-e2e/Reduction/reduction_usm_dw.cpp
+++ b/sycl/test-e2e/Reduction/reduction_usm_dw.cpp
@@ -43,7 +43,7 @@ int test(queue &Q, T Identity, T Init, size_t WGSize, size_t NWItems,
 
   // Compute.
   Q.submit([&](handler &CGH) {
-     auto In = InBuf.template get_access<access::mode::read>(CGH);
+     auto In = InBuf.template get_access<access_mode::read>(CGH);
 
      auto Redu = reduction(ReduVarPtr, Identity, BOp,
                            {property::reduction::initialize_to_identity{}});
diff --git a/sycl/test-e2e/Reduction/reduction_utils.hpp b/sycl/test-e2e/Reduction/reduction_utils.hpp
index eeff47dd77c38..abca8de87da10 100644
--- a/sycl/test-e2e/Reduction/reduction_utils.hpp
+++ b/sycl/test-e2e/Reduction/reduction_utils.hpp
@@ -373,7 +373,7 @@ int testInner(queue &Q, OptionalIdentity<T, HasIdentity> Identity, T Init,
       }
     };
 
-    auto In = InBuf.template get_access<access::mode::read>(CGH);
+    auto In = InBuf.template get_access<access_mode::read>(CGH);
     auto Redu = CreateReduction();
     if constexpr (IsRange)
       CGH.parallel_for<Name>(Range, Redu, [=](item<Dims> Id, auto &Sum) {
@@ -484,7 +484,7 @@ int testUSMInner(queue &Q, OptionalIdentity<T, HasIdentity> Identity, T Init,
        }
      };
 
-     auto In = InBuf.template get_access<access::mode::read>(CGH);
+     auto In = InBuf.template get_access<access_mode::read>(CGH);
      auto Redu = CreateReduction();
      CGH.parallel_for<TName<Name, class Test>>(
          Range, Redu, [=](item<Dims> Id, auto &Sum) {
diff --git a/sycl/test-e2e/Regression/2020-spec-constants-debug-info.cpp b/sycl/test-e2e/Regression/2020-spec-constants-debug-info.cpp
index 9fbb08b0deda3..945885295449a 100644
--- a/sycl/test-e2e/Regression/2020-spec-constants-debug-info.cpp
+++ b/sycl/test-e2e/Regression/2020-spec-constants-debug-info.cpp
@@ -19,7 +19,7 @@ int main() {
   {
     sycl::buffer<double, 1> Buf{sycl::range{1}};
     q.submit([&](sycl::handler &cgh) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(cgh);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(cgh);
       cgh.set_specialization_constant<test_id_1>(1);
       cgh.single_task<class Kernel1>([=](sycl::kernel_handler kh) {
         Acc[0] = kh.get_specialization_constant<test_id_1>();
diff --git a/sycl/test-e2e/Regression/atomic_load.cpp b/sycl/test-e2e/Regression/atomic_load.cpp
index 3f5c31b9ad0f6..32c183de208c8 100644
--- a/sycl/test-e2e/Regression/atomic_load.cpp
+++ b/sycl/test-e2e/Regression/atomic_load.cpp
@@ -14,7 +14,7 @@ template <typename T> void kernel_func(T val) {
   buffer<T, 1> buf(&data, range<1>(1));
 
   testQueue.submit([&](handler &cgh) {
-    auto GlobAcc = buf.template get_access<access::mode::atomic>(cgh);
+    auto GlobAcc = buf.template get_access<access_mode::atomic>(cgh);
     cgh.single_task<class foo<T>>([=]() {
       auto a = GlobAcc[0];
       T var = a.load();
diff --git a/sycl/test-e2e/Regression/build_log.cpp b/sycl/test-e2e/Regression/build_log.cpp
index f395eef0e4729..eb9d01c075da4 100644
--- a/sycl/test-e2e/Regression/build_log.cpp
+++ b/sycl/test-e2e/Regression/build_log.cpp
@@ -87,39 +87,39 @@ void test() {
   buffer ah{&app_var_37, range(1)};
   buffer ai{&app_var_38, range(1)};
   b.submit([&](handler &aj) {
-    auto ak = c.get_access<access::mode::read>(aj);
-    auto al = d.get_access<access::mode::read>(aj);
-    auto am = e.get_access<access::mode::read>(aj);
-    auto an = f.get_access<access::mode::read>(aj);
-    auto ao = g.get_access<access::mode::read>(aj);
-    auto ap = h.get_access<access::mode::read>(aj);
-    auto aq = i.get_access<access::mode::read>(aj);
-    auto ar = j.get_access<access::mode::read>(aj);
-    auto as = k.get_access<access::mode::read>(aj);
-    auto at = l.get_access<access::mode::read>(aj);
-    auto au = m.get_access<access::mode::write>(aj);
-    auto av = n.get_access<access::mode::write>(aj);
-    auto aw = o.get_access<access::mode::write>(aj);
-    auto ax = p.get_access<access::mode::write>(aj);
-    auto ay = q.get_access<access::mode::write>(aj);
-    auto az = r.get_access<access::mode::write>(aj);
-    auto ba = s.get_access<access::mode::write>(aj);
-    auto bb = t.get_access<access::mode::write>(aj);
-    auto bc = u.get_access<access::mode::write>(aj);
-    auto bd = v.get_access<access::mode::write>(aj);
-    auto be = w.get_access<access::mode::write>(aj);
-    auto bf = x.get_access<access::mode::write>(aj);
-    auto bg = y.get_access<access::mode::write>(aj);
-    auto bh = z.get_access<access::mode::write>(aj);
-    auto bi = aa.get_access<access::mode::write>(aj);
-    auto bj = ab.get_access<access::mode::write>(aj);
-    auto bk = ac.get_access<access::mode::write>(aj);
-    auto bl = ad.get_access<access::mode::write>(aj);
-    auto bm = ae.get_access<access::mode::write>(aj);
-    auto bn = af.get_access<access::mode::write>(aj);
-    auto bo = ag.get_access<access::mode::write>(aj);
-    auto bp = ah.get_access<access::mode::write>(aj);
-    auto bq = ai.get_access<access::mode::write>(aj);
+    auto ak = c.get_access<access_mode::read>(aj);
+    auto al = d.get_access<access_mode::read>(aj);
+    auto am = e.get_access<access_mode::read>(aj);
+    auto an = f.get_access<access_mode::read>(aj);
+    auto ao = g.get_access<access_mode::read>(aj);
+    auto ap = h.get_access<access_mode::read>(aj);
+    auto aq = i.get_access<access_mode::read>(aj);
+    auto ar = j.get_access<access_mode::read>(aj);
+    auto as = k.get_access<access_mode::read>(aj);
+    auto at = l.get_access<access_mode::read>(aj);
+    auto au = m.get_access<access_mode::write>(aj);
+    auto av = n.get_access<access_mode::write>(aj);
+    auto aw = o.get_access<access_mode::write>(aj);
+    auto ax = p.get_access<access_mode::write>(aj);
+    auto ay = q.get_access<access_mode::write>(aj);
+    auto az = r.get_access<access_mode::write>(aj);
+    auto ba = s.get_access<access_mode::write>(aj);
+    auto bb = t.get_access<access_mode::write>(aj);
+    auto bc = u.get_access<access_mode::write>(aj);
+    auto bd = v.get_access<access_mode::write>(aj);
+    auto be = w.get_access<access_mode::write>(aj);
+    auto bf = x.get_access<access_mode::write>(aj);
+    auto bg = y.get_access<access_mode::write>(aj);
+    auto bh = z.get_access<access_mode::write>(aj);
+    auto bi = aa.get_access<access_mode::write>(aj);
+    auto bj = ab.get_access<access_mode::write>(aj);
+    auto bk = ac.get_access<access_mode::write>(aj);
+    auto bl = ad.get_access<access_mode::write>(aj);
+    auto bm = ae.get_access<access_mode::write>(aj);
+    auto bn = af.get_access<access_mode::write>(aj);
+    auto bo = ag.get_access<access_mode::write>(aj);
+    auto bp = ah.get_access<access_mode::write>(aj);
+    auto bq = ai.get_access<access_mode::write>(aj);
     aj.single_task<class br>([=] {
       au[0] = am[0];
       if (ao[0] ? as[0] ? ar[0] : 9 : ap[0])
diff --git a/sycl/test-e2e/Regression/commandlist/Inputs/FindPrimesSYCL.cpp b/sycl/test-e2e/Regression/commandlist/Inputs/FindPrimesSYCL.cpp
index 7e460f4cb73be..e2da59e61cfda 100644
--- a/sycl/test-e2e/Regression/commandlist/Inputs/FindPrimesSYCL.cpp
+++ b/sycl/test-e2e/Regression/commandlist/Inputs/FindPrimesSYCL.cpp
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include <string>
-constexpr sycl::access::mode sycl_read = sycl::access::mode::read;
-constexpr sycl::access::mode sycl_write = sycl::access::mode::write;
+constexpr sycl::access_mode sycl_read = sycl::access_mode::read;
+constexpr sycl::access_mode sycl_write = sycl::access_mode::write;
 
 using namespace std;
 
diff --git a/sycl/test-e2e/Regression/complex_global_object.cpp b/sycl/test-e2e/Regression/complex_global_object.cpp
index 4a34cdf968a1a..2fe355143ef04 100644
--- a/sycl/test-e2e/Regression/complex_global_object.cpp
+++ b/sycl/test-e2e/Regression/complex_global_object.cpp
@@ -18,7 +18,7 @@ class ComplexClass {
     sycl::queue Queue{Device};
     sycl::buffer<int, 1> Buf{sycl::range<1>{16}};
     Queue.submit([&](sycl::handler &CGH) {
-      auto Acc = Buf.get_access<sycl::access::mode::read_write>(CGH);
+      auto Acc = Buf.get_access<sycl::access_mode::read_write>(CGH);
       CGH.single_task<class Dummy>([=]() { Acc[0] = 42; });
     });
   }
diff --git a/sycl/test-e2e/Regression/event_destruction.cpp b/sycl/test-e2e/Regression/event_destruction.cpp
index 2d048824456c4..63e11c398c568 100644
--- a/sycl/test-e2e/Regression/event_destruction.cpp
+++ b/sycl/test-e2e/Regression/event_destruction.cpp
@@ -21,7 +21,7 @@ int main() {
   sycl::buffer<int, 1> Buf(1);
   for (size_t Idx = 0; Idx < ITERS; ++Idx) {
     auto Event = Q.submit([&](sycl::handler &cgh) {
-      auto Acc = Buf.get_access<sycl::access::mode::write>(cgh);
+      auto Acc = Buf.get_access<sycl::access_mode::write>(cgh);
       cgh.single_task([=]() { Acc[0] = 1; });
     });
     Event.wait();
diff --git a/sycl/test-e2e/Regression/fp16-with-unnamed-lambda.cpp b/sycl/test-e2e/Regression/fp16-with-unnamed-lambda.cpp
index 4686ccc76efc6..8f15a0fa7ba16 100644
--- a/sycl/test-e2e/Regression/fp16-with-unnamed-lambda.cpp
+++ b/sycl/test-e2e/Regression/fp16-with-unnamed-lambda.cpp
@@ -24,7 +24,7 @@ int main() {
   sycl::buffer<sycl::half> Buf(1);
 
   Q.submit([&](sycl::handler &CGH) {
-    auto Acc = Buf.get_access<sycl::access::mode::write>(CGH);
+    auto Acc = Buf.get_access<sycl::access_mode::write>(CGH);
     CGH.single_task([=]() { Acc[0] = 1; });
   });
 
diff --git a/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp b/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
index 4ffe42c45c52f..37fc4d5c074b6 100644
--- a/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
+++ b/sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp
@@ -29,7 +29,7 @@ int main() {
     buffer<int, 1> b(data, range<1>(3), {property::buffer::use_host_ptr()});
     queue q;
     q.submit([&](handler &cgh) {
-      auto B = b.get_access<access::mode::write>(cgh);
+      auto B = b.get_access<access_mode::write>(cgh);
       cgh.parallel_for<class test>(range<1>(3), [=](id<1> idx) { B[idx] = 1; });
     });
   }
diff --git a/sycl/test-e2e/Regression/fsycl-host-compiler.cpp b/sycl/test-e2e/Regression/fsycl-host-compiler.cpp
index bb08f7955da1f..cc3ba7ae21fbc 100644
--- a/sycl/test-e2e/Regression/fsycl-host-compiler.cpp
+++ b/sycl/test-e2e/Regression/fsycl-host-compiler.cpp
@@ -26,7 +26,7 @@ int main() {
     buffer<int, 1> b(data, range<1>(3), {property::buffer::use_host_ptr()});
     queue q;
     q.submit([&](handler &cgh) {
-      auto B = b.get_access<access::mode::write>(cgh);
+      auto B = b.get_access<access_mode::write>(cgh);
       cgh.parallel_for<class test>(range<1>(3), [=](id<1> idx) { B[idx] = 1; });
     });
   }
diff --git a/sycl/test-e2e/Regression/group.cpp b/sycl/test-e2e/Regression/group.cpp
index 5c1d256550c0c..837878fd1e9fe 100644
--- a/sycl/test-e2e/Regression/group.cpp
+++ b/sycl/test-e2e/Regression/group.cpp
@@ -40,7 +40,7 @@ bool group__get_group_range() {
     queue Q(AsyncHandler{});
 
     Q.submit([&](handler &cgh) {
-      auto Ptr = Buf.get_access<access::mode::write>(cgh);
+      auto Ptr = Buf.get_access<access_mode::write>(cgh);
 
       cgh.parallel_for<class group__get_group_range>(
           nd_range<3>{GlobalRange, LocalRange}, [=](nd_item<DIMS> I) {
@@ -106,7 +106,7 @@ bool group__get_linear_id() {
     queue Q(AsyncHandler{});
 
     Q.submit([&](handler &cgh) {
-      auto Ptr = Buf.get_access<access::mode::write>(cgh);
+      auto Ptr = Buf.get_access<access_mode::write>(cgh);
 
       cgh.parallel_for<class group__get_linear_id>(
           nd_range<3>{GlobalRange, LocalRange}, [=](nd_item<DIMS> I) {
@@ -184,7 +184,7 @@ bool group__async_work_group_copy() {
       queue Q(AsyncHandler{});
 
       Q.submit([&](handler &cgh) {
-        auto AccGlobal = Buf.get_access<access::mode::read_write>(cgh);
+        auto AccGlobal = Buf.get_access<access_mode::read_write>(cgh);
         local_accessor<DataType, DIMS> AccLocal(LocalRange, cgh);
 
         cgh.parallel_for<class group__async_work_group_copy>(
diff --git a/sycl/test-e2e/Regression/image_access.cpp b/sycl/test-e2e/Regression/image_access.cpp
index 901c78a86a939..eeb95d70a7af7 100644
--- a/sycl/test-e2e/Regression/image_access.cpp
+++ b/sycl/test-e2e/Regression/image_access.cpp
@@ -24,7 +24,7 @@ int main() {
     sycl::queue Queue;
 
     Queue.submit([&](sycl::handler &CGH) {
-      sycl::accessor<sycl::int4, 1, sycl::access::mode::read,
+      sycl::accessor<sycl::int4, 1, sycl::access_mode::read,
                      sycl::access::target::image,
                      sycl::access::placeholder::false_t>
           A(Image, CGH);
@@ -32,7 +32,7 @@ int main() {
     });
     Queue.wait_and_throw();
 
-    sycl::accessor<sycl::int4, 1, sycl::access::mode::read,
+    sycl::accessor<sycl::int4, 1, sycl::access_mode::read,
                    sycl::access::target::host_image,
                    sycl::access::placeholder::false_t>
         A(Image);
diff --git a/sycl/test-e2e/Regression/implicit_atomic_conversion.cpp b/sycl/test-e2e/Regression/implicit_atomic_conversion.cpp
index 00ea968a5b53f..c15d66965411f 100644
--- a/sycl/test-e2e/Regression/implicit_atomic_conversion.cpp
+++ b/sycl/test-e2e/Regression/implicit_atomic_conversion.cpp
@@ -12,7 +12,7 @@ void test_conversion(queue q) {
     buffer<int> in_buf(&init, 1);
 
     q.submit([&](handler &cgh) {
-      auto in = in_buf.template get_access<access::mode::atomic>(cgh);
+      auto in = in_buf.template get_access<access_mode::atomic>(cgh);
       cgh.single_task<class conversion>([=]() {
         sycl::atomic<int, access::address_space::global_space> atm = in[0];
         atm.store(42);
diff --git a/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp b/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp
index ee47211d8e232..f47b54f3f211c 100644
--- a/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp
+++ b/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp
@@ -23,7 +23,7 @@ int main() {
   {
     sycl::buffer<int, 1> Buf(&Ret, 1);
     Q.submit([&](sycl::handler &CGH) {
-      auto Acc = Buf.template get_access<sycl::access::mode::write>(CGH);
+      auto Acc = Buf.template get_access<sycl::access_mode::write>(CGH);
       CGH.set_specialization_constant<SpecConst>(42);
       CGH.single_task<class Kernel1>([=](sycl::kernel_handler H) {
         Acc[0] = H.get_specialization_constant<SpecConst>();
diff --git a/sycl/test-e2e/Regression/implicit_offset_debug_info.cpp b/sycl/test-e2e/Regression/implicit_offset_debug_info.cpp
index d54b81a60b097..15cbce2504e74 100644
--- a/sycl/test-e2e/Regression/implicit_offset_debug_info.cpp
+++ b/sycl/test-e2e/Regression/implicit_offset_debug_info.cpp
@@ -12,7 +12,7 @@ int main() {
   queue q;
   buffer<uint64_t, 1> t1(10);
   q.submit([&](handler &cgh) {
-    auto table = t1.get_access<access::mode::write>(cgh);
+    auto table = t1.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class kernel>(10,
                                    [=](id<1> gtid) { table[gtid] = gtid[0]; });
   });
diff --git a/sycl/test-e2e/Regression/isordered.cpp b/sycl/test-e2e/Regression/isordered.cpp
index 05ec9c0b73574..d53b5ae49b6ef 100644
--- a/sycl/test-e2e/Regression/isordered.cpp
+++ b/sycl/test-e2e/Regression/isordered.cpp
@@ -13,7 +13,7 @@ int main() {
   {
     sycl::buffer<int32_t, 1> buffer(&kernelResult[0], ndRng);
     testQueue.submit([&](sycl::handler &h) {
-      auto resultPtr = buffer.template get_access<sycl::access::mode::write>(h);
+      auto resultPtr = buffer.template get_access<sycl::access_mode::write>(h);
       h.single_task<class kernel>([=]() {
         float inputData_0F(0.1);
         float inputData_1F(0.5);
diff --git a/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp b/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp
index 61b2ca057fa04..f6f2df0b2886f 100644
--- a/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp
+++ b/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp
@@ -35,7 +35,7 @@ int main() {
 
   sycl::buffer<int, 1> Buf(sycl::range<1>{1});
   Q.submit([&](sycl::handler &CGH) {
-    auto Acc = Buf.get_access<sycl::access::mode::write>(CGH);
+    auto Acc = Buf.get_access<sycl::access_mode::write>(CGH);
     CGH.use_kernel_bundle(KernelBundle);
     CGH.single_task<KernelName>([=]() { Acc[0] = 42; });
   });
diff --git a/sycl/test-e2e/Regression/kernel_name_class.cpp b/sycl/test-e2e/Regression/kernel_name_class.cpp
index c4478d075bd89..80d431f346bad 100644
--- a/sycl/test-e2e/Regression/kernel_name_class.cpp
+++ b/sycl/test-e2e/Regression/kernel_name_class.cpp
@@ -68,7 +68,7 @@ struct Wrapper {
       // PD--
       // bool as kernel name
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<bool>([=]() { acc[0] += GOLD; });
       });
       ++NumTestCases;
@@ -76,7 +76,7 @@ struct Wrapper {
       // PI--
       // traditional in-place incomplete type
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<class KernelName>([=]() { acc[0] += GOLD; });
       });
       ++NumTestCases;
@@ -85,7 +85,7 @@ struct Wrapper {
       // a class completely defined within a namespace at
       // translation unit scope
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::nm2::KernelName0>([=]() { acc[0] += GOLD; });
       });
       ++NumTestCases;
@@ -96,7 +96,7 @@ struct Wrapper {
       // local scope
       class KernelName2;
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<KernelName2>([=]() { acc[0] += GOLD; });
       });
       ++NumTestCases;
@@ -107,7 +107,7 @@ struct Wrapper {
       // kernel name is a class defined in local scope
       class KernelName2a {};
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<KernelName2a>([=]() { acc[0] += GOLD; });
       });
       ++NumTestCases;
@@ -117,7 +117,7 @@ struct Wrapper {
       // an incomplete class forward-declared in a namespace at
       // translation unit scope
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName1>([=]() { acc[0] += GOLD; });
       });
       ++NumTestCases;
@@ -126,7 +126,7 @@ struct Wrapper {
       // an incomplete template specialization class with defined class as
       // argument declared in a namespace at translation unit scope
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName3<nm1::nm2::KernelName0>>(
             [=]() { acc[0] += GOLD; });
       });
@@ -136,7 +136,7 @@ struct Wrapper {
       // an incomplete template specialization class with incomplete class as
       // argument forward-declared in a namespace at translation unit scope
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName3<nm1::KernelName1>>(
             [=]() { acc[0] += GOLD; });
       });
@@ -146,7 +146,7 @@ struct Wrapper {
       // a defined template specialization class with defined class as argument
       // declared in a namespace at translation unit scope
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName4<nm1::nm2::KernelName0>>(
             [=]() { acc[0] += GOLD; });
       });
@@ -156,7 +156,7 @@ struct Wrapper {
       // a defined template specialization class with incomplete class as
       // argument forward-declared in a namespace at translation unit scope
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName4<nm1::KernelName1>>(
             [=]() { acc[0] += GOLD; });
       });
@@ -166,7 +166,7 @@ struct Wrapper {
       // an incomplete template specialization class with incomplete class as
       // argument forward-declared "in-place"
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName3<class KernelName5>>(
             [=]() { acc[0] += GOLD; });
       });
@@ -179,7 +179,7 @@ struct Wrapper {
       // argument forward-declared locally
       class KernelName6;
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName3<KernelName6>>(
             [=]() { acc[0] += GOLD; });
       });
@@ -190,7 +190,7 @@ struct Wrapper {
       // a defined template specialization class with incomplete class as
       // argument forward-declared "in-place"
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName4<class KernelName7>>(
             [=]() { acc[0] += GOLD; });
       });
@@ -202,7 +202,7 @@ struct Wrapper {
       // incomplete class as argument forward-declared locally
       class KernelName6a;
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName4<KernelName6a>>(
             [=]() { acc[0] += GOLD; });
       });
@@ -216,7 +216,7 @@ struct Wrapper {
       // defined locally
       class KernelName9 {};
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName4<KernelName9>>(
             [=]() { acc[0] += GOLD; });
       });
@@ -229,7 +229,7 @@ struct Wrapper {
       // an incomplete template specialization class with a defined class as
       // argument declared in the containing class
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName3<KN100>>([=]() { acc[0] += GOLD; });
       });
       ++NumTestCases;
@@ -241,7 +241,7 @@ struct Wrapper {
       // an incomplete template specialization class with an incomplete class as
       // argument declared in the containing class
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName3<KN101>>([=]() { acc[0] += GOLD; });
       });
       ++NumTestCases;
@@ -251,7 +251,7 @@ struct Wrapper {
       // translation unit scope with a defined class as argument declared in
       // a namespace at translation unit scope
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<nm1::KernelName10<nm1::nm2::KernelName11<10>>>(
             [=]() { acc[0] += GOLD; });
       });
@@ -262,7 +262,7 @@ struct Wrapper {
       // namespace at translation unit scope with a defined class as argument
       // declared in a namespace at translation unit scope
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task<KernelName12<nm1::nm2::KernelName11<10>>>(
             [=]() { acc[0] += GOLD; });
       });
diff --git a/sycl/test-e2e/Regression/kernel_unnamed.cpp b/sycl/test-e2e/Regression/kernel_unnamed.cpp
index bff1a8b82cc70..dec04158e73ef 100644
--- a/sycl/test-e2e/Regression/kernel_unnamed.cpp
+++ b/sycl/test-e2e/Regression/kernel_unnamed.cpp
@@ -18,7 +18,7 @@ static int NumTestCases = 0;
 template <class F>
 void foo(sycl::queue &deviceQueue, sycl::buffer<int, 1> &buf, F f) {
   deviceQueue.submit([&](sycl::handler &cgh) {
-    auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+    auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
     cgh.single_task([=]() { acc[0] = f(acc[0], GOLD); });
   });
 }
@@ -33,7 +33,7 @@ struct Wrapper {
       sycl::queue deviceQueue;
       sycl::buffer<int, 1> buf(arr, 1);
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task([=]() { acc[0] += GOLD; });
       });
       ++NumTestCases;
@@ -43,7 +43,7 @@ struct Wrapper {
       [] {}();
 #endif
       deviceQueue.submit([&](sycl::handler &cgh) {
-        auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+        auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
         cgh.single_task([=]() { acc[0] += GOLD; });
       });
       ++NumTestCases;
diff --git a/sycl/test-e2e/Regression/local-arg-align.cpp b/sycl/test-e2e/Regression/local-arg-align.cpp
index 718aa69f9bff6..71ddb2c9166e3 100644
--- a/sycl/test-e2e/Regression/local-arg-align.cpp
+++ b/sycl/test-e2e/Regression/local-arg-align.cpp
@@ -32,7 +32,7 @@ int main(int argc, char *argv[]) {
      local_accessor<cl_int, 1> a(1, h);
      local_accessor<float4, 1> b(1, h);
 
-     auto ares = res.get_access<access::mode::read_write>(h);
+     auto ares = res.get_access<access_mode::read_write>(h);
 
      // Manually capture kernel arguments to ensure an order with the int
      // argument first and the float4 argument second. If the two arguments are
diff --git a/sycl/test-e2e/Regression/mad_sat.cpp b/sycl/test-e2e/Regression/mad_sat.cpp
index 964997171672f..c7e683c07285c 100644
--- a/sycl/test-e2e/Regression/mad_sat.cpp
+++ b/sycl/test-e2e/Regression/mad_sat.cpp
@@ -27,7 +27,7 @@ int main() {
     sycl::buffer<inte64_x3, 1> buffer(1);
 
     testQueue.submit([&](sycl::handler &h) {
-      auto resultPtr = buffer.template get_access<sycl::access::mode::write>(h);
+      auto resultPtr = buffer.template get_access<sycl::access_mode::write>(h);
       h.single_task<class k3>([=]() {
         resultPtr[0] = sycl::mad_sat(inputData_0, inputData_1, inputData_2);
       });
@@ -51,7 +51,7 @@ int main() {
     sycl::buffer<inte64_x4, 1> buffer(1);
 
     testQueue.submit([&](sycl::handler &h) {
-      auto resultPtr = buffer.template get_access<sycl::access::mode::write>(h);
+      auto resultPtr = buffer.template get_access<sycl::access_mode::write>(h);
       h.single_task<class k4>([=]() {
         resultPtr[0] = sycl::mad_sat(inputData_0, inputData_1, inputData_2);
       });
@@ -82,7 +82,7 @@ int main() {
     sycl::buffer<inte64_x8, 1> buffer(1);
 
     testQueue.submit([&](sycl::handler &h) {
-      auto resultPtr = buffer.template get_access<sycl::access::mode::write>(h);
+      auto resultPtr = buffer.template get_access<sycl::access_mode::write>(h);
       h.single_task<class k8>([=]() {
         resultPtr[0] = sycl::mad_sat(inputData_0, inputData_1, inputData_2);
       });
@@ -125,7 +125,7 @@ int main() {
     sycl::buffer<inte64_x16, 1> buffer(1);
 
     testQueue.submit([&](sycl::handler &h) {
-      auto resultPtr = buffer.template get_access<sycl::access::mode::write>(h);
+      auto resultPtr = buffer.template get_access<sycl::access_mode::write>(h);
 
       h.single_task<class k16>([=]() {
         resultPtr[0] = sycl::mad_sat(inputData_0, inputData_1, inputData_2);
diff --git a/sycl/test-e2e/Regression/msvc_crt.cpp b/sycl/test-e2e/Regression/msvc_crt.cpp
index 9d59547e50d7b..fd299b06e0b9f 100644
--- a/sycl/test-e2e/Regression/msvc_crt.cpp
+++ b/sycl/test-e2e/Regression/msvc_crt.cpp
@@ -27,7 +27,7 @@ int main() {
     buffer<int, 1> b(data, range<1>(3), {property::buffer::use_host_ptr()});
     queue q;
     q.submit([&](handler &cgh) {
-      auto B = b.get_access<access::mode::write>(cgh);
+      auto B = b.get_access<access_mode::write>(cgh);
       cgh.parallel_for<class test>(range<1>(3), [=](id<1> idx) { B[idx] = 1; });
     });
   }
diff --git a/sycl/test-e2e/Regression/multiple-targets.cpp b/sycl/test-e2e/Regression/multiple-targets.cpp
index 7ccea010b8e4c..bef32697dba06 100644
--- a/sycl/test-e2e/Regression/multiple-targets.cpp
+++ b/sycl/test-e2e/Regression/multiple-targets.cpp
@@ -27,7 +27,7 @@ int main() {
     sycl::buffer<int, 1> A_Buf(A_Data, sycl::range<1>(10));
 
     Q.submit([&](sycl::handler &Cgh) {
-      auto A_Acc = A_Buf.get_access<sycl::access::mode::write>(Cgh);
+      auto A_Acc = A_Buf.get_access<sycl::access_mode::write>(Cgh);
       Cgh.parallel_for(sycl::range<1>{5},
                        [=](sycl::id<1> index) { A_Acc[index] = 5; });
     });
@@ -40,8 +40,8 @@ int main() {
     sycl::buffer<int, 1> C_Buf(C_Data, sycl::range<1>(10));
 
     Q.submit([&](sycl::handler &Cgh) {
-      auto B_Acc = B_Buf.get_access<sycl::access::mode::read_write>(Cgh);
-      auto C_Acc = C_Buf.get_access<sycl::access::mode::read>(Cgh);
+      auto B_Acc = B_Buf.get_access<sycl::access_mode::read_write>(Cgh);
+      auto C_Acc = C_Buf.get_access<sycl::access_mode::read>(Cgh);
       Cgh.parallel_for(sycl::range<1>{5}, [=](sycl::id<1> index) {
         B_Acc[index] += C_Acc[index];
       });
@@ -55,8 +55,8 @@ int main() {
     sycl::buffer<int, 1> C_Buf(C_Data, sycl::range<1>(10));
 
     Q.submit([&](sycl::handler &Cgh) {
-      auto B_Acc = B_Buf.get_access<sycl::access::mode::read>(Cgh);
-      auto C_Acc = C_Buf.get_access<sycl::access::mode::write>(Cgh);
+      auto B_Acc = B_Buf.get_access<sycl::access_mode::read>(Cgh);
+      auto C_Acc = C_Buf.get_access<sycl::access_mode::write>(Cgh);
       Cgh.parallel_for(sycl::range<1>{5},
                        [=](sycl::id<1> index) { C_Acc[index] = B_Acc[index]; });
     });
diff --git a/sycl/test-e2e/Regression/multithread_write_accessor.cpp b/sycl/test-e2e/Regression/multithread_write_accessor.cpp
index 4c854eb861b4b..8cb4e155cef68 100644
--- a/sycl/test-e2e/Regression/multithread_write_accessor.cpp
+++ b/sycl/test-e2e/Regression/multithread_write_accessor.cpp
@@ -21,7 +21,7 @@ class KernelA;
 void threadFunction(sycl::buffer<int, 1> &Buf) {
   sycl::queue Q;
   Q.submit([&](sycl::handler &Cgh) {
-    auto Acc = Buf.get_access<sycl::access::mode::read_write>(Cgh);
+    auto Acc = Buf.get_access<sycl::access_mode::read_write>(Cgh);
     Cgh.single_task<class KernelA>([=]() { Acc[0] += 1; });
   });
 }
diff --git a/sycl/test-e2e/Regression/nontrivial_device_copyable_value.cpp b/sycl/test-e2e/Regression/nontrivial_device_copyable_value.cpp
index 6c8c41292c2b8..ac6e1b0ab776b 100644
--- a/sycl/test-e2e/Regression/nontrivial_device_copyable_value.cpp
+++ b/sycl/test-e2e/Regression/nontrivial_device_copyable_value.cpp
@@ -28,7 +28,7 @@ int main() {
     buffer<int, 1> Buff{&Res, range<1>{1}};
 
     Q.submit([&](sycl::handler &cgh) {
-      auto Acc = Buff.get_access<access::mode::write>(cgh);
+      auto Acc = Buff.get_access<access_mode::write>(cgh);
       cgh.single_task<class Kernel>([=] { Acc[0] = C.i; });
     });
   }
diff --git a/sycl/test-e2e/Regression/private_array_init_test.cpp b/sycl/test-e2e/Regression/private_array_init_test.cpp
index 286204bf8e12f..7b54c0531f35b 100644
--- a/sycl/test-e2e/Regression/private_array_init_test.cpp
+++ b/sycl/test-e2e/Regression/private_array_init_test.cpp
@@ -30,7 +30,7 @@ int main() {
   {
     s::buffer<size_t, 1> buf(&data, s::range<1>(1));
     q.submit([&](s::handler &cgh) {
-      auto acc = buf.get_access<s::access::mode::read_write>(cgh);
+      auto acc = buf.get_access<s::access_mode::read_write>(cgh);
       cgh.single_task<class test>([=]() {
         // Test that SYCL program is not crashed if it contains a class/struct
         // that has private array member which is initialized by zeroes.
diff --git a/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp b/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp
index 46bbf02ee6881..2e85d201e021a 100644
--- a/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp
+++ b/sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp
@@ -26,7 +26,7 @@ int main() {
   buffer<int, 1> OutBuf(1);
   buffer<int, 1> InBuf(49 * 5);
   Q.submit([&](handler &CGH) {
-     auto In = InBuf.get_access<access::mode::read>(CGH);
+     auto In = InBuf.get_access<access_mode::read>(CGH);
      auto Redu = reduction(OutBuf, CGH, 0, BOp,
                            {property::reduction::initialize_to_identity{}});
      CGH.parallel_for<class DiscardSum>(
diff --git a/sycl/test-e2e/Regression/same_unnamed_kernels.cpp b/sycl/test-e2e/Regression/same_unnamed_kernels.cpp
index 13460332777ce..1c3bb044fa5ce 100644
--- a/sycl/test-e2e/Regression/same_unnamed_kernels.cpp
+++ b/sycl/test-e2e/Regression/same_unnamed_kernels.cpp
@@ -14,7 +14,7 @@
 template <typename F, typename B>
 void run(sycl::queue &q, B &buf, const F &func) {
   auto e = q.submit([&](sycl::handler &cgh) {
-    auto acc = buf.template get_access<sycl::access::mode::write>(cgh);
+    auto acc = buf.template get_access<sycl::access_mode::write>(cgh);
     cgh.single_task([=]() { func(acc); });
   });
   e.wait();
@@ -29,11 +29,11 @@ int main() {
   sycl::buffer<int, 1> bufB(B, 1);
 
   run(q, bufA,
-      [&](const sycl::accessor<int, 1, sycl::access::mode::write> &acc) {
+      [&](const sycl::accessor<int, 1, sycl::access_mode::write> &acc) {
         acc[0] = 0;
       });
   run(q, bufB,
-      [&](const sycl::accessor<int, 1, sycl::access::mode::write> &acc) {
+      [&](const sycl::accessor<int, 1, sycl::access_mode::write> &acc) {
         acc[0] *= 2;
       });
 
diff --git a/sycl/test-e2e/Regression/set-arg-local-accessor.cpp b/sycl/test-e2e/Regression/set-arg-local-accessor.cpp
index bd630da4343e3..09762d5f4e701 100644
--- a/sycl/test-e2e/Regression/set-arg-local-accessor.cpp
+++ b/sycl/test-e2e/Regression/set-arg-local-accessor.cpp
@@ -53,7 +53,7 @@ int main() {
   buffer<cl_int, 1> b(init, N_wg);
 
   Q.submit([&](handler &cgh) {
-    auto acc_global = b.get_access<access::mode::write>(cgh);
+    auto acc_global = b.get_access<access_mode::write>(cgh);
     local_accessor<float, 1> acc_local(N_slm, cgh);
 
     cgh.set_arg(0, acc_global);
diff --git a/sycl/test-e2e/Regression/static-buffer-dtor.cpp b/sycl/test-e2e/Regression/static-buffer-dtor.cpp
index 82633f4cfb047..39e3c911c162c 100644
--- a/sycl/test-e2e/Regression/static-buffer-dtor.cpp
+++ b/sycl/test-e2e/Regression/static-buffer-dtor.cpp
@@ -24,7 +24,7 @@ int main() {
                                           sycl::range<1>(256)};
   sycl::queue q;
   q.submit([&](sycl::handler &cgh) {
-    auto acc = bufs[0].get_access<sycl::access::mode::write>(cgh);
+    auto acc = bufs[0].get_access<sycl::access_mode::write>(cgh);
     cgh.single_task([=]() {
       for (int i = 0; i < 256; i++) {
         acc[i] = 24;
@@ -33,7 +33,7 @@ int main() {
   });
 
   q.submit([&](sycl::handler &cgh) {
-    auto acc = bufs[1].get_access<sycl::access::mode::write>(cgh);
+    auto acc = bufs[1].get_access<sycl::access_mode::write>(cgh);
     cgh.single_task([=]() {
       for (int i = 0; i < 256; i++) {
         acc[i] = 25;
diff --git a/sycl/test-e2e/Sampler/basic-rw-float.cpp b/sycl/test-e2e/Sampler/basic-rw-float.cpp
index 43ec0a2fdade3..c4c3ed36b07a0 100644
--- a/sycl/test-e2e/Sampler/basic-rw-float.cpp
+++ b/sycl/test-e2e/Sampler/basic-rw-float.cpp
@@ -37,7 +37,7 @@ void test_rw(image_channel_order ChanOrder, image_channel_type ChanType) {
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -51,8 +51,8 @@ void test_rw(image_channel_order ChanOrder, image_channel_type ChanType) {
     buffer<pixelT, 1> testResults((range<1>(numTests)));
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_Unorm_Linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/basic-rw.cpp b/sycl/test-e2e/Sampler/basic-rw.cpp
index 66789e0d560a8..71f3b913fd293 100644
--- a/sycl/test-e2e/Sampler/basic-rw.cpp
+++ b/sycl/test-e2e/Sampler/basic-rw.cpp
@@ -47,7 +47,7 @@ void test_rw(image_channel_order ChanOrder, image_channel_type ChanType) {
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -61,8 +61,8 @@ void test_rw(image_channel_order ChanOrder, image_channel_type ChanType) {
     buffer<pixelT, 1> testResults((range<1>(numTests)));
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_Unorm_Linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/normalized-clamp-linear-float.cpp b/sycl/test-e2e/Sampler/normalized-clamp-linear-float.cpp
index ebd04c2b11946..b7ed3593c9c79 100644
--- a/sycl/test-e2e/Sampler/normalized-clamp-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/normalized-clamp-linear-float.cpp
@@ -62,7 +62,7 @@ void test_normalized_clamp_linear_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -80,8 +80,8 @@ void test_normalized_clamp_linear_sampler(image_channel_order ChanOrder,
         sampler(normalized, addressing_mode::clamp, linear);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_norm_linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/normalized-clamp-nearest.cpp b/sycl/test-e2e/Sampler/normalized-clamp-nearest.cpp
index 03d6fb2dcbcbb..159d1c2760248 100644
--- a/sycl/test-e2e/Sampler/normalized-clamp-nearest.cpp
+++ b/sycl/test-e2e/Sampler/normalized-clamp-nearest.cpp
@@ -48,7 +48,7 @@ void test_normalized_clamp_nearest_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -66,8 +66,8 @@ void test_normalized_clamp_nearest_sampler(image_channel_order ChanOrder,
         sampler(normalized, addressing_mode::clamp, nearest);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_norm_nearest>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/normalized-clampedge-linear-float.cpp b/sycl/test-e2e/Sampler/normalized-clampedge-linear-float.cpp
index 8c9605f52a90f..1a7d2d9312be4 100644
--- a/sycl/test-e2e/Sampler/normalized-clampedge-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/normalized-clampedge-linear-float.cpp
@@ -61,7 +61,7 @@ void test_normalized_clampedge_linear_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -79,8 +79,8 @@ void test_normalized_clampedge_linear_sampler(image_channel_order ChanOrder,
         sampler(normalized, clamp_edge, linear);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_norm_linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/normalized-clampedge-nearest.cpp b/sycl/test-e2e/Sampler/normalized-clampedge-nearest.cpp
index 0a15fde4db2fb..575065d3636ad 100644
--- a/sycl/test-e2e/Sampler/normalized-clampedge-nearest.cpp
+++ b/sycl/test-e2e/Sampler/normalized-clampedge-nearest.cpp
@@ -51,7 +51,7 @@ void test_normalized_clampedge_nearest_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -69,8 +69,8 @@ void test_normalized_clampedge_nearest_sampler(image_channel_order ChanOrder,
         sampler(normalized, clamp_edge, nearest);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_norm_nearest>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/normalized-mirror-linear-float.cpp b/sycl/test-e2e/Sampler/normalized-mirror-linear-float.cpp
index 50b204671f3c8..9387a1216b855 100644
--- a/sycl/test-e2e/Sampler/normalized-mirror-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/normalized-mirror-linear-float.cpp
@@ -65,7 +65,7 @@ void test_normalized_mirrored_linear_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -82,8 +82,8 @@ void test_normalized_mirrored_linear_sampler(image_channel_order ChanOrder,
     auto Norm_Mirror_Linear_sampler = sampler(normalized, mirrored, linear);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_norm_linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/normalized-mirror-nearest.cpp b/sycl/test-e2e/Sampler/normalized-mirror-nearest.cpp
index 94eb84064ca8b..530bcbcee47e3 100644
--- a/sycl/test-e2e/Sampler/normalized-mirror-nearest.cpp
+++ b/sycl/test-e2e/Sampler/normalized-mirror-nearest.cpp
@@ -60,7 +60,7 @@ void test_normalized_mirrored_nearest_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -77,8 +77,8 @@ void test_normalized_mirrored_nearest_sampler(image_channel_order ChanOrder,
     auto Norm_Mirror_Nearest_sampler = sampler(normalized, mirrored, nearest);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_norm_nearest>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/normalized-none-linear-float.cpp b/sycl/test-e2e/Sampler/normalized-none-linear-float.cpp
index 5348e08a3257c..3ea8728d83335 100644
--- a/sycl/test-e2e/Sampler/normalized-none-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/normalized-none-linear-float.cpp
@@ -59,7 +59,7 @@ void test_normalized_none_linear_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -76,8 +76,8 @@ void test_normalized_none_linear_sampler(image_channel_order ChanOrder,
     auto Norm_None_Linear_sampler = sampler(normalized, none, linear);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_norm_linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/normalized-none-nearest.cpp b/sycl/test-e2e/Sampler/normalized-none-nearest.cpp
index ff2ccf987d4df..b08b252fcf928 100644
--- a/sycl/test-e2e/Sampler/normalized-none-nearest.cpp
+++ b/sycl/test-e2e/Sampler/normalized-none-nearest.cpp
@@ -52,7 +52,7 @@ void test_normalized_none_nearest_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -69,8 +69,8 @@ void test_normalized_none_nearest_sampler(image_channel_order ChanOrder,
     auto Norm_None_Nearest_sampler = sampler(normalized, none, nearest);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_norm_nearest>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/normalized-repeat-linear-float.cpp b/sycl/test-e2e/Sampler/normalized-repeat-linear-float.cpp
index c4155118c68da..55fb376516c5a 100644
--- a/sycl/test-e2e/Sampler/normalized-repeat-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/normalized-repeat-linear-float.cpp
@@ -64,7 +64,7 @@ void test_normalized_repeat_linear_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -81,8 +81,8 @@ void test_normalized_repeat_linear_sampler(image_channel_order ChanOrder,
     auto Norm_Repeat_Linear_sampler = sampler(normalized, repeat, linear);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_norm_linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/normalized-repeat-nearest.cpp b/sycl/test-e2e/Sampler/normalized-repeat-nearest.cpp
index ecd9a8f0b333e..486e2e9b1bff2 100644
--- a/sycl/test-e2e/Sampler/normalized-repeat-nearest.cpp
+++ b/sycl/test-e2e/Sampler/normalized-repeat-nearest.cpp
@@ -57,7 +57,7 @@ void test_normalized_repeat_nearest_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -74,8 +74,8 @@ void test_normalized_repeat_nearest_sampler(image_channel_order ChanOrder,
     auto Norm_Repeat_Nearest_sampler = sampler(normalized, repeat, nearest);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_norm_nearest>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/unnormalized-clamp-linear-float.cpp b/sycl/test-e2e/Sampler/unnormalized-clamp-linear-float.cpp
index 3fd60031f632a..1c725eb35d4e1 100644
--- a/sycl/test-e2e/Sampler/unnormalized-clamp-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-clamp-linear-float.cpp
@@ -56,7 +56,7 @@ void test_unnormalized_clamp_linear_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -74,8 +74,8 @@ void test_unnormalized_clamp_linear_sampler(image_channel_order ChanOrder,
         sampler(unnormalized, addressing_mode::clamp, linear);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_Unorm_Linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/unnormalized-clamp-nearest.cpp b/sycl/test-e2e/Sampler/unnormalized-clamp-nearest.cpp
index 21b79344bca9d..6eb32879e72fe 100644
--- a/sycl/test-e2e/Sampler/unnormalized-clamp-nearest.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-clamp-nearest.cpp
@@ -46,7 +46,7 @@ void test_unnormalized_clamp_nearest_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -64,8 +64,8 @@ void test_unnormalized_clamp_nearest_sampler(image_channel_order ChanOrder,
         sampler(unnormalized, addressing_mode::clamp, nearest);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_Unorm_Linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/unnormalized-clampedge-linear-float.cpp b/sycl/test-e2e/Sampler/unnormalized-clampedge-linear-float.cpp
index 63d3c060269ba..8e8d738320b85 100644
--- a/sycl/test-e2e/Sampler/unnormalized-clampedge-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-clampedge-linear-float.cpp
@@ -55,7 +55,7 @@ void test_unnormalized_clampedge_linear_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -73,8 +73,8 @@ void test_unnormalized_clampedge_linear_sampler(image_channel_order ChanOrder,
         sampler(unnormalized, clamp_edge, linear);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_Unorm_Linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/unnormalized-clampedge-nearest.cpp b/sycl/test-e2e/Sampler/unnormalized-clampedge-nearest.cpp
index c1e6d0da6c6f8..3fdcc7f372965 100644
--- a/sycl/test-e2e/Sampler/unnormalized-clampedge-nearest.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-clampedge-nearest.cpp
@@ -48,7 +48,7 @@ void test_unnormalized_clampedge_nearest_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -66,8 +66,8 @@ void test_unnormalized_clampedge_nearest_sampler(image_channel_order ChanOrder,
         sampler(unnormalized, clamp_edge, nearest);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_Unorm_Linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/unnormalized-none-linear-float.cpp b/sycl/test-e2e/Sampler/unnormalized-none-linear-float.cpp
index e51bc4ba1b8ad..dcb604fed9b0b 100644
--- a/sycl/test-e2e/Sampler/unnormalized-none-linear-float.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-none-linear-float.cpp
@@ -70,7 +70,7 @@ void test_unnormalized_none_linear_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -87,8 +87,8 @@ void test_unnormalized_none_linear_sampler(image_channel_order ChanOrder,
     auto UnNorm_None_Linear_sampler = sampler(unnormalized, none, linear);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_Unorm_Linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Sampler/unnormalized-none-nearest.cpp b/sycl/test-e2e/Sampler/unnormalized-none-nearest.cpp
index 1efb39ce40259..85d22a4b7b582 100644
--- a/sycl/test-e2e/Sampler/unnormalized-none-nearest.cpp
+++ b/sycl/test-e2e/Sampler/unnormalized-none-nearest.cpp
@@ -47,7 +47,7 @@ void test_unnormalized_none_nearest_sampler(image_channel_order ChanOrder,
     // - create an image
     image<1> image_1D(ChanOrder, ChanType, ImgRange_1D);
     event E_Setup = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::write>(cgh);
       cgh.single_task<class setupUnormLinear>([=]() {
         image_acc.write(0, leftEdge);
         image_acc.write(1, body);
@@ -64,8 +64,8 @@ void test_unnormalized_none_nearest_sampler(image_channel_order ChanOrder,
     auto UnNorm_None_Nearest_sampler = sampler(unnormalized, none, nearest);
 
     event E_Test = Q.submit([&](handler &cgh) {
-      auto image_acc = image_1D.get_access<pixelT, access::mode::read>(cgh);
-      auto test_acc = testResults.get_access<access::mode::write>(cgh);
+      auto image_acc = image_1D.get_access<pixelT, access_mode::read>(cgh);
+      auto test_acc = testResults.get_access<access_mode::write>(cgh);
 
       cgh.single_task<class im1D_Unorm_Linear>([=]() {
         int i = 0; // the index for writing into the testResult buffer.
diff --git a/sycl/test-e2e/Scheduler/BasicSchedulerTests.cpp b/sycl/test-e2e/Scheduler/BasicSchedulerTests.cpp
index a644c9c9a95ae..ae4b094732671 100644
--- a/sycl/test-e2e/Scheduler/BasicSchedulerTests.cpp
+++ b/sycl/test-e2e/Scheduler/BasicSchedulerTests.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-using sycl_access_mode = sycl::access::mode;
+using sycl_access_mode = sycl::access_mode;
 
 // Execute functor provided passing a queue created with default device selector
 // and async handler then waits for the tasks submitted to queue to finish. If
diff --git a/sycl/test-e2e/Scheduler/CommandCleanupThreadSafety.cpp b/sycl/test-e2e/Scheduler/CommandCleanupThreadSafety.cpp
index e112428e2ddb6..24e01f7f727a0 100644
--- a/sycl/test-e2e/Scheduler/CommandCleanupThreadSafety.cpp
+++ b/sycl/test-e2e/Scheduler/CommandCleanupThreadSafety.cpp
@@ -16,7 +16,7 @@ class Foo;
 
 event submitTask(queue &Q, buffer<int, 1> &Buf) {
   return Q.submit([&](handler &Cgh) {
-    auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
+    auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
     Cgh.single_task<Foo>([=]() { Acc[0] = 42; });
   });
 }
diff --git a/sycl/test-e2e/Scheduler/DataMovement.cpp b/sycl/test-e2e/Scheduler/DataMovement.cpp
index c06f11fef7c59..fb4a1fc35fba9 100644
--- a/sycl/test-e2e/Scheduler/DataMovement.cpp
+++ b/sycl/test-e2e/Scheduler/DataMovement.cpp
@@ -18,7 +18,7 @@
 
 #include "../helpers.hpp"
 
-using sycl_access_mode = sycl::access::mode;
+using sycl_access_mode = sycl::access_mode;
 
 template <typename T> class CustomAllocator {
 public:
diff --git a/sycl/test-e2e/Scheduler/DeleteCmdException.cpp b/sycl/test-e2e/Scheduler/DeleteCmdException.cpp
index 6ff7fc9c9e89b..82a9441f77fe8 100644
--- a/sycl/test-e2e/Scheduler/DeleteCmdException.cpp
+++ b/sycl/test-e2e/Scheduler/DeleteCmdException.cpp
@@ -27,7 +27,7 @@ void test_exception(sycl::queue &q, sycl::buffer<int, 1> &buf,
 
     // Will throw when submitted
     q.submit([&](sycl::handler &cgh) {
-       auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+       auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
        cgh.parallel_for(illegal_range, [=](sycl::nd_item<1> nd_item) {
          acc[nd_item.get_global_linear_id()] = 42; // will not be reached
        });
diff --git a/sycl/test-e2e/Scheduler/HostAccDestruction.cpp b/sycl/test-e2e/Scheduler/HostAccDestruction.cpp
index 30e98974b5f1d..84a12be35bdd9 100644
--- a/sycl/test-e2e/Scheduler/HostAccDestruction.cpp
+++ b/sycl/test-e2e/Scheduler/HostAccDestruction.cpp
@@ -20,7 +20,7 @@ int main() {
     sycl::queue q;
     auto host_acc = buf.get_host_access();
     q.submit([&](sycl::handler &cgh) {
-      auto acc = buf.get_access<sycl::access::mode::read_write>(cgh);
+      auto acc = buf.get_access<sycl::access_mode::read_write>(cgh);
       cgh.parallel_for<class SingleTask>(
           sycl::range<1>{size}, [=](sycl::id<1> id) { (void)acc[id]; });
     });
diff --git a/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp b/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp
index 6f5d4cdbe602e..fbecc4b7ad45b 100644
--- a/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp
+++ b/sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp
@@ -16,7 +16,7 @@ class KernelA;
 
 void submitKernel(sycl::queue &Queue, sycl::buffer<int, 1> &Buf) {
   Queue.submit([&](sycl::handler &Cgh) {
-    auto BufAcc = Buf.get_access<sycl::access::mode::read_write>(Cgh);
+    auto BufAcc = Buf.get_access<sycl::access_mode::read_write>(Cgh);
     Cgh.single_task<KernelA>([=]() { (void)BufAcc[0]; });
   });
 }
diff --git a/sycl/test-e2e/Scheduler/MemObjRemapping.cpp b/sycl/test-e2e/Scheduler/MemObjRemapping.cpp
index 55181dfbcc565..d72c7470ba492 100644
--- a/sycl/test-e2e/Scheduler/MemObjRemapping.cpp
+++ b/sycl/test-e2e/Scheduler/MemObjRemapping.cpp
@@ -21,7 +21,7 @@ int main() {
   buffer<int, 1> BufA{Range};
 
   Q.submit([&](handler &Cgh) {
-    auto AccA = BufA.get_access<access::mode::read_write>(Cgh);
+    auto AccA = BufA.get_access<access_mode::read_write>(Cgh);
     Cgh.parallel_for<Foo>(Range, [=](id<1> Idx) { AccA[Idx] = Idx[0]; });
   });
 
@@ -29,7 +29,7 @@ int main() {
     // Check access mode flags
     // CHECK: <--- urEnqueueMemBufferMap
     // CHECK: .mapFlags = UR_MAP_FLAG_READ
-    auto AccA = BufA.get_access<access::mode::read>();
+    auto AccA = BufA.get_access<access_mode::read>();
     for (std::size_t I = 0; I < Size; ++I) {
       assert(AccA[I] == I);
     }
@@ -38,13 +38,13 @@ int main() {
     // CHECK: <--- urEnqueueMemUnmap
     // CHECK: <--- urEnqueueMemBufferMap
     // CHECK: .mapFlags = UR_MAP_FLAG_READ | UR_MAP_FLAG_WRITE
-    auto AccA = BufA.get_access<access::mode::write>();
+    auto AccA = BufA.get_access<access_mode::write>();
     for (std::size_t I = 0; I < Size; ++I)
       AccA[I] = 2 * I;
   }
 
   // CHECK-NOT: <--- urEnqueueMemBufferMap
-  auto AccA = BufA.get_access<access::mode::read>();
+  auto AccA = BufA.get_access<access_mode::read>();
   for (std::size_t I = 0; I < Size; ++I) {
     assert(AccA[I] == 2 * I);
   }
diff --git a/sycl/test-e2e/Scheduler/MultipleDevices.cpp b/sycl/test-e2e/Scheduler/MultipleDevices.cpp
index f848ce79ab9a4..2974c200c818b 100644
--- a/sycl/test-e2e/Scheduler/MultipleDevices.cpp
+++ b/sycl/test-e2e/Scheduler/MultipleDevices.cpp
@@ -24,21 +24,21 @@ int multidevice_test(queue MyQueue1, queue MyQueue2) {
   buffer<int, 1> BufD(range<1>{N});
 
   MyQueue1.submit([&](handler &cgh) {
-    auto A = BufA.get_access<access::mode::write>(cgh);
+    auto A = BufA.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class init_a>(
         range<1>{N}, [=](id<1> index) { A[index[0]] = index[0]; });
   });
 
   MyQueue2.submit([&](handler &cgh) {
-    auto B = BufB.get_access<access::mode::write>(cgh);
+    auto B = BufB.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class init_b>(
         range<1>{N}, [=](id<1> index) { B[index[0]] = N - index[0]; });
   });
 
   MyQueue2.submit([&](handler &cgh) {
-    auto A = BufA.get_access<access::mode::read>(cgh);
-    auto B = BufB.get_access<access::mode::read_write>(cgh);
-    auto C = BufC.get_access<access::mode::write>(cgh);
+    auto A = BufA.get_access<access_mode::read>(cgh);
+    auto B = BufB.get_access<access_mode::read_write>(cgh);
+    auto C = BufC.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class op1>(range<1>{N}, [=](id<1> index) {
       B[index[0]] = B[index[0]] + A[index[0]];
       C[index[0]] = B[index[0]] - index[0];
@@ -46,15 +46,15 @@ int multidevice_test(queue MyQueue1, queue MyQueue2) {
   });
 
   MyQueue2.submit([&](handler &cgh) {
-    auto D = BufD.get_access<access::mode::write>(cgh);
+    auto D = BufD.get_access<access_mode::write>(cgh);
     cgh.parallel_for<class init_d>(range<1>{N},
                                    [=](id<1> index) { D[index[0]] = 1; });
   });
 
   MyQueue1.submit([&](handler &cgh) {
-    auto B = BufB.get_access<access::mode::read>(cgh);
-    auto C = BufC.get_access<access::mode::read>(cgh);
-    auto D = BufD.get_access<access::mode::read_write>(cgh);
+    auto B = BufB.get_access<access_mode::read>(cgh);
+    auto C = BufC.get_access<access_mode::read>(cgh);
+    auto D = BufD.get_access<access_mode::read_write>(cgh);
     cgh.parallel_for<class op2>(range<1>{N}, [=](id<1> index) {
       D[index[0]] = D[index[0]] + B[index[0]] - C[index[0]];
     });
diff --git a/sycl/test-e2e/Scheduler/ReleaseResourcesTest.cpp b/sycl/test-e2e/Scheduler/ReleaseResourcesTest.cpp
index 355f1a19e3c48..42323cf034069 100644
--- a/sycl/test-e2e/Scheduler/ReleaseResourcesTest.cpp
+++ b/sycl/test-e2e/Scheduler/ReleaseResourcesTest.cpp
@@ -14,7 +14,7 @@
 
 #include "../helpers.hpp"
 
-using sycl_access_mode = sycl::access::mode;
+using sycl_access_mode = sycl::access_mode;
 
 int main() {
   bool Failed = false;
diff --git a/sycl/test-e2e/SubGroup/barrier.cpp b/sycl/test-e2e/SubGroup/barrier.cpp
index f009b98432b87..3af81618e519b 100644
--- a/sycl/test-e2e/SubGroup/barrier.cpp
+++ b/sycl/test-e2e/SubGroup/barrier.cpp
@@ -28,8 +28,8 @@ template <typename T> void check(queue &Queue, size_t G = 240, size_t L = 60) {
     buffer<T> addbuf(data.data(), range<1>(G));
     buffer<size_t> sgsizebuf(1);
     Queue.submit([&](handler &cgh) {
-      auto addacc = addbuf.template get_access<access::mode::read_write>(cgh);
-      auto sgsizeacc = sgsizebuf.get_access<access::mode::read_write>(cgh);
+      auto addacc = addbuf.template get_access<access_mode::read_write>(cgh);
+      auto sgsizeacc = sgsizebuf.get_access<access_mode::read_write>(cgh);
 
       cgh.parallel_for<sycl_subgr<T>>(NdRange, [=](nd_item<1> NdItem) {
         sycl::sub_group SG = NdItem.get_sub_group();
diff --git a/sycl/test-e2e/SubGroup/broadcast.hpp b/sycl/test-e2e/SubGroup/broadcast.hpp
index a4a9736aa2eac..b2ca9d644a2ac 100644
--- a/sycl/test-e2e/SubGroup/broadcast.hpp
+++ b/sycl/test-e2e/SubGroup/broadcast.hpp
@@ -17,8 +17,8 @@ template <typename T> void check(queue &Queue) {
     buffer<T> syclbuf(G);
     buffer<size_t> sgsizebuf(1);
     Queue.submit([&](handler &cgh) {
-      auto syclacc = syclbuf.template get_access<access::mode::read_write>(cgh);
-      auto sgsizeacc = sgsizebuf.get_access<access::mode::read_write>(cgh);
+      auto syclacc = syclbuf.template get_access<access_mode::read_write>(cgh);
+      auto sgsizeacc = sgsizebuf.get_access<access_mode::read_write>(cgh);
       cgh.parallel_for<sycl_subgr<T>>(NdRange, [=](nd_item<1> NdItem) {
         sycl::sub_group SG = NdItem.get_sub_group();
         /*Broadcast GID of element with SGLID == SGID % SGMLR*/
diff --git a/sycl/test-e2e/SubGroup/common.cpp b/sycl/test-e2e/SubGroup/common.cpp
index dfa5808b46ff2..0fb0df8fd4535 100644
--- a/sycl/test-e2e/SubGroup/common.cpp
+++ b/sycl/test-e2e/SubGroup/common.cpp
@@ -27,8 +27,8 @@ void check(queue &Queue, unsigned int G, unsigned int L) {
     buffer<struct Data, 1> syclbuf(G);
     buffer<size_t> sgsizebuf(1);
     Queue.submit([&](handler &cgh) {
-      auto sgsizeacc = sgsizebuf.get_access<access::mode::read_write>(cgh);
-      auto syclacc = syclbuf.get_access<access::mode::read_write>(cgh);
+      auto sgsizeacc = sgsizebuf.get_access<access_mode::read_write>(cgh);
+      auto syclacc = syclbuf.get_access<access_mode::read_write>(cgh);
       cgh.parallel_for<class sycl_subgr>(NdRange, [=](nd_item<1> NdItem) {
         sycl::sub_group SG = NdItem.get_sub_group();
         syclacc[NdItem.get_global_id()].local_id = SG.get_local_id().get(0);
diff --git a/sycl/test-e2e/SubGroup/generic_reduce.cpp b/sycl/test-e2e/SubGroup/generic_reduce.cpp
index bca6342a2b0b1..f6d77198257ba 100644
--- a/sycl/test-e2e/SubGroup/generic_reduce.cpp
+++ b/sycl/test-e2e/SubGroup/generic_reduce.cpp
@@ -27,8 +27,8 @@ void check_op(queue &Queue, T init, BinaryOperation op, bool skip_init = false,
     buffer<T> buf(G);
     buffer<size_t> sgsizebuf(1);
     Queue.submit([&](handler &cgh) {
-      auto sgsizeacc = sgsizebuf.get_access<access::mode::read_write>(cgh);
-      auto acc = buf.template get_access<access::mode::read_write>(cgh);
+      auto sgsizeacc = sgsizebuf.get_access<access_mode::read_write>(cgh);
+      auto acc = buf.template get_access<access_mode::read_write>(cgh);
       cgh.parallel_for(NdRange, [=](nd_item<1> NdItem) {
         auto sg = NdItem.get_sub_group();
         if (skip_init) {
diff --git a/sycl/test-e2e/SubGroup/info.cpp b/sycl/test-e2e/SubGroup/info.cpp
index bc97ad8959fc4..cd80970096f7a 100644
--- a/sycl/test-e2e/SubGroup/info.cpp
+++ b/sycl/test-e2e/SubGroup/info.cpp
@@ -34,9 +34,9 @@ int main() {
     buffer<float, 2> ABuf{GlobalRange}, BBuf{GlobalRange}, CBuf{GlobalRange};
 
     Queue.submit([&](sycl::handler &cgh) {
-      auto A = ABuf.get_access<access::mode::read_write>(cgh);
-      auto B = BBuf.get_access<access::mode::read>(cgh);
-      auto C = CBuf.get_access<access::mode::read>(cgh);
+      auto A = ABuf.get_access<access_mode::read_write>(cgh);
+      auto B = BBuf.get_access<access_mode::read>(cgh);
+      auto C = CBuf.get_access<access_mode::read>(cgh);
       cgh.parallel_for<kernel_sg>(
           nd_range<2>(GlobalRange, range<2>(10, 20)), [=](nd_item<2> index) {
             const id<2> GlobalID = index.get_global_id();
diff --git a/sycl/test-e2e/SubGroup/reduce.hpp b/sycl/test-e2e/SubGroup/reduce.hpp
index 514f07cd0f54a..c122618c9413d 100644
--- a/sycl/test-e2e/SubGroup/reduce.hpp
+++ b/sycl/test-e2e/SubGroup/reduce.hpp
@@ -20,8 +20,8 @@ void check_op(queue &Queue, T init, BinaryOperation op, bool skip_init = false,
     buffer<T> buf(G);
     buffer<size_t> sgsizebuf(1);
     Queue.submit([&](handler &cgh) {
-      auto sgsizeacc = sgsizebuf.get_access<access::mode::read_write>(cgh);
-      auto acc = buf.template get_access<access::mode::read_write>(cgh);
+      auto sgsizeacc = sgsizebuf.get_access<access_mode::read_write>(cgh);
+      auto acc = buf.template get_access<access_mode::read_write>(cgh);
       cgh.parallel_for<SpecializationKernelName>(
           NdRange, [=](nd_item<1> NdItem) {
             sycl::sub_group sg = NdItem.get_sub_group();
diff --git a/sycl/test-e2e/SubGroup/scan.hpp b/sycl/test-e2e/SubGroup/scan.hpp
index 241b5d8a711e0..804bb8205533a 100644
--- a/sycl/test-e2e/SubGroup/scan.hpp
+++ b/sycl/test-e2e/SubGroup/scan.hpp
@@ -22,9 +22,9 @@ void check_op(queue &Queue, T init, BinaryOperation op, bool skip_init = false,
     buffer<T> exbuf(G), inbuf(G);
     buffer<size_t> sgsizebuf(1);
     Queue.submit([&](handler &cgh) {
-      auto sgsizeacc = sgsizebuf.get_access<access::mode::read_write>(cgh);
-      auto exacc = exbuf.template get_access<access::mode::read_write>(cgh);
-      auto inacc = inbuf.template get_access<access::mode::read_write>(cgh);
+      auto sgsizeacc = sgsizebuf.get_access<access_mode::read_write>(cgh);
+      auto exacc = exbuf.template get_access<access_mode::read_write>(cgh);
+      auto inacc = inbuf.template get_access<access_mode::read_write>(cgh);
       cgh.parallel_for<SpecializationKernelName>(
           NdRange, [=](nd_item<1> NdItem) {
             sycl::sub_group sg = NdItem.get_sub_group();
diff --git a/sycl/test-e2e/SubGroup/vote.cpp b/sycl/test-e2e/SubGroup/vote.cpp
index 5fb9ac0066194..37dd2d025baaa 100644
--- a/sycl/test-e2e/SubGroup/vote.cpp
+++ b/sycl/test-e2e/SubGroup/vote.cpp
@@ -22,8 +22,8 @@ void check(queue Queue, const int G, const int L, const int D, const int R) {
 
     // Initialise buffer with zeros
     Queue.submit([&](handler &cgh) {
-      auto sganyacc = sganybuf.get_access<access::mode::read_write>(cgh);
-      auto sgallacc = sgallbuf.get_access<access::mode::read_write>(cgh);
+      auto sganyacc = sganybuf.get_access<access_mode::read_write>(cgh);
+      auto sgallacc = sgallbuf.get_access<access_mode::read_write>(cgh);
       cgh.parallel_for<class init>(range<1>{(unsigned)G}, [=](id<1> index) {
         sganyacc[index] = 0;
         sgallacc[index] = 0;
@@ -31,8 +31,8 @@ void check(queue Queue, const int G, const int L, const int D, const int R) {
     });
 
     Queue.submit([&](handler &cgh) {
-      auto sganyacc = sganybuf.get_access<access::mode::read_write>(cgh);
-      auto sgallacc = sgallbuf.get_access<access::mode::read_write>(cgh);
+      auto sganyacc = sganybuf.get_access<access_mode::read_write>(cgh);
+      auto sgallacc = sgallbuf.get_access<access_mode::read_write>(cgh);
       cgh.parallel_for<class init_bufs>(NdRange, [=](nd_item<1> NdItem) {
         sganyacc[NdItem.get_global_id()] = 0;
         sgallacc[NdItem.get_global_id()] = 0;
@@ -40,8 +40,8 @@ void check(queue Queue, const int G, const int L, const int D, const int R) {
     });
 
     Queue.submit([&](handler &cgh) {
-      auto sganyacc = sganybuf.get_access<access::mode::read_write>(cgh);
-      auto sgallacc = sgallbuf.get_access<access::mode::read_write>(cgh);
+      auto sganyacc = sganybuf.get_access<access_mode::read_write>(cgh);
+      auto sgallacc = sgallbuf.get_access<access_mode::read_write>(cgh);
       cgh.parallel_for<class subgr>(NdRange, [=](nd_item<1> NdItem) {
         sycl::sub_group SG = NdItem.get_sub_group();
         /* Set to 1 if any local ID in subgroup devided by D has remainder R */
diff --git a/sycl/test-e2e/SubGroupMask/Basic.cpp b/sycl/test-e2e/SubGroupMask/Basic.cpp
index 040403d2f4afd..9de9a6d496b9d 100644
--- a/sycl/test-e2e/SubGroupMask/Basic.cpp
+++ b/sycl/test-e2e/SubGroupMask/Basic.cpp
@@ -36,7 +36,7 @@ int main() {
       buffer resbuf(&Res, range<1>(1));
 
       Queue.submit([&](handler &cgh) {
-        auto resacc = resbuf.get_access<access::mode::read_write>(cgh);
+        auto resacc = resbuf.get_access<access_mode::read_write>(cgh);
 
         cgh.parallel_for<class sub_group_mask_test>(
             NdRange, [=](nd_item<1> NdItem) [[sycl::reqd_sub_group_size(32)]] {
diff --git a/sycl/test-e2e/SubGroupMask/GroupSize.cpp b/sycl/test-e2e/SubGroupMask/GroupSize.cpp
index ff8f7e7fec634..aa7760df51f66 100644
--- a/sycl/test-e2e/SubGroupMask/GroupSize.cpp
+++ b/sycl/test-e2e/SubGroupMask/GroupSize.cpp
@@ -38,7 +38,7 @@ template <size_t SGSize> void test(queue Queue) {
       buffer resbuf(Res, range<1>(32 / SGSize));
 
       Queue.submit([&](handler &cgh) {
-        auto resacc = resbuf.template get_access<access::mode::read_write>(cgh);
+        auto resacc = resbuf.template get_access<access_mode::read_write>(cgh);
 
         cgh.parallel_for<sycl_subgr<SGSize>>(
             NdRange,
diff --git a/sycl/test-e2e/Tracing/buffer_printers.cpp b/sycl/test-e2e/Tracing/buffer_printers.cpp
index d712b0009c1ae..4905526b90631 100644
--- a/sycl/test-e2e/Tracing/buffer_printers.cpp
+++ b/sycl/test-e2e/Tracing/buffer_printers.cpp
@@ -27,9 +27,9 @@ int main() {
     buffer<int, 2> DstBuffer(DstData.data(), range<2>(Height, Width));
 
     Queue.submit([&](handler &CGH) {
-      auto Read = SrcBuffer.get_access<access::mode::read>(
+      auto Read = SrcBuffer.get_access<access_mode::read>(
           CGH, range<2>(Height, Width), id(Height, Width));
-      auto Write = DstBuffer.get_access<access::mode::write>(CGH);
+      auto Write = DstBuffer.get_access<access_mode::write>(CGH);
       CGH.copy(Read, Write);
     });
   }
@@ -44,7 +44,7 @@ int main() {
     sycl::buffer<int, 1> SubBuf(Buf, Size / 2, 8);
 
     Queue.submit([&](sycl::handler &CGH) {
-      auto Acc = SubBuf.get_access<sycl::access::mode::write>(CGH);
+      auto Acc = SubBuf.get_access<sycl::access_mode::write>(CGH);
       CGH.single_task<class empty_task>([=]() {});
     });
   }
diff --git a/sycl/test-e2e/Tracing/image_printers.cpp b/sycl/test-e2e/Tracing/image_printers.cpp
index 6d8a5be459e6a..87d68c0cb8892 100644
--- a/sycl/test-e2e/Tracing/image_printers.cpp
+++ b/sycl/test-e2e/Tracing/image_printers.cpp
@@ -21,7 +21,7 @@ int main() {
   const sycl::image_channel_order ChanOrder = sycl::image_channel_order::rgba;
   const sycl::image_channel_type ChanType = sycl::image_channel_type::fp32;
 
-  constexpr auto SYCLWrite = sycl::access::mode::write;
+  constexpr auto SYCLWrite = sycl::access_mode::write;
 
   const sycl::range<2> ImgSize(4, 4);
 
diff --git a/sycl/test-e2e/USM/fill.cpp b/sycl/test-e2e/USM/fill.cpp
index c4033e4672591..1afcdd4d0c5d4 100644
--- a/sycl/test-e2e/USM/fill.cpp
+++ b/sycl/test-e2e/USM/fill.cpp
@@ -113,7 +113,7 @@ void runDeviceTests(device dev, context ctxt, queue q, T val) {
   {
     buffer<T, 1> buf{&out[0], range<1>{N}};
     q.submit([&](handler &h) {
-       auto acc = buf.template get_access<access::mode::write>(h);
+       auto acc = buf.template get_access<access_mode::write>(h);
        h.parallel_for<usm_device_transfer<T>>(
            range<1>(N), [=](id<1> item) { acc[item] = array[item]; });
      }).wait();
@@ -134,7 +134,7 @@ void runDeviceTests(device dev, context ctxt, queue q, T val) {
   {
     buffer<T, 1> buf{&out[0], range<1>{N}};
     q.submit([&](handler &h) {
-       auto acc = buf.template get_access<access::mode::write>(h);
+       auto acc = buf.template get_access<access_mode::write>(h);
        h.parallel_for<usm_aligned_device_transfer<T>>(
            range<1>(N), [=](id<1> item) { acc[item] = array[item]; });
      }).wait();
diff --git a/sycl/test-e2e/USM/free_during_kernel_execution.cpp b/sycl/test-e2e/USM/free_during_kernel_execution.cpp
index 8fd28516f9036..d0ce5715da3b7 100644
--- a/sycl/test-e2e/USM/free_during_kernel_execution.cpp
+++ b/sycl/test-e2e/USM/free_during_kernel_execution.cpp
@@ -23,7 +23,7 @@ int main() {
   auto *USM = sycl::malloc_host<int>(1, Queue.get_context());
 
   Queue.submit([&](sycl::handler &cgh) {
-    auto Accessor = Buffer.get_access<sycl::access::mode::write>(cgh);
+    auto Accessor = Buffer.get_access<sycl::access_mode::write>(cgh);
     cgh.single_task<KernelA>([=]() {
       for (int I = 0; I < N; ++I) {
         Accessor[I] = I;
diff --git a/sycl/test-e2e/USM/math.cpp b/sycl/test-e2e/USM/math.cpp
index 5c7b9265e26b2..ea9d4ff2a6c30 100644
--- a/sycl/test-e2e/USM/math.cpp
+++ b/sycl/test-e2e/USM/math.cpp
@@ -78,7 +78,7 @@ int main() {
         int *BufI = (int *)s::malloc_shared(
             sizeof(int) * 2, myQueue.get_device(), myQueue.get_context());
         myQueue.submit([&](s::handler &cgh) {
-          auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
+          auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
           cgh.single_task<class lgamma_rF1PI1>([=]() {
             AccR[0] = s::lgamma_r(
                 float{10.f},
@@ -103,7 +103,7 @@ int main() {
         int *BufI = (int *)s::malloc_shared(
             sizeof(int) * 2, myQueue.get_device(), myQueue.get_context());
         myQueue.submit([&](s::handler &cgh) {
-          auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
+          auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
           cgh.single_task<class lgamma_rF1PI1_neg>([=]() {
             AccR[0] = s::lgamma_r(
                 float{-2.4f},
@@ -128,7 +128,7 @@ int main() {
         s::int2 *BufI = (s::int2 *)s::malloc_shared(
             sizeof(s::int2) * 2, myQueue.get_device(), myQueue.get_context());
         myQueue.submit([&](s::handler &cgh) {
-          auto AccR = BufR.get_access<s::access::mode::read_write>(cgh);
+          auto AccR = BufR.get_access<s::access_mode::read_write>(cgh);
           cgh.single_task<class lgamma_rF2PF2>([=]() {
             AccR[0] = s::lgamma_r(
                 s::float2{10.f, -2.4f},
diff --git a/sycl/test-e2e/USM/memcpy.cpp b/sycl/test-e2e/USM/memcpy.cpp
index c12dcde5fcb66..65a8094cf921d 100644
--- a/sycl/test-e2e/USM/memcpy.cpp
+++ b/sycl/test-e2e/USM/memcpy.cpp
@@ -43,7 +43,7 @@ void check_on_device(queue q, int *arr) {
   {
     buffer<int, 1> buf{&out[0], range<1>{N}};
     q.submit([&](handler &h) {
-       auto acc = buf.template get_access<access::mode::write>(h);
+       auto acc = buf.template get_access<access_mode::write>(h);
        h.parallel_for<class usm_device_transfer>(
            range<1>(N), [=](id<1> item) { acc[item] = arr[item]; });
      }).wait();
diff --git a/sycl/test-e2e/USM/memset.cpp b/sycl/test-e2e/USM/memset.cpp
index 3f80088dc12b5..e073a979ac347 100644
--- a/sycl/test-e2e/USM/memset.cpp
+++ b/sycl/test-e2e/USM/memset.cpp
@@ -84,7 +84,7 @@ int main() {
     {
       buffer<char, 1> buf{&out[0], range<1>{N}};
       q.submit([&](handler &h) {
-        auto acc = buf.template get_access<access::mode::write>(h);
+        auto acc = buf.template get_access<access_mode::write>(h);
         h.parallel_for<class usm_device_transfer>(
             range<1>(N), [=](id<1> item) { acc[item] = array[item]; });
       });
@@ -109,7 +109,7 @@ int main() {
     {
       buffer<char, 1> buf{&out[0], range<1>{N}};
       q.submit([&](handler &h) {
-        auto acc = buf.template get_access<access::mode::write>(h);
+        auto acc = buf.template get_access<access_mode::write>(h);
         h.parallel_for<class usm_aligned_device_transfer>(
             range<1>(N), [=](id<1> item) { acc[item] = array[item]; });
       });
diff --git a/sycl/test-e2e/WeakObject/weak_object_utils.hpp b/sycl/test-e2e/WeakObject/weak_object_utils.hpp
index aa6a9a280bfa4..3f222260e4a32 100644
--- a/sycl/test-e2e/WeakObject/weak_object_utils.hpp
+++ b/sycl/test-e2e/WeakObject/weak_object_utils.hpp
@@ -53,9 +53,9 @@ template <template <typename> typename CallableT> void runTest(sycl::queue Q) {
   sycl::accessor PAcc1D{Buf1D, sycl::read_write};
   sycl::accessor PAcc2D{Buf2D, sycl::read_write};
   sycl::accessor PAcc3D{Buf3D, sycl::read_write};
-  sycl::host_accessor<int, 1, sycl::access::mode::read_write> HAcc1D;
-  sycl::host_accessor<int, 2, sycl::access::mode::read_write> HAcc2D;
-  sycl::host_accessor<int, 3, sycl::access::mode::read_write> HAcc3D;
+  sycl::host_accessor<int, 1, sycl::access_mode::read_write> HAcc1D;
+  sycl::host_accessor<int, 2, sycl::access_mode::read_write> HAcc2D;
+  sycl::host_accessor<int, 3, sycl::access_mode::read_write> HAcc3D;
   sycl::host_accessor<int, 1> HAcc1D_2020;
   sycl::host_accessor<int, 2> HAcc2D_2020;
   sycl::host_accessor<int, 3> HAcc3D_2020;
@@ -203,12 +203,12 @@ void runTestMulti(sycl::queue Q1) {
   sycl::accessor PAcc2D2{Buf2D2, sycl::read_write};
   sycl::accessor PAcc3D1{Buf3D1, sycl::read_write};
   sycl::accessor PAcc3D2{Buf3D2, sycl::read_write};
-  sycl::host_accessor<int, 1, sycl::access::mode::read_write> HAcc1D1;
-  sycl::host_accessor<int, 1, sycl::access::mode::read_write> HAcc1D2;
-  sycl::host_accessor<int, 2, sycl::access::mode::read_write> HAcc2D1;
-  sycl::host_accessor<int, 2, sycl::access::mode::read_write> HAcc2D2;
-  sycl::host_accessor<int, 3, sycl::access::mode::read_write> HAcc3D1;
-  sycl::host_accessor<int, 3, sycl::access::mode::read_write> HAcc3D2;
+  sycl::host_accessor<int, 1, sycl::access_mode::read_write> HAcc1D1;
+  sycl::host_accessor<int, 1, sycl::access_mode::read_write> HAcc1D2;
+  sycl::host_accessor<int, 2, sycl::access_mode::read_write> HAcc2D1;
+  sycl::host_accessor<int, 2, sycl::access_mode::read_write> HAcc2D2;
+  sycl::host_accessor<int, 3, sycl::access_mode::read_write> HAcc3D1;
+  sycl::host_accessor<int, 3, sycl::access_mode::read_write> HAcc3D2;
   sycl::host_accessor<int, 1> HAcc1D1_2020;
   sycl::host_accessor<int, 2> HAcc2D1_2020;
   sycl::host_accessor<int, 3> HAcc3D1_2020;
diff --git a/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_local_accessor.cpp b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_local_accessor.cpp
index f84f09ba75b36..7d70ff592f90d 100644
--- a/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_local_accessor.cpp
+++ b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_local_accessor.cpp
@@ -69,7 +69,7 @@ int main() {
   buffer<int, 1> Buf{Vec.data(), range<1>(Size)};
 
   Q.submit([&](handler &Cgh) {
-    auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
+    auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
     sycl_ext::work_group_scratch_size static_size(WgSize * RepeatWG *
                                                   sizeof(int));
     sycl_ext::properties properties{static_size};
diff --git a/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_ptr_alias.cpp b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_ptr_alias.cpp
index 0572e699e145e..3bdd1d72a99d7 100644
--- a/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_ptr_alias.cpp
+++ b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_alloc_ptr_alias.cpp
@@ -63,7 +63,7 @@ int main() {
   buffer<int, 1> Buf{Vec.data(), range<1>(Size)};
 
   Q.submit([&](handler &Cgh) {
-    auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
+    auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
     sycl_ext::work_group_scratch_size static_size(WgSize * RepeatWG *
                                                   sizeof(int));
     sycl_ext::properties properties{static_size};
diff --git a/sycl/test-e2e/WorkGroupScratchMemory/dynamic_allocation.cpp b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_allocation.cpp
index 6c7373691c45d..8f6cffd6aa392 100644
--- a/sycl/test-e2e/WorkGroupScratchMemory/dynamic_allocation.cpp
+++ b/sycl/test-e2e/WorkGroupScratchMemory/dynamic_allocation.cpp
@@ -58,7 +58,7 @@ int main() {
   buffer<int, 1> Buf{Vec.data(), range<1>(Size)};
 
   Q.submit([&](handler &Cgh) {
-    auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
+    auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
     sycl_ext::work_group_scratch_size static_size(WgSize * RepeatWG *
                                                   sizeof(int));
     sycl_ext::properties properties{static_size};
diff --git a/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_block_scope.cpp b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_block_scope.cpp
index b09327ff7f3e0..a6db7a906952b 100644
--- a/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_block_scope.cpp
+++ b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_block_scope.cpp
@@ -42,7 +42,7 @@ int main() {
     buffer<int, 1> Buf{Vec.data(), range<1>(Size)};
 
     Q.submit([&](handler &Cgh) {
-      auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
+      auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
       Cgh.parallel_for<KernelA>(
           nd_range<1>(range<1>(Size), range<1>(WgSize)), [=](nd_item<1> Item) {
             sycl::ext::oneapi::experimental::work_group_static<int[WgSize]>
@@ -68,7 +68,7 @@ int main() {
     buffer<int, 1> Buf{Vec.data(), range<1>(Size)};
 
     Q.submit([&](handler &Cgh) {
-      auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
+      auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
       Cgh.parallel_for<KernelB>(
           nd_range<1>(range<1>(Size), range<1>(WgSize)), [=](nd_item<1> Item) {
             sycl::ext::oneapi::experimental::work_group_static<int> localIDBuff;
diff --git a/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_class_scope.cpp b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_class_scope.cpp
index 64920b8a78719..f341885a789f1 100644
--- a/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_class_scope.cpp
+++ b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_class_scope.cpp
@@ -50,7 +50,7 @@ int main() {
     buffer<int, 1> Buf{Vec.data(), range<1>(Size)};
 
     Q.submit([&](handler &Cgh) {
-      auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
+      auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
       Cgh.parallel_for<KernelA>(
           nd_range<1>(range<1>(Size), range<1>(WgSize)), [=](nd_item<1> Item) {
             LocalMem::localIDBuff[Item.get_local_linear_id()] =
@@ -74,7 +74,7 @@ int main() {
     buffer<int, 1> Buf{Vec.data(), range<1>(Size)};
 
     Q.submit([&](handler &Cgh) {
-      auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
+      auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
       Cgh.parallel_for<KernelB>(
           nd_range<1>(range<1>(Size), range<1>(WgSize)), [=](nd_item<1> Item) {
             sycl::ext::oneapi::experimental::work_group_static<int> localIDBuff;
diff --git a/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_namespace_scope.cpp b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_namespace_scope.cpp
index ec18d9652c09b..bec79ae41b6fe 100644
--- a/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_namespace_scope.cpp
+++ b/sycl/test-e2e/WorkGroupStatic/work_group_static_memory_namespace_scope.cpp
@@ -44,7 +44,7 @@ int main() {
     buffer<int, 1> Buf{Vec.data(), range<1>(Size)};
 
     Q.submit([&](handler &Cgh) {
-      auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
+      auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
       Cgh.parallel_for<KernelA>(
           nd_range<1>(range<1>(Size), range<1>(WgSize)), [=](nd_item<1> Item) {
             localIDBuff[Item.get_local_linear_id()] =
@@ -68,7 +68,7 @@ int main() {
     buffer<int, 1> Buf{Vec.data(), range<1>(Size)};
 
     Q.submit([&](handler &Cgh) {
-      auto Acc = Buf.get_access<access::mode::read_write>(Cgh);
+      auto Acc = Buf.get_access<access_mode::read_write>(Cgh);
       Cgh.parallel_for<KernelB>(
           nd_range<1>(range<1>(Size), range<1>(WgSize)), [=](nd_item<1> Item) {
             sycl::ext::oneapi::experimental::work_group_static<int> localIDBuff;
diff --git a/sycl/test-e2e/XPTI/buffer/accessors.cpp b/sycl/test-e2e/XPTI/buffer/accessors.cpp
index 2bac9a54b2403..62746fbceccbc 100644
--- a/sycl/test-e2e/XPTI/buffer/accessors.cpp
+++ b/sycl/test-e2e/XPTI/buffer/accessors.cpp
@@ -31,9 +31,9 @@ int main() {
     auto A2 = Buf.get_access<mode::write>(cgh);
     // CHECK: {{[0-9]+}}|Construct accessor|0x0|[[ACCID3:.*]]|2016|1026|{{.*}}accessors.cpp:[[# @LINE + 1]]:34
     sycl::local_accessor<int, 1> A3(Range, cgh);
-    // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID4:.*]]|2014|1027|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
+    // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID4:.*]]|2014|1025|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
     auto A4 = Buf.get_access<mode::discard_write>(cgh);
-    // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID5:.*]]|2014|1028|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
+    // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID5:.*]]|2014|1026|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
     auto A5 = Buf.get_access<mode::discard_read_write, target::device>(cgh);
     // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID6:.*]]|2014|1029|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
     auto A6 = Buf.get_access<mode::atomic>(cgh);
@@ -52,10 +52,14 @@ int main() {
   { sycl::host_accessor HA(Buf, sycl::write_only); }
   // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID9:.*]]|2018|1026|{{.*}}accessors.cpp:[[# @LINE + 1]]:25
   { sycl::host_accessor HA(Buf, sycl::read_write); }
-  // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID10:.*]]|2018|1027|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
-  { auto HA = Buf.get_access<mode::discard_write>(); }
-  // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID11:.*]]|2018|1028|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
-  { auto HA = Buf.get_access<mode::discard_read_write>(); }
+  // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID10:.*]]|2018|1025|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
+  {
+    auto HA = Buf.get_access<mode::discard_write>();
+  }
+  // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID11:.*]]|2018|1026|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
+  {
+    auto HA = Buf.get_access<mode::discard_read_write>();
+  }
   // CHECK: {{[0-9]+}}|Construct accessor|[[BUFFERID]]|[[ACCID12:.*]]|2018|1029|{{.*}}accessors.cpp:[[# @LINE + 1]]:19
   { auto HA = Buf.get_access<mode::atomic>(); }
 
diff --git a/sycl/test-e2e/XPTI/buffer/host_array.cpp b/sycl/test-e2e/XPTI/buffer/host_array.cpp
index b2c56dd14528d..2ec80a6764588 100644
--- a/sycl/test-e2e/XPTI/buffer/host_array.cpp
+++ b/sycl/test-e2e/XPTI/buffer/host_array.cpp
@@ -24,7 +24,7 @@ int main() {
     // CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
     Queue.submit([&](sycl::handler &cgh) {
       // Get write only access to the buffer on a device.
-      auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
+      auto Accessor1 = Buffer1.get_access<sycl::access_mode::write>(cgh);
       // Execute kernel.
       cgh.parallel_for<class FillBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {
         Accessor1[WIid] = static_cast<int>(WIid.get(0));
diff --git a/sycl/test-e2e/XPTI/buffer/in_cycle.cpp b/sycl/test-e2e/XPTI/buffer/in_cycle.cpp
index f639f33eec731..8286a2eeca7cf 100644
--- a/sycl/test-e2e/XPTI/buffer/in_cycle.cpp
+++ b/sycl/test-e2e/XPTI/buffer/in_cycle.cpp
@@ -22,7 +22,7 @@ bool func(sycl::queue &Queue, int depth = 0) {
   // Submit command group(work) to queue.
   Queue.submit([&](sycl::handler &cgh) {
     // Get write only access to the buffer on a device.
-    auto Accessor = Buffer.get_access<sycl::access::mode::write>(cgh);
+    auto Accessor = Buffer.get_access<sycl::access_mode::write>(cgh);
     // Execute kernel.
     cgh.parallel_for<class FillBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {
       Accessor[WIid] = static_cast<int>(WIid.get(0));
diff --git a/sycl/test-e2e/XPTI/buffer/multiple_buffers.cpp b/sycl/test-e2e/XPTI/buffer/multiple_buffers.cpp
index a7b5358007698..bd9db0ff85953 100644
--- a/sycl/test-e2e/XPTI/buffer/multiple_buffers.cpp
+++ b/sycl/test-e2e/XPTI/buffer/multiple_buffers.cpp
@@ -26,8 +26,8 @@ int main() {
   // CHECK:{{[0-9]+}}|Associate buffer|[[USERID2]]|[[BEID2:.*]]
   Queue.submit([&](sycl::handler &cgh) {
     // Get write only access to the buffer on a device.
-    auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
-    auto Accessor2 = Buffer2.get_access<sycl::access::mode::write>(cgh);
+    auto Accessor1 = Buffer1.get_access<sycl::access_mode::write>(cgh);
+    auto Accessor2 = Buffer2.get_access<sycl::access_mode::write>(cgh);
     // Execute kernel.
     cgh.parallel_for<class FillBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {
       Accessor1[WIid] = static_cast<short>(WIid.get(0));
diff --git a/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp b/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp
index 434fed2206019..b110a932a272e 100644
--- a/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp
+++ b/sycl/test-e2e/XPTI/buffer/multiple_queues.cpp
@@ -29,7 +29,7 @@ int main() {
 
     Queue1.submit([&](sycl::handler &cgh) {
       // CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID1:.*]]|2014|1025|{{.*}}multiple_queues.cpp:[[# @LINE + 1]]:32
-      auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
+      auto Accessor1 = Buffer1.get_access<sycl::access_mode::write>(cgh);
       // CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
       cgh.parallel_for<class FillBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {
         Accessor1[WIid] = static_cast<int>(WIid.get(0));
@@ -39,7 +39,7 @@ int main() {
 
     Queue2.submit([&](sycl::handler &cgh) {
       // CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID2:.*]]|2014|1025|{{.*}}multiple_queues.cpp:[[# @LINE + 1]]:32
-      auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
+      auto Accessor1 = Buffer1.get_access<sycl::access_mode::write>(cgh);
       // CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID2:.*]]
       cgh.parallel_for<class MulBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {
         Accessor1[WIid] *= static_cast<int>(WIid.get(0));
diff --git a/sycl/test-e2e/XPTI/buffer/recursion.cpp b/sycl/test-e2e/XPTI/buffer/recursion.cpp
index 8182f1fd09ebd..78f36c54c6917 100644
--- a/sycl/test-e2e/XPTI/buffer/recursion.cpp
+++ b/sycl/test-e2e/XPTI/buffer/recursion.cpp
@@ -22,7 +22,7 @@ bool func(sycl::queue &Queue, int depth = 0) {
   // Submit command group(work) to queue.
   Queue.submit([&](sycl::handler &cgh) {
     // Get write only access to the buffer on a device.
-    auto Accessor = Buffer.get_access<sycl::access::mode::write>(cgh);
+    auto Accessor = Buffer.get_access<sycl::access_mode::write>(cgh);
     // Execute kernel.
     cgh.parallel_for<class FillBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {
       Accessor[WIid] = static_cast<int>(WIid.get(0));
diff --git a/sycl/test-e2e/XPTI/buffer/sub_buffer.cpp b/sycl/test-e2e/XPTI/buffer/sub_buffer.cpp
index 0a225a138981c..157645b8d951a 100644
--- a/sycl/test-e2e/XPTI/buffer/sub_buffer.cpp
+++ b/sycl/test-e2e/XPTI/buffer/sub_buffer.cpp
@@ -25,7 +25,7 @@ int main() {
 
     Queue.submit([&](sycl::handler &cgh) {
       // CHECK: {{[0-9]+}}|Construct accessor|[[USERID1]]|[[ACCID1:.*]]|2014|1025|{{.*}}sub_buffer.cpp:[[# @LINE + 1]]:34
-      auto Accessor1 = SubBuffer.get_access<sycl::access::mode::write>(cgh);
+      auto Accessor1 = SubBuffer.get_access<sycl::access_mode::write>(cgh);
       // CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
       // CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID2:.*]]
       cgh.parallel_for<class FillBuffer>(
diff --git a/sycl/test-e2e/XPTI/buffer/use_host_ptr.cpp b/sycl/test-e2e/XPTI/buffer/use_host_ptr.cpp
index a06e34fe878b1..2b4ecae0a373f 100644
--- a/sycl/test-e2e/XPTI/buffer/use_host_ptr.cpp
+++ b/sycl/test-e2e/XPTI/buffer/use_host_ptr.cpp
@@ -25,7 +25,7 @@ int main() {
     // CHECK:{{[0-9]+}}|Associate buffer|[[USERID1]]|[[BEID1:.*]]
     Queue.submit([&](sycl::handler &cgh) {
       // Get write only access to the buffer on a device.
-      auto Accessor1 = Buffer1.get_access<sycl::access::mode::write>(cgh);
+      auto Accessor1 = Buffer1.get_access<sycl::access_mode::write>(cgh);
       // Execute kernel.
       cgh.parallel_for<class FillBuffer>(NumOfWorkItems, [=](sycl::id<1> WIid) {
         Accessor1[WIid] = static_cast<int>(WIid.get(0));
diff --git a/sycl/test-e2e/XPTI/kernel/content.cpp b/sycl/test-e2e/XPTI/kernel/content.cpp
index f17e2defa5893..3df834749b5e7 100644
--- a/sycl/test-e2e/XPTI/kernel/content.cpp
+++ b/sycl/test-e2e/XPTI/kernel/content.cpp
@@ -46,8 +46,8 @@ int main() {
     buffer<int> in_buf(input.data(), input.size());
     buffer<int> out_buf(input.size());
     myQueue.submit([&](handler &cgh) {
-      auto in = in_buf.template get_access<access::mode::read>(cgh);
-      auto out = out_buf.template get_access<access::mode::read_write>(cgh);
+      auto in = in_buf.template get_access<access_mode::read>(cgh);
+      auto out = out_buf.template get_access<access_mode::read_write>(cgh);
       // CHECK-OPT:Node create|{{.*}}test2{{.*}}|{{.*}}.cpp:[[# @LINE - 3 ]]:13|{128, 4, 2}, {32, 2, 1}, {16, 1, 0}, 2
       // CHECK-NOOPT:Node create|{{.*}}test2{{.*}}|{{.*}}.cpp:[[# @LINE - 4 ]]:13|{128, 4, 2}, {32, 2, 1}, {16, 1, 0}, 8
       cgh.parallel_for<class test2>(