diff --git a/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h b/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
index 01849c0b16..702c3f85a6 100644
--- a/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
+++ b/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
@@ -51,8 +51,8 @@ THE SOFTWARE.
     #include <type_traits>
 #endif // defined(__HIPCC_RTC__)
 
-template <class T, int N> constexpr __hip_internal::size_t __hip_vec_align_v() {
-  return (N == 4 && alignof(T) == 8) ? 16 : N * alignof(T);
+template <class T, int _hip_N> constexpr __hip_internal::size_t __hip_vec_align_v() {
+  return (_hip_N == 4 && alignof(T) == 8) ? 16 : _hip_N * alignof(T);
 }
 
 template <typename T, unsigned int n> struct HIP_vector_base;
diff --git a/projects/clr/hipamd/include/hip/amd_detail/host_defines.h b/projects/clr/hipamd/include/hip/amd_detail/host_defines.h
index 5aa38661f2..59e1673dcb 100644
--- a/projects/clr/hipamd/include/hip/amd_detail/host_defines.h
+++ b/projects/clr/hipamd/include/hip/amd_detail/host_defines.h
@@ -199,16 +199,16 @@ struct integer_sequence {
 template<size_t... Ints>
 using index_sequence = integer_sequence<size_t, Ints...>;
 
-template<size_t N, size_t... Ints>
-struct make_index_sequence_impl : make_index_sequence_impl<N - 1, N - 1, Ints...> {};
+template <size_t _hip_N, size_t... Ints>
+struct make_index_sequence_impl : make_index_sequence_impl<_hip_N - 1, _hip_N - 1, Ints...> {};
 
 template<size_t... Ints>
 struct make_index_sequence_impl<0, Ints...> {
     using type = index_sequence<Ints...>;
 };
 
-template<size_t N>
-using make_index_sequence = typename make_index_sequence_impl<N>::type;
+template <size_t _hip_N>
+using make_index_sequence = typename make_index_sequence_impl<_hip_N>::type;
 
 template <size_t... Ints>
 constexpr index_sequence<Ints...> make_index_sequence_value(index_sequence<Ints...>) {