diff --git a/inc/roctracer.h b/inc/roctracer.h
index 0c3c1b241c..3d549dbd1d 100644
--- a/inc/roctracer.h
+++ b/inc/roctracer.h
@@ -24,10 +24,10 @@
 //
 // ROC-tracer library, Runtimes Generic Callback/Activity APIs.
 // The goal of the implementation is to provide a generic independent from
-// specific runtime profiler to trace API and asyncronous activity.
+// specific runtime profiler to trace API and asynchronous activity.
 //
 // The API provides functionality for registering the runtimes API callbacks and
-// asyncronous activity records pool support.
+// asynchronous activity records pool support.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -55,7 +55,7 @@ uint32_t roctracer_version_major();
 uint32_t roctracer_version_minor();
 
 ////////////////////////////////////////////////////////////////////////////////
-// Library errors enumaration
+// Library errors enumeration
 typedef enum {
   ROCTRACER_STATUS_SUCCESS = 0,
   ROCTRACER_STATUS_ERROR = 1,
@@ -159,8 +159,8 @@ typedef void (*roctracer_buffer_callback_t)(
 typedef struct {
   uint32_t mode;                                    // roctracer mode
   size_t buffer_size;                               // buffer size
-  roctracer_allocator_t alloc_fun;                  // memory alocator function pointer
-  void* alloc_arg;                                  // memory alocator function pointer
+  roctracer_allocator_t alloc_fun;                  // memory allocator function pointer
+  void* alloc_arg;                                  // memory allocator function pointer
   roctracer_buffer_callback_t buffer_callback_fun;  // tracer record callback function
   void* buffer_callback_arg;                        // tracer record callback arg
 } roctracer_properties_t;
@@ -242,7 +242,7 @@ void roctracer_flush_buf();
 
 // Set properties
 roctracer_status_t roctracer_set_properties(roctracer_domain_t domain,  // tracing domain
-                                            void* propertes);           // tracing properties
+                                            void* properties);          // tracing properties
 
 #ifdef __cplusplus
 }  // extern "C" block
diff --git a/inc/roctracer_roctx.h b/inc/roctracer_roctx.h
index 3beee3060b..59936c2732 100644
--- a/inc/roctracer_roctx.h
+++ b/inc/roctracer_roctx.h
@@ -74,10 +74,10 @@ typedef struct roctx_api_data_s {
   } args;
 } roctx_api_data_t;
 
-// Regiter ROCTX callback for given opertaion id
+// Regiter ROCTX callback for given operation id
 bool RegisterApiCallback(uint32_t op, void* callback, void* arg);
 
-// Remove ROCTX callback for given opertaion id
+// Remove ROCTX callback for given operation id
 bool RemoveApiCallback(uint32_t op);
 
 // Iterate range stack to support tracing start/stop
diff --git a/src/core/roctracer.cpp b/src/core/roctracer.cpp
index 57c679c95d..da23084f63 100644
--- a/src/core/roctracer.cpp
+++ b/src/core/roctracer.cpp
@@ -236,7 +236,7 @@ TraceBuffer<trace_entry_t>* trace_buffer = NULL;
 namespace hsa_support {
 // callbacks table
 cb_table_t cb_table;
-// asyc copy activity callback
+// async copy activity callback
 bool async_copy_callback_enabled = false;
 activity_async_callback_t async_copy_callback_fun = NULL;
 void* async_copy_callback_arg = NULL;
@@ -252,7 +252,7 @@ ImageExtTable ImageExtTable_saved{};
 namespace ext_support {
 roctracer_start_cb_t roctracer_start_cb = NULL;
 roctracer_stop_cb_t roctracer_stop_cb = NULL;
-}  // namespace ext_suppoprt
+}  // namespace ext_support
 
 roctracer_status_t GetExcStatus(const std::exception& e) {
   const util::exception* roctracer_exc_ptr = dynamic_cast<const util::exception*>(&e);
@@ -391,7 +391,7 @@ void* HIP_SyncApiDataCallback(uint32_t op_id, roctracer_record_t* record, const
       data_ptr->correlation_id = correlation_id;
     }
 
-    // Passing correlatin ID
+    // Passing correlation ID
     correlation_id_tls = correlation_id;
 
     ret = data_ptr;
@@ -399,7 +399,7 @@ void* HIP_SyncApiDataCallback(uint32_t op_id, roctracer_record_t* record, const
     // popping the record entry
     if (!record_pair_stack->empty()) record_pair_stack->pop();
 
-    // Clearing correlatin ID
+    // Clearing correlation ID
     correlation_id_tls = 0;
   }
 
@@ -458,7 +458,7 @@ void* HIP_SyncActivityCallback(uint32_t op_id, roctracer_record_t* record,
     }
     record->correlation_id = correlation_id;
 
-    // Passing correlatin ID
+    // Passing correlation ID
     correlation_id_tls = correlation_id;
 
     ret = data_ptr;
@@ -493,7 +493,7 @@ void* HIP_SyncActivityCallback(uint32_t op_id, roctracer_record_t* record,
     // popping the record entry
     if (!record_pair_stack->empty()) record_pair_stack->pop();
 
-    // Clearing correlatin ID
+    // Clearing correlation ID
     correlation_id_tls = 0;
   }
 
@@ -614,7 +614,7 @@ MemoryPool* memory_pool = NULL;
 typedef std::recursive_mutex memory_pool_mutex_t;
 memory_pool_mutex_t memory_pool_mutex;
 
-// Stop sttaus routines and primitives
+// Stop status routines and primitives
 unsigned stop_status_value = 0;
 typedef std::mutex stop_status_mutex_t;
 stop_status_mutex_t stop_status_mutex;
@@ -634,7 +634,7 @@ TRACE_BUFFER_INSTANTIATE();
 //
 extern "C" {
 
-// Returns library vesrion
+// Returns library version
 PUBLIC_API uint32_t roctracer_version_major() { return ROCTRACER_VERSION_MAJOR; }
 PUBLIC_API uint32_t roctracer_version_minor() { return ROCTRACER_VERSION_MINOR; }
 
diff --git a/src/roctx/roctx.cpp b/src/roctx/roctx.cpp
index bbdf670541..5bb959a354 100644
--- a/src/roctx/roctx.cpp
+++ b/src/roctx/roctx.cpp
@@ -66,7 +66,7 @@ inline uint32_t GetPid() { return syscall(__NR_getpid); }
 inline uint32_t GetTid() { return syscall(__NR_gettid); }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Library errors enumaration
+// Library errors enumeration
 typedef enum {
   ROCTX_STATUS_SUCCESS = 0,
   ROCTX_STATUS_ERROR = 1,