diff --git a/examples/CC3200/cc3200_example.ld b/examples/CC3200/cc3200_example.ld
index aae516e8baf8b5a59dd0d754b5eb3189564b7b56..2a8ceb855fd9d793a2339e2e3bdd1453a40fbc01 100644
--- a/examples/CC3200/cc3200_example.ld
+++ b/examples/CC3200/cc3200_example.ld
@@ -1,7 +1,7 @@
 /*****************************************************************************
 * app.ld
 *
-* GCC Linker script for Mongoose IoT. Based on TI's example "blinky.ld".
+* GCC Linker script for Mongoose OS. Based on TI's example "blinky.ld".
 *
 * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ 
 * 
diff --git a/examples/CC3200/ccs/MG_hello/main.c b/examples/CC3200/ccs/MG_hello/main.c
index 081252284f703131c8a3bd9196dca0857548b2a9..49ba81acb37bb6f75e6c3346f8e2038ec98b4215 100644
--- a/examples/CC3200/ccs/MG_hello/main.c
+++ b/examples/CC3200/ccs/MG_hello/main.c
@@ -10,7 +10,7 @@
 // #define WIFI_STA_SSID "YourWiFi"
 // #define WIFI_STA_PASS "YourPass"
 
-#define MIOT_TASK_PRIORITY 3
+#define MGOS_TASK_PRIORITY 3
 #define MG_TASK_STACK_SIZE 8192
 
 #include <stdbool.h>
@@ -214,7 +214,7 @@ int main(void) {
     LOG(LL_ERROR, ("Failed to create SL task"));
   }
 
-  if (!mg_start_task(MIOT_TASK_PRIORITY, MG_TASK_STACK_SIZE, mg_init)) {
+  if (!mg_start_task(MGOS_TASK_PRIORITY, MG_TASK_STACK_SIZE, mg_init)) {
     LOG(LL_ERROR, ("Failed to create MG task"));
   }
 
diff --git a/examples/CC3200/main.c b/examples/CC3200/main.c
index c10a1cb8cbf7a241d1492da8b1ff849da01d8395..24eea055e31a9bec6d2f995b3b2996e3bad9ce87 100644
--- a/examples/CC3200/main.c
+++ b/examples/CC3200/main.c
@@ -44,7 +44,7 @@
 #define CONSOLE_BAUD_RATE 115200
 #define CONSOLE_UART UARTA0_BASE
 #define CONSOLE_UART_PERIPH PRCM_UARTA0
-#define MIOT_TASK_PRIORITY 3
+#define MGOS_TASK_PRIORITY 3
 #define MG_TASK_STACK_SIZE 8192
 
 #define BM222_ADDR 0x18
@@ -264,7 +264,7 @@ int main(void) {
     LOG(LL_ERROR, ("Failed to create SL task"));
   }
 
-  if (!mg_start_task(MIOT_TASK_PRIORITY, MG_TASK_STACK_SIZE, mg_init)) {
+  if (!mg_start_task(MGOS_TASK_PRIORITY, MG_TASK_STACK_SIZE, mg_init)) {
     LOG(LL_ERROR, ("Failed to create MG task"));
   }
 
diff --git a/examples/ESP8266_RTOS/user/esp_libc.c b/examples/ESP8266_RTOS/user/esp_libc.c
index 7d5a989deb8c1b79b7894948062ab3e2aa11b61a..f49e5b28b8c85a06d6e1ca1477f8bc6468e75b9d 100644
--- a/examples/ESP8266_RTOS/user/esp_libc.c
+++ b/examples/ESP8266_RTOS/user/esp_libc.c
@@ -29,7 +29,7 @@ _ssize_t _write_r(struct _reent *r, int fd, void *buf, size_t len) {
 
 /*
  * You'll need to implement _open_r and friends if you want file operations. See
- * https://github.com/cesanta/mongoose-iot/blob/master/fw/platforms/esp8266/user/esp_fs.c
+ * https://github.com/cesanta/mongoose-os/blob/master/fw/platforms/esp8266/user/esp_fs.c
  * for SPIFFS-based implementation.
  */
 
diff --git a/examples/ESP8266_RTOS/user/user_main.c b/examples/ESP8266_RTOS/user/user_main.c
index 7f083deedd62df7eebb9b65331583957f006e063..c8abb104154b9f9df5a26dd33ee352ce6abfa7cd 100644
--- a/examples/ESP8266_RTOS/user/user_main.c
+++ b/examples/ESP8266_RTOS/user/user_main.c
@@ -13,7 +13,7 @@
 #define MG_LISTEN_ADDR "80"
 
 #define MG_TASK_STACK_SIZE 4096
-#define MIOT_TASK_PRIORITY 1
+#define MGOS_TASK_PRIORITY 1
 
 void uart_div_modify(int uart_no, unsigned int freq);
 
@@ -105,5 +105,5 @@ void user_init(void) {
   uart_div_modify(0, UART_CLK_FREQ / 115200);
 
   xTaskCreate(mg_task, (const signed char *) "mongoose", MG_TASK_STACK_SIZE,
-              NULL, MIOT_TASK_PRIORITY, &s_mg_task_handle);
+              NULL, MGOS_TASK_PRIORITY, &s_mg_task_handle);
 }
diff --git a/examples/MSP432/ccs/MSP432_MG_hello/main.c b/examples/MSP432/ccs/MSP432_MG_hello/main.c
index c7d03ec703856a0ddd62a3bc11358f60a6648f91..42a7ab2048dad52bec1586437700789b601ca9e7 100644
--- a/examples/MSP432/ccs/MSP432_MG_hello/main.c
+++ b/examples/MSP432/ccs/MSP432_MG_hello/main.c
@@ -10,7 +10,7 @@
 // #define WIFI_STA_SSID "YourWiFi"
 // #define WIFI_STA_PASS "YourPass"
 
-#define MIOT_TASK_PRIORITY 3
+#define MGOS_TASK_PRIORITY 3
 #define MG_TASK_STACK_SIZE 8192
 
 #include <stdbool.h>
@@ -163,7 +163,7 @@ int main(void) {
   cs_log_set_level(LL_INFO);
   cs_log_set_file(stdout);
 
-  if (!mg_start_task(MIOT_TASK_PRIORITY, MG_TASK_STACK_SIZE, mg_init)) {
+  if (!mg_start_task(MGOS_TASK_PRIORITY, MG_TASK_STACK_SIZE, mg_init)) {
     LOG(LL_ERROR, ("Error starting Mongoose task"));
     return 1;
   }