diff --git a/sycl/include/sycl/access/access.hpp b/sycl/include/sycl/access/access.hpp
index 4eda7f904d8ab..163556d96f0ae 100644
--- a/sycl/include/sycl/access/access.hpp
+++ b/sycl/include/sycl/access/access.hpp
@@ -23,10 +23,10 @@ enum class target {
   global_buffer __SYCL2020_DEPRECATED("use 'target::device' instead") = device,
   constant_buffer __SYCL2020_DEPRECATED("use 'target::device' instead") = 2015,
   local __SYCL2020_DEPRECATED("use `local_accessor` instead") = 2016,
-  image __SYCL_DEPRECATED("removed in SYCL 2020") = 2017,
+  image __SYCL2020_DEPRECATED("removed in SYCL 2020") = 2017,
   host_buffer __SYCL2020_DEPRECATED("use 'host_accessor' instead") = 2018,
-  host_image __SYCL_DEPRECATED("removed in SYCL 2020") = 2019,
-  image_array __SYCL_DEPRECATED("removed in SYCL 2020") = 2020,
+  host_image __SYCL2020_DEPRECATED("removed in SYCL 2020") = 2019,
+  image_array __SYCL2020_DEPRECATED("removed in SYCL 2020") = 2020,
   host_task = 2021,
 };
 
@@ -40,7 +40,7 @@ enum class mode {
 };
 
 #ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-enum class __SYCL_DEPRECATED("Removed in SYCL 2020") fence_space {
+enum class __SYCL2020_DEPRECATED("Removed in SYCL 2020") fence_space {
   local_space = 0,
   global_space = 1,
   global_and_local = 2
diff --git a/sycl/include/sycl/sampler.hpp b/sycl/include/sycl/sampler.hpp
index 4ab978eeb1c88..9d77a6eb7501b 100644
--- a/sycl/include/sycl/sampler.hpp
+++ b/sycl/include/sycl/sampler.hpp
@@ -63,7 +63,7 @@ class sampler_impl;
 ///
 /// \ingroup sycl_api
 class __SYCL_EXPORT __SYCL_SPECIAL_CLASS __SYCL_TYPE(sampler)
-    __SYCL_DEPRECATED("sampler has been removed in SYCL 2020") sampler {
+    __SYCL2020_DEPRECATED("sampler has been removed in SYCL 2020") sampler {
   friend sycl::detail::ImplUtils;
 
 public: