From 198a7af13095f14bce93b61806c86e42d80bf330 Mon Sep 17 00:00:00 2001
From: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Date: Tue, 7 Jan 2025 16:38:43 +0900
Subject: [PATCH] remove the global namespace

Signed-off-by: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
---
 .../unit_test/Test_Batched_SerialGemm.hpp     |  15 +-
 .../Test_Batched_SerialGemm_Complex.hpp       | 238 ++++++++++--------
 .../Test_Batched_SerialGemm_Real.hpp          | 100 ++++----
 3 files changed, 189 insertions(+), 164 deletions(-)

diff --git a/batched/dense/unit_test/Test_Batched_SerialGemm.hpp b/batched/dense/unit_test/Test_Batched_SerialGemm.hpp
index 32f58675b5..adc9a51aac 100644
--- a/batched/dense/unit_test/Test_Batched_SerialGemm.hpp
+++ b/batched/dense/unit_test/Test_Batched_SerialGemm.hpp
@@ -25,8 +25,6 @@
 #include "KokkosKernels_TestUtils.hpp"
 #include "KokkosKernels_TestVanilla.hpp"
 
-using namespace KokkosBatched;
-
 namespace Test {
 namespace Gemm {
 
@@ -53,8 +51,9 @@ struct Functor_TestBatchedSerialGemm {
     auto bb = Kokkos::subview(m_b, k, Kokkos::ALL(), Kokkos::ALL());
     auto cc = Kokkos::subview(m_c, k, Kokkos::ALL(), Kokkos::ALL());
 
-    info += SerialGemm<typename ParamTagType::transA, typename ParamTagType::transB, AlgoTagType>::invoke(
-        m_alpha, aa, bb, m_beta, cc);
+    info +=
+        KokkosBatched::SerialGemm<typename ParamTagType::transA, typename ParamTagType::transB, AlgoTagType>::invoke(
+            m_alpha, aa, bb, m_beta, cc);
   }
 
   inline int run() {
@@ -107,10 +106,10 @@ void impl_test_batched_gemm(const int N, const int matAdim1, const int matAdim2,
   Kokkos::deep_copy(C_ref, C);
 
   Functor_BatchedVanillaGEMM<ViewType, ViewType, ViewType, execution_space> vgemm;
-  vgemm.A_t   = !std::is_same_v<transA, Trans::NoTranspose>;
-  vgemm.B_t   = !std::is_same_v<transB, Trans::NoTranspose>;
-  vgemm.A_c   = std::is_same_v<transA, Trans::ConjTranspose>;
-  vgemm.B_c   = std::is_same_v<transB, Trans::ConjTranspose>;
+  vgemm.A_t   = !std::is_same_v<transA, KokkosBatched::Trans::NoTranspose>;
+  vgemm.B_t   = !std::is_same_v<transB, KokkosBatched::Trans::NoTranspose>;
+  vgemm.A_c   = std::is_same_v<transA, KokkosBatched::Trans::ConjTranspose>;
+  vgemm.B_c   = std::is_same_v<transB, KokkosBatched::Trans::ConjTranspose>;
   vgemm.A     = A;
   vgemm.B     = B;
   vgemm.C     = C_ref;
diff --git a/batched/dense/unit_test/Test_Batched_SerialGemm_Complex.hpp b/batched/dense/unit_test/Test_Batched_SerialGemm_Complex.hpp
index 0d751869ad..ab97732238 100644
--- a/batched/dense/unit_test/Test_Batched_SerialGemm_Complex.hpp
+++ b/batched/dense/unit_test/Test_Batched_SerialGemm_Complex.hpp
@@ -18,105 +18,116 @@
 /// fcomplex, fcomplex
 
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_fcomplex_fcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type, Algo::Gemm::Blocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::NoTranspose>;
   test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_fcomplex_fcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type, Algo::Gemm::Blocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_nt_fcomplex_fcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type, Algo::Gemm::Blocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_fcomplex_fcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type, Algo::Gemm::Blocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::Transpose>;
   test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_fcomplex_fcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type, Algo::Gemm::Blocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::Transpose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_t_fcomplex_fcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type, Algo::Gemm::Blocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::Transpose>;
   test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_c_fcomplex_fcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::ConjTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type, Algo::Gemm::Blocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::ConjTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_c_fcomplex_fcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::ConjTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type, Algo::Gemm::Blocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::ConjTranspose>;
   test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_c_fcomplex_fcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::ConjTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type, Algo::Gemm::Blocked>();
+  using param_tag_type =
+      ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::ConjTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<float>, Kokkos::complex<float>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 
 /// fcomplex, float
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_fcomplex_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_fcomplex_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_nt_fcomplex_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_fcomplex_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::Transpose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_fcomplex_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::Transpose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_t_fcomplex_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::Transpose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_c_fcomplex_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::ConjTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::ConjTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_c_fcomplex_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::ConjTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::ConjTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_c_fcomplex_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::ConjTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type =
+      ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::ConjTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<float>, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 
 #endif
@@ -126,114 +137,125 @@ TEST_F(TestCategory, batched_scalar_serial_gemm_c_c_fcomplex_float) {
 /// dcomplex, dcomplex
 
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_dcomplex_dcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::NoTranspose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::NoTranspose>;
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_dcomplex_dcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::NoTranspose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::NoTranspose>;
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_nt_dcomplex_dcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::NoTranspose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::NoTranspose>;
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_dcomplex_dcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::Transpose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::Transpose>;
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_dcomplex_dcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::Transpose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::Transpose>;
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_t_dcomplex_dcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::Transpose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::Transpose>;
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_c_dcomplex_dcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::ConjTranspose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::ConjTranspose>;
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_c_dcomplex_dcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::ConjTranspose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::ConjTranspose>;
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_c_dcomplex_dcomplex) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::ConjTranspose>;
+  using param_tag_type =
+      ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::ConjTranspose>;
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, Kokkos::complex<double>, Kokkos::complex<double>, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 
 /// dcomplex, double
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_dcomplex_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_dcomplex_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_nt_dcomplex_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_dcomplex_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::Transpose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_dcomplex_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::Transpose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_t_dcomplex_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::Transpose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_c_dcomplex_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::ConjTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::ConjTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_c_dcomplex_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::ConjTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::ConjTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_c_c_dcomplex_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::ConjTranspose, Trans::ConjTranspose>;
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type =
+      ::Test::Gemm::ParamTag<KokkosBatched::Trans::ConjTranspose, KokkosBatched::Trans::ConjTranspose>;
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, Kokkos::complex<double>, double, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 
 #endif
diff --git a/batched/dense/unit_test/Test_Batched_SerialGemm_Real.hpp b/batched/dense/unit_test/Test_Batched_SerialGemm_Real.hpp
index f2028775ad..0192b61b0f 100644
--- a/batched/dense/unit_test/Test_Batched_SerialGemm_Real.hpp
+++ b/batched/dense/unit_test/Test_Batched_SerialGemm_Real.hpp
@@ -15,113 +15,117 @@
 //@HEADER
 #if defined(KOKKOS_BHALF_T_IS_FLOAT)
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_bhalf_bhalf) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::NoTranspose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::NoTranspose>;
 
   test_batched_gemm<TestDevice, ::Test::bhalfScalarType, ::Test::bhalfScalarType, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, ::Test::bhalfScalarType, ::Test::bhalfScalarType, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_bhalf_bhalf) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::NoTranspose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::NoTranspose>;
 
   test_batched_gemm<TestDevice, ::Test::bhalfScalarType, ::Test::bhalfScalarType, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, ::Test::bhalfScalarType, ::Test::bhalfScalarType, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_bhalf_bhalf) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::Transpose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::Transpose>;
 
   test_batched_gemm<TestDevice, ::Test::bhalfScalarType, ::Test::bhalfScalarType, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, ::Test::bhalfScalarType, ::Test::bhalfScalarType, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_bhalf_bhalf) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::Transpose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::Transpose>;
 
   test_batched_gemm<TestDevice, ::Test::bhalfScalarType, ::Test::bhalfScalarType, param_tag_type,
-                    Algo::Gemm::Blocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, ::Test::bhalfScalarType, ::Test::bhalfScalarType, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 #endif  // KOKKOS_BHALF_T_IS_FLOAT
 
 #if defined(KOKKOS_HALF_T_IS_FLOAT)
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_half_half) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::NoTranspose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::NoTranspose>;
 
-  test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type, Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_half_half) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::NoTranspose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::NoTranspose>;
 
-  test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type, Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_half_half) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::Transpose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::Transpose>;
 
-  test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type, Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_half_half) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::Transpose>;
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::Transpose>;
 
-  test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type, Algo::Gemm::Blocked>();
   test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type,
-                    Algo::Gemm::Unblocked>();
+                    KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, ::Test::halfScalarType, ::Test::halfScalarType, param_tag_type,
+                    KokkosBatched::Algo::Gemm::Unblocked>();
 }
 #endif  // KOKKOS_HALF_T_IS_FLOAT
 
 #if defined(KOKKOSKERNELS_INST_FLOAT)
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_float_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, float, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, float, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, float, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, float, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_float_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, float, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, float, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, float, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, float, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_float_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, float, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, float, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::Transpose>;
+  test_batched_gemm<TestDevice, float, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, float, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_float_float) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, float, float, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, float, float, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::Transpose>;
+  test_batched_gemm<TestDevice, float, float, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, float, float, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 #endif
 
 #if defined(KOKKOSKERNELS_INST_DOUBLE)
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_nt_double_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, double, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, double, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, double, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, double, double, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_nt_double_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::NoTranspose>;
-  test_batched_gemm<TestDevice, double, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, double, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::NoTranspose>;
+  test_batched_gemm<TestDevice, double, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, double, double, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_nt_t_double_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::NoTranspose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, double, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, double, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::NoTranspose, KokkosBatched::Trans::Transpose>;
+  test_batched_gemm<TestDevice, double, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, double, double, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 TEST_F(TestCategory, batched_scalar_serial_gemm_t_t_double_double) {
-  using param_tag_type = ::Test::Gemm::ParamTag<Trans::Transpose, Trans::Transpose>;
-  test_batched_gemm<TestDevice, double, double, param_tag_type, Algo::Gemm::Blocked>();
-  test_batched_gemm<TestDevice, double, double, param_tag_type, Algo::Gemm::Unblocked>();
+  using param_tag_type = ::Test::Gemm::ParamTag<KokkosBatched::Trans::Transpose, KokkosBatched::Trans::Transpose>;
+  test_batched_gemm<TestDevice, double, double, param_tag_type, KokkosBatched::Algo::Gemm::Blocked>();
+  test_batched_gemm<TestDevice, double, double, param_tag_type, KokkosBatched::Algo::Gemm::Unblocked>();
 }
 #endif