diff --git a/README.md b/README.md
index a0ad6c74..6ec812d1 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Alternatively,
 - [Study mongoose example code](https://github.com/cesanta/mongoose/tree/master/examples)
 
 If you are looking for a complete IoT platform with firmware and cloud compotent,
-- [Check out Smart.js - a full stack IoT platform](https://github.com/cesanta/smart.js)
+- [Check out Smart.js - a full stack IoT platform](https://github.com/cesanta/iot)
 
 # Support
 - [Support Forum - Ask your technical questions here] (http://forum.cesanta.com/index.php?p=/categories/smart-js)
diff --git a/examples/CC3200/Makefile b/examples/CC3200/Makefile
index 227bc70b..5075cd5a 100644
--- a/examples/CC3200/Makefile
+++ b/examples/CC3200/Makefile
@@ -19,9 +19,9 @@ endif
 flash:
 	docker run --rm -it --privileged -v $(SRC_DIR):/src $(SDK) /bin/bash -c "\
 		cd /usr/local/bin; \
-		./cc3200prog $(PORT) /src/smartjs/platforms/cc3200/firmware/smartjs.bin \
+		./cc3200prog $(PORT) /src/fw/platforms/cc3200/firmware/fw.bin \
 	"
 
 debug:
 	docker run --rm -it --privileged -v $(SRC_DIR):/src $(SDK) \
-		/bin/bash -c "cd /src/smartjs/platforms/cc3200 && tools/gdb.sh"
+		/bin/bash -c "cd /src/fw/platforms/cc3200 && tools/gdb.sh"
diff --git a/examples/CC3200/cc3200_example.ld b/examples/CC3200/cc3200_example.ld
index 87dd371a..5adafd65 100644
--- a/examples/CC3200/cc3200_example.ld
+++ b/examples/CC3200/cc3200_example.ld
@@ -1,7 +1,7 @@
 /*****************************************************************************
 * app.ld
 *
-* GCC Linker script for SmartJS. Based on TI's example "blinky.ld".
+* GCC Linker script for Mongoose IoT. Based on TI's example "blinky.ld".
 *
 * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ 
 * 
diff --git a/examples/ESP8266_RTOS/user/esp_libc.c b/examples/ESP8266_RTOS/user/esp_libc.c
index 82362765..bee83d64 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/smart.js/blob/master/platforms/esp8266/user/esp_fs.c
+ * https://github.com/cesanta/iot/blob/master/platforms/esp8266/user/esp_fs.c
  * for SPIFFS-based implementation.
  */