diff --git a/include/matx/transforms/cub.h b/include/matx/transforms/cub.h
index bc5ddcef..804e3182 100644
--- a/include/matx/transforms/cub.h
+++ b/include/matx/transforms/cub.h
@@ -1225,12 +1225,12 @@ void cub_sum(OutputTensor &a_out, const InputOperator &a,
                             InputOperator,
                             detail::CUB_OP_REDUCE_SUM>::GetCubParams(a_out, a, stream);
 
-  using cache_val_type = detail::matxCubPlan_t<OutputTensor, InputOperator, detail::CUB_OP_REDUCE_SUM, EmptyParams_t>;
+  using cache_val_type = detail::matxCubPlan_t<OutputTensor, InputOperator, detail::CUB_OP_REDUCE_SUM, detail::EmptyParams_t>;
   detail::GetCache().LookupAndExec<detail::cub_cache_t>(
       detail::GetCacheIdFromType<detail::cub_cache_t>(),
       params,
       [&]() {
-        return std::make_shared<cache_val_type>(a_out, a, EmptyParams_t{}, stream);
+        return std::make_shared<cache_val_type>(a_out, a, detail::EmptyParams_t{}, stream);
       },
       [&](std::shared_ptr<cache_val_type> ctype) {
         ctype->ExecSum(a_out, a, stream);
@@ -1270,12 +1270,12 @@ void cub_min(OutputTensor &a_out, const InputOperator &a,
                             InputOperator,
                             detail::CUB_OP_REDUCE_MIN>::GetCubParams(a_out, a, stream);
 
-  using cache_val_type = detail::matxCubPlan_t<OutputTensor, InputOperator, detail::CUB_OP_REDUCE_MIN, EmptyParams_t>;
+  using cache_val_type = detail::matxCubPlan_t<OutputTensor, InputOperator, detail::CUB_OP_REDUCE_MIN, detail::EmptyParams_t>;
   detail::GetCache().LookupAndExec<detail::cub_cache_t>(
       detail::GetCacheIdFromType<detail::cub_cache_t>(),
       params,
       [&]() {
-        return std::make_shared<cache_val_type>(a_out, a, EmptyParams_t{}, stream);
+        return std::make_shared<cache_val_type>(a_out, a, detail::EmptyParams_t{}, stream);
       },
       [&](std::shared_ptr<cache_val_type> ctype) {
         ctype->ExecMin(a_out, a, stream);
@@ -1316,12 +1316,12 @@ void cub_max(OutputTensor &a_out, const InputOperator &a,
                             InputOperator,
                             detail::CUB_OP_REDUCE_MAX>::GetCubParams(a_out, a, stream);
 
-  using cache_val_type = detail::matxCubPlan_t<OutputTensor, InputOperator, detail::CUB_OP_REDUCE_MAX, EmptyParams_t>;
+  using cache_val_type = detail::matxCubPlan_t<OutputTensor, InputOperator, detail::CUB_OP_REDUCE_MAX, detail::EmptyParams_t>;
   detail::GetCache().LookupAndExec<detail::cub_cache_t>(
       detail::GetCacheIdFromType<detail::cub_cache_t>(),
       params,
       [&]() {
-        return std::make_shared<cache_val_type>(a_out, a, EmptyParams_t{}, stream);
+        return std::make_shared<cache_val_type>(a_out, a, detail::EmptyParams_t{}, stream);
       },
       [&](std::shared_ptr<cache_val_type> ctype) {
         ctype->ExecMax(a_out, a, stream);
@@ -1475,12 +1475,12 @@ void cumsum_impl(OutputTensor &a_out, const InputOperator &a,
   auto params =
       detail::matxCubPlan_t<OutputTensor, InputOperator, detail::CUB_OP_INC_SUM>::GetCubParams(a_out, a, stream);
 
-  using cache_val_type = detail::matxCubPlan_t<OutputTensor, InputOperator, detail::CUB_OP_INC_SUM, EmptyParams_t>;
+  using cache_val_type = detail::matxCubPlan_t<OutputTensor, InputOperator, detail::CUB_OP_INC_SUM, detail::EmptyParams_t>;
   detail::GetCache().LookupAndExec<detail::cub_cache_t>(
       detail::GetCacheIdFromType<detail::cub_cache_t>(),
       params,
       [&]() {
-        return std::make_shared<cache_val_type>(a_out, a, EmptyParams_t{}, stream);
+        return std::make_shared<cache_val_type>(a_out, a, detail::EmptyParams_t{}, stream);
       },
       [&](std::shared_ptr<cache_val_type> ctype) {
         ctype->ExecPrefixScanEx(a_out, a, stream);