diff --git a/projects/roctracer/doc/roctracer_spec.md b/projects/roctracer/doc/roctracer_spec.md
index 88629e9af9..3bf9894334 100644
--- a/projects/roctracer/doc/roctracer_spec.md
+++ b/projects/roctracer/doc/roctracer_spec.md
@@ -445,11 +445,11 @@ int main() {
    ROCTRACER_CALL(roctracer_enable_op_callback(ACTIVITY_DOMAIN_HIP_API,
                                      HIP_API_ID_hipModuleLaunchKernel,
                                      hip_api_callback, NULL));
-   ROCTRACER_CALL(roctracer_enable_op_acticity(ACTIVITY_DOMAIN_HIP_API,
+   ROCTRACER_CALL(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HIP_API,
                                      HIP_API_ID_hipModuleLaunchKernel));
    // Enable HIP kernel dispatch activity tracing
-   ROCTRACER_CALL(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HCC_OPS,
-                                               hc::HSA_OP_ID_DISPATCH));
+   ROCTRACER_CALL(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HIP_OPS,
+                                               HIP_OP_ID_DISPATCH));
 
    <test code>
 
diff --git a/projects/roctracer/src/core/roctracer.cpp b/projects/roctracer/src/core/roctracer.cpp
index 9fb92ade3c..02c99dee17 100644
--- a/projects/roctracer/src/core/roctracer.cpp
+++ b/projects/roctracer/src/core/roctracer.cpp
@@ -519,12 +519,12 @@ void HCC_ActivityIdCallback(activity_correlation_id_t correlation_id) {
 void HCC_AsyncActivityCallback(uint32_t op_id, void* record, void* arg) {
   MemoryPool* pool = reinterpret_cast<MemoryPool*>(arg);
   roctracer_record_t* record_ptr = reinterpret_cast<roctracer_record_t*>(record);
-  record_ptr->domain = ACTIVITY_DOMAIN_HCC_OPS;
+  record_ptr->domain = ACTIVITY_DOMAIN_HIP_OPS;
   record_ptr->correlation_id = CorrelationIdLookup(record_ptr->correlation_id);
   if (record_ptr->correlation_id == 0) return;
   pool->Write(*record_ptr);
 
-  const char* name = roctracer_op_string(ACTIVITY_DOMAIN_HCC_OPS, record_ptr->op, record_ptr->kind);
+  const char* name = roctracer_op_string(ACTIVITY_DOMAIN_HIP_OPS, record_ptr->op, record_ptr->kind);
   DEBUG_TRACE(
       "HCC_AsyncActivityCallback(\"%s\"): op(%u) kind(%u) record(%p) pool(%p) correlation_id(%d) "
       "beg_ns(%lu) end_ns(%lu)\n",
@@ -698,7 +698,7 @@ PUBLIC_API const char* roctracer_op_string(uint32_t domain, uint32_t op, uint32_
       return roctracer::RocpLoader::Instance().GetEvtName(op);
     case ACTIVITY_DOMAIN_HSA_OPS:
       return roctracer::RocpLoader::Instance().GetOpName(op);
-    case ACTIVITY_DOMAIN_HCC_OPS:
+    case ACTIVITY_DOMAIN_HIP_OPS:
       return roctracer::HccLoader::Instance().GetOpName(kind);
     case ACTIVITY_DOMAIN_HIP_API:
       return roctracer::HipLoader::Instance().ApiName(op);
@@ -747,7 +747,7 @@ static inline uint32_t get_op_begin(uint32_t domain) {
       return 0;
     case ACTIVITY_DOMAIN_HSA_EVT:
       return 0;
-    case ACTIVITY_DOMAIN_HCC_OPS:
+    case ACTIVITY_DOMAIN_HIP_OPS:
       return 0;
     case ACTIVITY_DOMAIN_HIP_API:
       return HIP_API_ID_FIRST;
@@ -769,7 +769,7 @@ static inline uint32_t get_op_end(uint32_t domain) {
       return HSA_API_ID_NUMBER;
     case ACTIVITY_DOMAIN_HSA_EVT:
       return HSA_EVT_ID_NUMBER;
-    case ACTIVITY_DOMAIN_HCC_OPS:
+    case ACTIVITY_DOMAIN_HIP_OPS:
       return HIP_OP_ID_NUMBER;
     case ACTIVITY_DOMAIN_HIP_API:
       return HIP_API_ID_LAST + 1;
@@ -810,7 +810,7 @@ static roctracer_status_t roctracer_enable_callback_fun(roctracer_domain_t domai
                         "HSA::RegisterEvtCallback error(" << op << ") failed");
       break;
     }
-    case ACTIVITY_DOMAIN_HCC_OPS:
+    case ACTIVITY_DOMAIN_HIP_OPS:
       break;
     case ACTIVITY_DOMAIN_HIP_API: {
       if (roctracer::HipLoader::Instance().Enabled() == false) break;
@@ -900,7 +900,7 @@ static roctracer_status_t roctracer_disable_callback_fun(roctracer_domain_t doma
       roctracer::hsa_support::cb_table.Set(op, NULL, NULL);
       break;
     }
-    case ACTIVITY_DOMAIN_HCC_OPS:
+    case ACTIVITY_DOMAIN_HIP_OPS:
       break;
     case ACTIVITY_DOMAIN_HIP_API: {
       if (roctracer::HipLoader::Instance().Enabled() == false) break;
@@ -1032,7 +1032,7 @@ static roctracer_status_t roctracer_enable_activity_fun(roctracer_domain_t domai
       break;
     case ACTIVITY_DOMAIN_HSA_EVT:
       break;
-    case ACTIVITY_DOMAIN_HCC_OPS: {
+    case ACTIVITY_DOMAIN_HIP_OPS: {
       const bool init_phase = (roctracer::HccLoader::GetRef() == NULL);
       if (roctracer::HccLoader::Instance().Enabled() == false) break;
 
@@ -1119,7 +1119,7 @@ static roctracer_status_t roctracer_disable_activity_fun(roctracer_domain_t doma
       break;
     case ACTIVITY_DOMAIN_HSA_EVT:
       break;
-    case ACTIVITY_DOMAIN_HCC_OPS: {
+    case ACTIVITY_DOMAIN_HIP_OPS: {
       if (roctracer::HccLoader::Instance().Enabled() == false) break;
 
       const bool succ = roctracer::HccLoader::Instance().EnableActivityCallback(op, false);
@@ -1305,7 +1305,7 @@ PUBLIC_API roctracer_status_t roctracer_set_properties(roctracer_domain_t domain
       roctracer::hsa_support::intercept_ImageExtTable(table->image_ext_);
       break;
     }
-    case ACTIVITY_DOMAIN_HCC_OPS:
+    case ACTIVITY_DOMAIN_HIP_OPS:
     case ACTIVITY_DOMAIN_HIP_API: {
       mark_api_callback_ptr = reinterpret_cast<mark_api_callback_t*>(properties);
       if (roctracer::hip_act_cb_tracker == NULL)
diff --git a/projects/roctracer/test/MatrixTranspose_test/MatrixTranspose.cpp b/projects/roctracer/test/MatrixTranspose_test/MatrixTranspose.cpp
index 35abedff85..87c4167dce 100644
--- a/projects/roctracer/test/MatrixTranspose_test/MatrixTranspose.cpp
+++ b/projects/roctracer/test/MatrixTranspose_test/MatrixTranspose.cpp
@@ -316,7 +316,7 @@ void activity_callback(const char* begin, const char* end, void* arg) {
            record->begin_ns, record->end_ns);
     if (record->domain == ACTIVITY_DOMAIN_HIP_API) {
       SPRINT(" process_id(%u) thread_id(%u)", record->process_id, record->thread_id);
-    } else if (record->domain == ACTIVITY_DOMAIN_HCC_OPS) {
+    } else if (record->domain == ACTIVITY_DOMAIN_HIP_OPS) {
       SPRINT(" device_id(%d) queue_id(%lu)", record->device_id, record->queue_id);
       if (record->op == HIP_OP_ID_COPY) SPRINT(" bytes(0x%zx)", record->bytes);
     } else if (record->domain == ACTIVITY_DOMAIN_HSA_OPS) {
@@ -352,7 +352,7 @@ void init_tracing() {
 #if HIP_API_ACTIVITY_ON
   ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HIP_API));
 #endif
-  ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HCC_OPS));
+  ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HIP_OPS));
   // Enable PC sampling
   ROCTRACER_CALL(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HSA_OPS, HSA_OP_ID_RESERVED1));
   // Enable rocTX
@@ -375,7 +375,7 @@ void stop_tracing() {
 #if HIP_API_ACTIVITY_ON
   ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HIP_API));
 #endif
-  ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HCC_OPS));
+  ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HIP_OPS));
   ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HSA_OPS));
   ROCTRACER_CALL(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_ROCTX));
   ROCTRACER_CALL(roctracer_flush_activity());
diff --git a/projects/roctracer/test/tool/tracer_tool.cpp b/projects/roctracer/test/tool/tracer_tool.cpp
index 209efe9895..3a720f35c7 100644
--- a/projects/roctracer/test/tool/tracer_tool.cpp
+++ b/projects/roctracer/test/tool/tracer_tool.cpp
@@ -595,7 +595,7 @@ roctracer::TraceBuffer<hip_act_trace_entry_t>* hip_act_trace_buffer = NULL;
 
 // HIP ACT trace buffer flush callback
 void hip_act_flush_cb(hip_act_trace_entry_t* entry) {
-  const uint32_t domain = ACTIVITY_DOMAIN_HCC_OPS;
+  const uint32_t domain = ACTIVITY_DOMAIN_HIP_OPS;
   const uint32_t op = 0;
   const char* name = roctracer_op_string(domain, op, entry->kind);
   if (name == NULL) {
@@ -635,7 +635,7 @@ void pool_activity_callback(const char* begin, const char* end, void* arg) {
         record->begin_ns, record->end_ns);
 
     switch (record->domain) {
-      case ACTIVITY_DOMAIN_HCC_OPS:
+      case ACTIVITY_DOMAIN_HIP_OPS:
         if (hip_memcpy_stats != NULL) {
           hip_act_trace_entry_t* entry = hip_act_trace_buffer->GetEntry();
           entry->kind = record->kind;
@@ -797,7 +797,7 @@ void tool_unload() {
   if (trace_hip_api || trace_hip_activity) {
     ROCTRACER_CALL(roctracer_disable_domain_callback(ACTIVITY_DOMAIN_HIP_API));
     ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HIP_API));
-    ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HCC_OPS));
+    ROCTRACER_CALL(roctracer_disable_domain_activity(ACTIVITY_DOMAIN_HIP_OPS));
   }
 
   // Flush tracing pool
@@ -1089,7 +1089,7 @@ extern "C" PUBLIC_API bool OnLoad(HsaApiTable* table, uint64_t runtime_version,
 
     if (trace_hip_activity) {
       hcc_activity_file_handle = open_output_file(output_prefix, "hcc_ops_trace.txt");
-      ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HCC_OPS));
+      ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HIP_OPS));
 
       if (is_stats_opt) {
         FILE* f = NULL;