diff --git a/core/src/Kokkos_Array.hpp b/core/src/Kokkos_Array.hpp
index f7cd84e5649..9c0d11c5300 100644
--- a/core/src/Kokkos_Array.hpp
+++ b/core/src/Kokkos_Array.hpp
@@ -359,25 +359,25 @@ Array(T, Us...)->Array<T, 1 + sizeof...(Us)>;
 namespace Impl {
 
 template <typename T, size_t N, size_t... I>
-KOKKOS_INLINE_FUNCTION constexpr Array<std::remove_cv_t<T>, N> to_Array_impl(
+KOKKOS_FUNCTION constexpr Array<std::remove_cv_t<T>, N> to_Array_impl(
     T (&a)[N], std::index_sequence<I...>) {
   return {{a[I]...}};
 }
 
 template <typename T, size_t N, size_t... I>
-KOKKOS_INLINE_FUNCTION constexpr Array<std::remove_cv_t<T>, N> to_Array_impl(
+KOKKOS_FUNCTION constexpr Array<std::remove_cv_t<T>, N> to_Array_impl(
     T(&&a)[N], std::index_sequence<I...>) {
   return {{std::move(a[I])...}};
 }
 
 }  // namespace Impl
 
-template <class T, size_t N>
+template <typename T, size_t N>
 KOKKOS_INLINE_FUNCTION constexpr auto to_Array(T (&a)[N]) {
   return Impl::to_Array_impl(a, std::make_index_sequence<N>{});
 }
 
-template <class T, size_t N>
+template <typename T, size_t N>
 KOKKOS_INLINE_FUNCTION constexpr auto to_Array(T(&&a)[N]) {
   return Impl::to_Array_impl(std::move(a), std::make_index_sequence<N>{});
 }