diff --git a/include/hcc_detail/hip_runtime_api.h b/include/hcc_detail/hip_runtime_api.h
index 1e56949c08..73f3a5b8b2 100644
--- a/include/hcc_detail/hip_runtime_api.h
+++ b/include/hcc_detail/hip_runtime_api.h
@@ -1152,7 +1152,7 @@ hipError_t hipModuleGetGlobal(hipDeviceptr *dptr, size_t *bytes, hipModule_t hmo
 
 hipError_t hipModuleLoadData(hipModule_t *module, const void *image);
 
-hipError_t hipLaunchModuleKernel(hipFunction_t f,
+hipError_t hipModuleLaunchKernel(hipFunction_t f,
                               unsigned int gridDimX,
                               unsigned int gridDimY,
                               unsigned int gridDimZ,
diff --git a/src/hip_module.cpp b/src/hip_module.cpp
index 3923817e95..d4810bed63 100644
--- a/src/hip_module.cpp
+++ b/src/hip_module.cpp
@@ -170,7 +170,6 @@ hipError_t hipModuleUnload(hipModule_t hmod){
 }
 
 hipError_t ihipModuleGetFunction(hipFunction_t *func, hipModule_t hmod, const char *name){
-    HIP_INIT_API(name);
     auto ctx = ihipGetTlsDefaultCtx();
     hipError_t ret = hipSuccess;
 
@@ -206,20 +205,17 @@ hipError_t ihipModuleGetFunction(hipFunction_t *func, hipModule_t hmod, const ch
         if(status != HSA_STATUS_SUCCESS){
             return hipErrorNotFound;
         }
-
-
     }
-
     return ret;
 }
 
 hipError_t hipModuleGetFunction(hipFunction_t *hfunc, hipModule_t hmod,
-                                const char *name)
-{
+                                const char *name){
+    HIP_INIT_API(name);
     return ihipModuleGetFunction(hfunc, hmod, name);
 }
 
-hipError_t hipLaunchModuleKernel(hipFunction_t f,
+hipError_t hipModuleLaunchKernel(hipFunction_t f,
             uint32_t gridDimX, uint32_t gridDimY, uint32_t gridDimZ,
             uint32_t blockDimX, uint32_t blockDimY, uint32_t blockDimZ,
             uint32_t sharedMemBytes, hipStream_t hStream,
@@ -286,6 +282,7 @@ Kernel argument preparation.
 
 hipError_t hipModuleGetGlobal(hipDeviceptr *dptr, size_t *bytes,
                               hipModule_t hmod, const char* name){
+    HIP_INIT_API(name);
     hipError_t ret = hipSuccess;
     if(dptr == NULL || bytes == NULL){
         return hipErrorInvalidValue;
@@ -303,7 +300,8 @@ hipError_t hipModuleGetGlobal(hipDeviceptr *dptr, size_t *bytes,
 }
 
 hipError_t hipModuleLoadData(hipModule_t *module, const void *image){
-    hipError_t ret;
+    HIP_INIT_API(image);
+    hipError_t ret = hipSuccess;
     if(image == NULL || module == NULL){
         return hipErrorNotInitialized;
     }else{
@@ -345,3 +343,5 @@ hipError_t hipModuleLoadData(hipModule_t *module, const void *image){
     }
     return ret;
 }
+
+
diff --git a/tests/src/hipModule.cpp b/tests/src/hipModule.cpp
index 94daa2fc5a..86ccb3ab9f 100644
--- a/tests/src/hipModule.cpp
+++ b/tests/src/hipModule.cpp
@@ -71,7 +71,7 @@ int main(){
       HIP_LAUNCH_PARAM_END
     };
 
-    hipLaunchModuleKernel(Function, 1, 1, 1, LEN, 1, 1, 0, stream, NULL, (void**)&config); 
+    hipModuleLaunchKernel(Function, 1, 1, 1, LEN, 1, 1, 0, stream, NULL, (void**)&config); 
 
     hipStreamDestroy(stream);
 
diff --git a/tests/src/hipModuleUnload.cpp b/tests/src/hipModuleUnload.cpp
index fd23a4717e..2e37414c2c 100644
--- a/tests/src/hipModuleUnload.cpp
+++ b/tests/src/hipModuleUnload.cpp
@@ -24,7 +24,7 @@ THE SOFTWARE.
 #define fileName "vcpy_isa.co"
 
 int main(){
-    hipModule module;
+    hipModule_t module;
     hipModuleLoad(&module, fileName);
     hipModuleUnload(module);
 }