diff --git a/include/hip/hcc_detail/hip_runtime_api.h b/include/hip/hcc_detail/hip_runtime_api.h
index 0be4961f03..4c9cedecc4 100644
--- a/include/hip/hcc_detail/hip_runtime_api.h
+++ b/include/hip/hcc_detail/hip_runtime_api.h
@@ -30,7 +30,6 @@ THE SOFTWARE.
 
 #include <stdint.h>
 #include <stddef.h>
-#include <string>
 
 #include <hip/hcc_detail/host_defines.h>
 #include <hip/hip_runtime_api.h>
@@ -76,7 +75,7 @@ struct ihipModuleSymbol_t{
     uint64_t    _object;             // The kernel object.
     uint32_t    _groupSegmentSize;
     uint32_t    _privateSegmentSize;
-    //std::string  _name;       // TODO - review for performance cost.  Name is just used for debug.
+    char        _name[64];       // TODO - review for performance cost.  Name is just used for debug.
 };
 
 typedef struct ihipModuleSymbol_t hipFunction_t;
diff --git a/src/hip_module.cpp b/src/hip_module.cpp
index 19de6957e5..74cdd8a4ae 100644
--- a/src/hip_module.cpp
+++ b/src/hip_module.cpp
@@ -243,7 +243,7 @@ hipError_t ihipModuleGetSymbol(hipFunction_t *func, hipModule_t hmod, const char
                                     &func->_privateSegmentSize);
         CHECK_HSA(status, hipErrorNotFound);
 
-        //func->_name = std::string(name);
+        strncpy(func->_name, name, sizeof(func->_name));
     }
     return ihipLogStatus(ret);
 }
@@ -297,9 +297,8 @@ hipError_t hipModuleLaunchKernel(hipFunction_t f,
         /*
           Kernel argument preparation.
         */
-        grid_launch_parm lp;
-        //hStream = ihipPreLaunchKernel(hStream, 0, 0, &lp, f._name.empty() ? "ModuleKernel" : f._name.c_str());
-        hStream = ihipPreLaunchKernel(hStream, 0, 0, &lp, "ModuleKernel");
+        grid_launch_parm lp; // TODO - dummy arg but values are printed during debug.
+        hStream = ihipPreLaunchKernel(hStream, 0, 0, &lp, f._name);
 
 
         hsa_kernel_dispatch_packet_t aql;
@@ -327,8 +326,7 @@ hipError_t hipModuleLaunchKernel(hipFunction_t f,
         lp.av->dispatch_hsa_kernel(&aql, config[1] /* kernarg*/, kernArgSize);
 
 
-        //ihipPostLaunchKernel(f._name.empty() ? "ModuleKernel" : f._name.c_str(), hStream, lp);
-        ihipPostLaunchKernel("ModuleKernel", hStream, lp);
+        ihipPostLaunchKernel(f._name, hStream, lp);
     }
 
     return ihipLogStatus(ret);