diff --git a/include/openthread.h b/include/openthread.h
index 836d3b293..5ea43a184 100644
--- a/include/openthread.h
+++ b/include/openthread.h
@@ -949,7 +949,7 @@ OTAPI ThreadError OTCALL otGetPendingDataset(otInstance *aInstance, otOperationa
  * @param[in]  aDataset  A pointer to the Pending Operational Dataset.
  *
  * @retval kThreadError_None         Successfully set the Pending Operational Dataset.
- * @retval kThreadError_NoBufs       Insufficient buffer space to set the Pending Operational Datset.
+ * @retval kThreadError_NoBufs       Insufficient buffer space to set the Pending Operational Dataset.
  * @retval kThreadError_InvalidArgs  @p aDataset was NULL.
  *
  */
diff --git a/src/core/common/message.hpp b/src/core/common/message.hpp
index 816bc5cfa..d5a099723 100644
--- a/src/core/common/message.hpp
+++ b/src/core/common/message.hpp
@@ -965,7 +965,7 @@ public:
 
     public:
         /**
-         * This construct initializes an empty iterator.
+         * This constructor initializes an empty iterator.
          */
         Iterator(void) : mMessage(NULL) { }
 
diff --git a/src/core/common/timer.hpp b/src/core/common/timer.hpp
index b2c24e0e7..f088a73eb 100644
--- a/src/core/common/timer.hpp
+++ b/src/core/common/timer.hpp
@@ -150,7 +150,7 @@ public:
     /**
      * This constructor creates a timer instance.
      *
-     * @param[in]  aScheduler  A refrence to the timer scheduler.
+     * @param[in]  aScheduler  A reference to the timer scheduler.
      * @param[in]  aHandler    A pointer to a function that is called when the timer expires.
      * @param[in]  aContext    A pointer to arbitrary context information.
      *
diff --git a/src/core/openthread-core-default-config.h b/src/core/openthread-core-default-config.h
index 1bb235d65..672b3dfd8 100644
--- a/src/core/openthread-core-default-config.h
+++ b/src/core/openthread-core-default-config.h
@@ -152,7 +152,7 @@
  *
  */
 #ifndef OPENTHREAD_CONFIG_MPL_SEED_SET_ENTRIES
-#define OPENTHREAD_CONFIG_MPL_SEED_SET_ENTRIES                 32
+#define OPENTHREAD_CONFIG_MPL_SEED_SET_ENTRIES                  32
 #endif  // OPENTHREAD_CONFIG_MPL_SEED_SET_ENTRIES
 
 /**
@@ -162,7 +162,7 @@
  *
  */
 #ifndef OPENTHREAD_CONFIG_MPL_SEED_SET_ENTRY_LIFETIME
-#define OPENTHREAD_CONFIG_MPL_SEED_SET_ENTRY_LIFETIME          5
+#define OPENTHREAD_CONFIG_MPL_SEED_SET_ENTRY_LIFETIME           5
 #endif  // OPENTHREAD_CONFIG_MPL_SEED_SET_ENTRY_LIFETIME
 
 /**
@@ -410,7 +410,7 @@
 #endif  // OPENTHREAD_CONFIG_LOG_PLATFORM
 
 /**
- * @def OPENTHREAD_CONFIG_LOG_PREPREND_LEVEL
+ * @def OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL
  *
  * Define to prepend the log level to all log messages
  *
@@ -420,7 +420,7 @@
 #endif  // OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL
 
 /**
-* @def OPENTHREAD_CONFIG_LOG_PREPREND_REGION
+* @def OPENTHREAD_CONFIG_LOG_PREPEND_REGION
 *
 * Define to prepend the log region to all log messages
 *
@@ -466,7 +466,7 @@
  *
  */
 #ifndef OPENTHREAD_CONFIG_NCP_TX_BUFFER_SIZE
-#define OPENTHREAD_CONFIG_NCP_TX_BUFFER_SIZE                   512
+#define OPENTHREAD_CONFIG_NCP_TX_BUFFER_SIZE                    512
 #endif  // OPENTHREAD_CONFIG_NCP_TX_BUFFER_SIZE
 
 /**
@@ -476,7 +476,7 @@
  *
  */
 #ifndef OPENTHREAD_CONFIG_NCP_UART_TX_CHUNK_SIZE
-#define OPENTHREAD_CONFIG_NCP_UART_TX_CHUNK_SIZE               128
+#define OPENTHREAD_CONFIG_NCP_UART_TX_CHUNK_SIZE                128
 #endif  // OPENTHREAD_CONFIG_NCP_UART_TX_CHUNK_SIZE
 
 /**
@@ -486,7 +486,7 @@
  *
  */
 #ifndef OPENTHREAD_CONFIG_NCP_UART_RX_BUFFER_SIZE
-#define OPENTHREAD_CONFIG_NCP_UART_RX_BUFFER_SIZE              1500
+#define OPENTHREAD_CONFIG_NCP_UART_RX_BUFFER_SIZE               1500
 #endif  // OPENTHREAD_CONFIG_NCP_UART_RX_BUFFER_SIZE
 
 /**
@@ -496,7 +496,7 @@
  *
  */
 #ifndef OPENTHREAD_CONFIG_NCP_SPI_BUFFER_SIZE
-#define OPENTHREAD_CONFIG_NCP_SPI_BUFFER_SIZE                  1500
+#define OPENTHREAD_CONFIG_NCP_SPI_BUFFER_SIZE                   1500
 #endif  // OPENTHREAD_CONFIG_NCP_SPI_BUFFER_SIZE
 
 #endif  // OPENTHREAD_CORE_DEFAULT_CONFIG_H_
diff --git a/tests/unit/test_priority_queue.cpp b/tests/unit/test_priority_queue.cpp
index 66373b5bf..5e45304bd 100644
--- a/tests/unit/test_priority_queue.cpp
+++ b/tests/unit/test_priority_queue.cpp
@@ -35,7 +35,7 @@
 
 #define kNumTestMessages      3
 
-// This function verifies the content of the priority queue to matches the passed in messages
+// This function verifies the content of the priority queue to match the passed in messages
 void VerifyPriorityQueueContent(Thread::PriorityQueue &aPriorityQueue, int aExpectedLength, ...)
 {
     va_list args;
@@ -138,7 +138,7 @@ void VerifyAllMessagesContent(Thread::MessagePool &aMessagePool, int aExpectedLe
     va_end(args);
 }
 
-// This function verifies the content of the all message queue to match the passed in messages , but it goes
+// This function verifies the content of the all message queue to match the passed in messages. It goes
 // through the AllMessages list in reverse.
 void VerifyAllMessagesContentInReverse(Thread::MessagePool &aMessagePool, int aExpectedLength, ...)
 {