diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/interrupt_signal.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/interrupt_signal.h
index 19c2d59642..bef9564bef 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/interrupt_signal.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/interrupt_signal.h
@@ -165,7 +165,7 @@ class InterruptSignal : public Signal {
   /// @brief See base class Signal.
   __forceinline HsaEvent* EopEvent() { return event_; }
 
-  // TODO(bwicakso) : work around for SDMA async copy. Bypass waiting on EOP
+  // TODO: work around for SDMA async copy. Bypass waiting on EOP
   // event because SDMA copy does not handle interrupt yet.
   __forceinline void DisableWaitEvent() { wait_on_event_ = false; }
 
@@ -186,7 +186,7 @@ class InterruptSignal : public Signal {
   /// closes or not.
   bool free_event_;
 
-  // TODO(bwicakso) : work around for SDMA async copy. Bypass waiting on EOP
+  // TODO: work around for SDMA async copy. Bypass waiting on EOP
   // event because SDMA copy does not handle interrupt yet.
   bool wait_on_event_;
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_kernel.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_kernel.cpp
index 6a5c93aba9..a05aef5369 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_kernel.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_kernel.cpp
@@ -216,8 +216,7 @@ hsa_status_t BlitKernel::Initialize(const core::Agent& agent) {
 
   kernarg_async_mask_ = kRequiredQueueSize - 1;
 
-  // TODO(bwicakso): remove this code when execute permission level is not
-  // mandatory.
+  // TODO: remove this code when execute permission level is not mandatory.
   if (((amd::GpuAgent&)agent).profile() == HSA_PROFILE_FULL) {
 #if defined(_WIN32) || defined(_WIN64)
 #define NOMINMAX
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_sdma.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_sdma.cpp
index e4cc8eff07..dbecfd54ec 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_sdma.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_blit_sdma.cpp
@@ -677,7 +677,7 @@ void BlitSdma::UpdateWriteAndDoorbellRegister(uint32_t current_offset,
     if (atomic::Load(&cached_commit_offset_, std::memory_order_acquire) ==
         current_offset) {
       if (core::Runtime::runtime_singleton_->flag().sdma_wait_idle()) {
-        // TODO(bwicakso): remove when sdma wpointer issue is resolved.
+        // TODO: remove when sdma wpointer issue is resolved.
         // Wait until the SDMA engine finish processing all packets before
         // updating the wptr and doorbell.
         while (atomic::Load(queue_resource_.Queue_read_ptr,
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_cpu_agent.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_cpu_agent.cpp
index ae758aa983..62cb62bdbd 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_cpu_agent.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_cpu_agent.cpp
@@ -199,7 +199,7 @@ hsa_status_t CpuAgent::GetInfo(hsa_agent_info_t attribute, void* value) const {
           HSA_DEFAULT_FLOAT_ROUNDING_MODE_NEAR;
       break;
     case HSA_AGENT_INFO_FAST_F16_OPERATION:
-      // TODO: validate if this is trye.
+      // TODO: validate if this is true.
       *((bool*)value) = false;
       break;
     case HSA_AGENT_INFO_PROFILE:
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
index ae4f5deb8d..b0e5ea1a3c 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
@@ -437,7 +437,7 @@ hsa_status_t GpuAgent::DmaCopy(void* dst, core::Agent& dst_agent,
     return HSA_STATUS_ERROR_OUT_OF_RESOURCES;
   }
 
-  // TODO(bwicakso): temporarily disable wait on thunk event if the out_signal
+  // TODO: temporarily disable wait on thunk event if the out_signal
   // is an interrupt signal object. Remove this when SDMA handle interrupt
   // packet properly.
   if (out_signal.EopEvent() != NULL) {
@@ -466,7 +466,7 @@ hsa_status_t GpuAgent::GetInfo(hsa_agent_info_t attribute, void* value) const {
   const size_t attribute_u = static_cast<size_t>(attribute);
   switch (attribute_u) {
     case HSA_AGENT_INFO_NAME:
-      // TODO(bwicakso): hardcode for now.
+      // TODO: hardcode for now.
       std::memset(value, 0, kNameSize);
       if (isa_->GetMajorVersion() == 7) {
         std::memcpy(value, "Kaveri", sizeof("Kaveri"));
@@ -567,7 +567,7 @@ hsa_status_t GpuAgent::GetInfo(hsa_agent_info_t attribute, void* value) const {
 
       if (profile_ == HSA_PROFILE_FULL &&
           extensions.table.hsa_ext_image_create_fn != NULL) {
-        // TODO(bwicakso): only APU supports images currently.
+        // TODO: only APU supports images currently.
         *((uint8_t*)value) |= 1 << HSA_EXTENSION_IMAGES;
       }
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_memory_region.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_memory_region.cpp
index dedf2a2d4c..bf37110ae7 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_memory_region.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_memory_region.cpp
@@ -467,13 +467,13 @@ hsa_status_t MemoryRegion::AllowAccess(uint32_t num_agents,
 
 hsa_status_t MemoryRegion::CanMigrate(const MemoryRegion& dst,
                                       bool& result) const {
-  // TODO(bwicakso): not implemented yet.
+  // TODO: not implemented yet.
   result = false;
   return HSA_STATUS_ERROR_OUT_OF_RESOURCES;
 }
 
 hsa_status_t MemoryRegion::Migrate(uint32_t flag, const void* ptr) const {
-  // TODO(bwicakso): not implemented yet.
+  // TODO: not implemented yet.
   return HSA_STATUS_ERROR_OUT_OF_RESOURCES;
 }
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_topology.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_topology.cpp
index c3590c3f6d..e6a348330d 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_topology.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_topology.cpp
@@ -112,7 +112,7 @@ void RegisterLinkInfo(uint32_t node_id, uint32_t num_link) {
       link_info.atomic_support_64bit = (io_link.Flags.ui32.NoAtomics64bit == 0);
       link_info.coherent_support = (io_link.Flags.ui32.NonCoherent == 0);
     } else {
-      // TODO(bwicakso): decipher HSA_IOLINKTYPE to fill out the atomic
+      // TODO: decipher HSA_IOLINKTYPE to fill out the atomic
       // and coherent information.
     }
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp
index bf48df4cb0..8e8f0ecebf 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp
@@ -254,7 +254,6 @@ hsa_status_t
 
       return HSA_STATUS_SUCCESS;
     } else {
-      // TODO: other extensions are not yet implemented.
       return HSA_STATUS_ERROR;
     }
   }
@@ -375,7 +374,6 @@ hsa_status_t hsa_queue_create(
     return HSA_STATUS_ERROR_INVALID_QUEUE_CREATION;
   }
 
-  // TODO: private_segment_size and group_segment_size.
   core::Queue* cmd_queue = NULL;
   status = agent->QueueCreate(size, type, callback, data, private_segment_size,
                               group_segment_size, &cmd_queue);
@@ -1318,7 +1316,7 @@ hsa_status_t hsa_code_object_get_symbol(hsa_code_object_t code_object,
     return HSA_STATUS_ERROR_INVALID_CODE_OBJECT;
   }
 
-  // TODO(kzhuravl): module_name is NULL until spec is changed, waiting for
+  // TODO: module_name is NULL until spec is changed, waiting for
   // Mario.
   return code->GetSymbol(NULL, symbol_name, symbol);
 }
@@ -1374,7 +1372,7 @@ hsa_status_t
     return HSA_STATUS_ERROR_OUT_OF_RESOURCES;
   }
 
-  // @todo(spec): why did we make it possible to create frozen executable?
+  // TODO: why did we make it possible to create frozen executable?
   if (HSA_EXECUTABLE_STATE_FROZEN == executable_state) {
     exec->Freeze(NULL);
   }
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp
index 80a78154be..4ae87718e8 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/runtime.cpp
@@ -219,7 +219,7 @@ void Runtime::RegisterAgent(Agent* agent) {
         end_svm_address_ = start_svm_address_ + svm_region->GetPhysicalSize();
 
         // Bind VM fault handler when we detect the first GPU agent.
-        // TODO(bwicakso): validate if it works on APU.
+        // TODO: validate if it works on APU.
         BindVmFaultHandler();
       } else {
         start_svm_address_ = 0;