diff --git a/projects/clr/rocclr/compiler/lib/backends/common/frontend_clang.cpp b/projects/clr/rocclr/compiler/lib/backends/common/frontend_clang.cpp
index 2e25b63874..86a336062b 100644
--- a/projects/clr/rocclr/compiler/lib/backends/common/frontend_clang.cpp
+++ b/projects/clr/rocclr/compiler/lib/backends/common/frontend_clang.cpp
@@ -199,7 +199,7 @@ int amdcl::ClangOCLFrontend::compileCommand(const std::string& src) {
       llvm::cl::ParseCommandLineOptions(Options()->getLLVMArgc(),
         Options()->getLLVMArgv(), "LLVM/SPIRV converter");
     }
-    if (WriteSPRV(llvmbinary_, ss, err)) {
+    if (WriteSPIRV(llvmbinary_, ss, err)) {
       std::string img = ss.str();
       CL()->clAPI.insSec(CL(), Elf(), img.data(), img.size(), aclSPIRV);
     }
diff --git a/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp b/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
index 5185fcd804..c166da29bb 100644
--- a/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
+++ b/projects/clr/rocclr/compiler/lib/backends/common/linker.cpp
@@ -506,8 +506,8 @@ translateSpirv(llvm::Module *&M, const std::string &DumpSpirv,
     const std::string &DumpLlvm){
   std::stringstream SS;
   std::string Err;
-  if (!llvm::WriteSPRV(M, SS, Err)) {
-    llvm::errs() << "Fails to save LLVM as SPRV: " << Err << '\n';
+  if (!llvm::WriteSPIRV(M, SS, Err)) {
+    llvm::errs() << "Fails to save LLVM as SPIR-V: " << Err << '\n';
     return false;
   }
 
@@ -517,8 +517,8 @@ translateSpirv(llvm::Module *&M, const std::string &DumpSpirv,
     OFS.close();
   }
 
-  if (!llvm::ReadSPRV(M->getContext(), SS, M, Err)) {
-    llvm::errs() << "Fails to load SPIRV as LLVM Module: " << Err << '\n';
+  if (!llvm::ReadSPIRV(M->getContext(), SS, M, Err)) {
+    llvm::errs() << "Fails to load SPIR-V as LLVM Module: " << Err << '\n';
     return false;
   }
 
diff --git a/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp b/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp
index 3c206d6bea..98b080787e 100644
--- a/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp
+++ b/projects/clr/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp
@@ -354,7 +354,7 @@ RSLLVMIRToModule(
     if (error != NULL) (*error) = ACL_FRONTEND_FAILURE;
     return NULL;
   }
-  
+
   aclModule *module = reinterpret_cast<aclModule*>(M);
   return module;
 }
@@ -419,7 +419,7 @@ SPIRVToModule(
     llvm::cl::ParseCommandLineOptions(opt->getLLVMArgc(), opt->getLLVMArgv(),
       "SPIRV/LLVM converter");
   }
-  bool success = llvm::ReadSPRV(*llCtx, ss, llMod, errMsg);
+  bool success = llvm::ReadSPIRV(*llCtx, ss, llMod, errMsg);
 
   if (success && llMod && opt->isDumpFlagSet(amd::option::DUMP_BC_SPIRV)) {
     auto bcDump = opt->getDumpFileName("_fromspv.bc");
@@ -485,7 +485,7 @@ LLVMToSPIRV(
 
   std::string spvImg;
   std::stringstream ss(spvImg);
-  bool success = llvm::WriteSPRV(llMod, ss, errMsg);
+  bool success = llvm::WriteSPIRV(llMod, ss, errMsg);
 
   if (opt->isDumpFlagSet(amd::option::DUMP_SPIRV)) {
     std::ofstream ofs(opt->getDumpFileName(".spv"), std::ios::binary);
@@ -2335,13 +2335,13 @@ if_aclRemoveSymbol(aclCompiler *cl,
   return elfBin->removeSymbol(id, symbol) ? ACL_SUCCESS : ACL_ELF_ERROR;
 }
 
-// Function performs deserialization of aclMetadata into *md 
+// Function performs deserialization of aclMetadata into *md
 // instead of changing source .rodata section in memory pointed by *ptr.
 // Deserialization includes restoring of pointers, whereas
 // serialized .rodata has pointers set to NULL by serializeMetadata function.
 // We should leave serialized metaData unchanged (e.g. w/o garbage pointers)
 // due to obtain the same binary from one compilation to another.
-// Otherwise, OpenCL conformance "binary_create" test would fail on comparison 
+// Otherwise, OpenCL conformance "binary_create" test would fail on comparison
 // of OpenCL "binaries" (bifs in our case).
 void deserializeCLMetadata(const char* ptr, aclMetadata * const md, const size_t size)
 {