diff --git a/bin/hipify-perl b/bin/hipify-perl
index 2e391ab8d2..09c8d2a139 100755
--- a/bin/hipify-perl
+++ b/bin/hipify-perl
@@ -1676,6 +1676,12 @@ sub transformKernelLaunch {
     }
 }
 
+sub transformCubNamespace {
+    my $k = 0;
+    $k += s/using\s*namespace\s*cub/using namespace hipcub/g;
+    return $k;
+}
+
 sub transformHostFunctions {
     my $k = 0;
     foreach $func (
@@ -2368,6 +2374,7 @@ while (@ARGV) {
         simpleSubstitutions();
         transformExternShared();
         transformKernelLaunch();
+        transformCubNamespace();
         if ($print_stats) {
             while (/(\b(hip|HIP)([A-Z]|_)\w+\b)/g) {
                 $convertedTags{$1}++;
diff --git a/hipify-clang/src/CUDA2HIP_Perl.cpp b/hipify-clang/src/CUDA2HIP_Perl.cpp
index df83bf8d57..8d59089d4f 100644
--- a/hipify-clang/src/CUDA2HIP_Perl.cpp
+++ b/hipify-clang/src/CUDA2HIP_Perl.cpp
@@ -251,6 +251,11 @@ namespace perl {
     *streamPtr.get() << tab_2 << "$Tkernels{$1}++;" << endl_tab << "}" << endl << "}" << endl;
   }
 
+  void generateCubNamespace(unique_ptr<ostream>& streamPtr) {
+    *streamPtr.get() << endl << sub << "transformCubNamespace" << " {" << endl_tab << my_k << endl;
+    *streamPtr.get() << tab << "$k += s/using\\s*namespace\\s*cub/using namespace hipcub/g;" << endl << tab << return_k << "}" << endl;
+  }
+
   void generateHostFunctions(unique_ptr<ostream>& streamPtr) {
     *streamPtr.get() << endl << sub << "transformHostFunctions" << " {" << endl_tab << my_k << endl;
     set<string> &funcSet = DeviceSymbolFunctions0;
@@ -358,6 +363,7 @@ namespace perl {
     generateSimpleSubstitutions(streamPtr);
     generateExternShared(streamPtr);
     generateKernelLaunch(streamPtr);
+    generateCubNamespace(streamPtr);
     generateHostFunctions(streamPtr);
     generateDeviceFunctions(streamPtr);
     *streamPtr.get() << endl << "# Count of transforms in all files" << endl;
@@ -401,6 +407,7 @@ namespace perl {
     *streamPtr.get() << tab_2 << "simpleSubstitutions();" << endl;
     *streamPtr.get() << tab_2 << "transformExternShared();" << endl;
     *streamPtr.get() << tab_2 << "transformKernelLaunch();" << endl;
+    *streamPtr.get() << tab_2 << "transformCubNamespace();" << endl;
     *streamPtr.get() << tab_2 << "if ($print_stats) {" << endl;
     *streamPtr.get() << tab_3 << while_ << "(/(\\b(hip|HIP)([A-Z]|_)\\w+\\b)/g) {" << endl;
     *streamPtr.get() << tab_4 << "$convertedTags{$1}++;" << endl_tab_3 << "}" << endl_tab_2 << "}" << endl;