diff --git a/core/solver/batch_dispatch.hpp b/core/solver/batch_dispatch.hpp
index 883de0af013..07e50e000e9 100644
--- a/core/solver/batch_dispatch.hpp
+++ b/core/solver/batch_dispatch.hpp
@@ -89,7 +89,7 @@ using DeviceValueType = gko::kernels::hip::hip_type<ValueType>;
 
 namespace gko {
 namespace kernels {
-namespace host {
+namespace device {
 
 
 template <typename T>
@@ -99,7 +99,7 @@ inline std::decay_t<T> as_device_type(T val)
 }
 
 
-}  // namespace host
+}  // namespace device
 }  // namespace kernels
 }  // namespace gko
 
diff --git a/hip/solver/batch_cg_kernels.hip.cpp b/hip/solver/batch_cg_kernels.hip.cpp
index 9d9d0a52df6..642dd750876 100644
--- a/hip/solver/batch_cg_kernels.hip.cpp
+++ b/hip/solver/batch_cg_kernels.hip.cpp
@@ -95,7 +95,7 @@ class kernel_caller {
     void launch_apply_kernel(
         const gko::kernels::batch_cg::storage_config& sconf, LogType& logger,
         PrecType& prec, const BatchMatrixType& mat,
-        const value_type* const __restrict__ b_values,
+        const hip_value_type* const __restrict__ b_values,
         hip_value_type* const __restrict__ x_values,
         hip_value_type* const __restrict__ workspace_data,
         const int& block_size, const size_t& shared_size) const