diff --git a/bare-arm/mpconfigport.h b/bare-arm/mpconfigport.h
index 97e866bdb737ee1fc69e94c329e0da9ecaf6bf76..17f7945218139673c4d3b703770b280f48fcc8b0 100644
--- a/bare-arm/mpconfigport.h
+++ b/bare-arm/mpconfigport.h
@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-// options to control how Micro Python is built
+// options to control how MicroPython is built
 
 #define MICROPY_QSTR_BYTES_IN_HASH  (1)
 #define MICROPY_ALLOC_PATH_MAX      (512)
diff --git a/cc3200/application.lds b/cc3200/application.lds
index 22ad1968d5c8c3d9efc8eecf4019cb2400dcd7b8..3f5e72f8bd650f6e206a925980f6556b2b362528 100644
--- a/cc3200/application.lds
+++ b/cc3200/application.lds
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -37,7 +37,7 @@ ENTRY(ResetISR)
 
 SECTIONS
 {  
-    /* place the FreeRTOS heap (the micropython stack will live here) */
+    /* place the FreeRTOS heap (the MicroPython stack will live here) */
     .rtos_heap (NOLOAD) :
     {
         . = ALIGN(8);
@@ -83,7 +83,7 @@ SECTIONS
     } > SRAM
 
     /* place here functions that are only called during boot up, */
-    /* that way, we can re-use this area for the micropython heap */
+    /* that way, we can re-use this area for the MicroPython heap */
     .boot :
     {
         . = ALIGN(8);
@@ -93,7 +93,7 @@ SECTIONS
         _eboot = .;
     } > SRAM
      
-    /* allocate the micropython heap */
+    /* allocate the MicroPython heap */
     .heap :
     {
         . = ALIGN(8);
diff --git a/cc3200/boards/LAUNCHXL/mpconfigboard.h b/cc3200/boards/LAUNCHXL/mpconfigboard.h
index 32ef5290b45a2b03c6d780502dbcd0fc94244699..b3d766d1e242d79a1102f3763264d1267ae7013a 100644
--- a/cc3200/boards/LAUNCHXL/mpconfigboard.h
+++ b/cc3200/boards/LAUNCHXL/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/boards/WIPY/mpconfigboard.h b/cc3200/boards/WIPY/mpconfigboard.h
index 9f04dbf2375813351a6bb128c4e344b33ad7be43..af15cca3508fa9c45df633f90b87757ed7ac1670 100644
--- a/cc3200/boards/WIPY/mpconfigboard.h
+++ b/cc3200/boards/WIPY/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/boards/cc3200_prefix.c b/cc3200/boards/cc3200_prefix.c
index 9712857453cb581cecc58f6f469caffe470158b7..d03efe0240b79129c964df8c6632c39861cf4126 100644
--- a/cc3200/boards/cc3200_prefix.c
+++ b/cc3200/boards/cc3200_prefix.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/bootmgr/bootmgr.h b/cc3200/bootmgr/bootmgr.h
index e5285d4e465a03ca619f333af92f35ff48f19327..5a370f8c99a76e8a569915b5b292097719c93fba 100644
--- a/cc3200/bootmgr/bootmgr.h
+++ b/cc3200/bootmgr/bootmgr.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/bootmgr/bootmgr.lds b/cc3200/bootmgr/bootmgr.lds
index e67fe23ae61137d7e31ef6dea05b5e5ff7b40138..9c911a0d08ab70ce5e6d9d1028739f96f8f27894 100644
--- a/cc3200/bootmgr/bootmgr.lds
+++ b/cc3200/bootmgr/bootmgr.lds
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/bootmgr/flc.h b/cc3200/bootmgr/flc.h
index 7c04c7b054183c4c0477eed4f193e0b95c747934..8f05bb320e726a18652d50a4d7ae52df7f7e64b1 100644
--- a/cc3200/bootmgr/flc.h
+++ b/cc3200/bootmgr/flc.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/bootmgr/main.c b/cc3200/bootmgr/main.c
index 0d9ab35f83453421d1e550e5ae166444637ceb5c..cfb8dec21d38ee01f50154ffabcee1a7d4c88f63 100644
--- a/cc3200/bootmgr/main.c
+++ b/cc3200/bootmgr/main.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/ftp/ftp.c b/cc3200/ftp/ftp.c
index b56e3f4ce5aff855c99f2661a4b64c0137aa78b4..5461f9180aeb2b9de0fe5da0e244df200916fef4 100644
--- a/cc3200/ftp/ftp.c
+++ b/cc3200/ftp/ftp.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/ftp/ftp.h b/cc3200/ftp/ftp.h
index 7d16002e46c67bbc76b3b9a84968bc753f6d6af8..af4c14fa3bad71112fbcb93f49c56acf31344496 100644
--- a/cc3200/ftp/ftp.h
+++ b/cc3200/ftp/ftp.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/ftp/updater.c b/cc3200/ftp/updater.c
index fece70095bc0b7324a374718a90ec3bb0d3da44b..5be2c6063c9bab11f41fce734774e31cae6c2655 100644
--- a/cc3200/ftp/updater.c
+++ b/cc3200/ftp/updater.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/ftp/updater.h b/cc3200/ftp/updater.h
index dcca7047280486829eda5f8da3f19f983080830b..51248e4bf3bce50a9a4f48980efaccd4c0930f73 100644
--- a/cc3200/ftp/updater.h
+++ b/cc3200/ftp/updater.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/hal/cc3200_asm.h b/cc3200/hal/cc3200_asm.h
index dcaaf57e1bbb7a31a953fcde9ea411316ceb1137..742c9a6f7f6b51b5d0073b0f138b73fa27ce0018 100644
--- a/cc3200/hal/cc3200_asm.h
+++ b/cc3200/hal/cc3200_asm.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/hal/cc3200_hal.c b/cc3200/hal/cc3200_hal.c
index 5c0e9c30fb745137c7eaf549ef4590ef36a1c22d..b4848e99e80996ccb16a2b9f96ebd9640c1df833 100644
--- a/cc3200/hal/cc3200_hal.c
+++ b/cc3200/hal/cc3200_hal.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/hal/cc3200_hal.h b/cc3200/hal/cc3200_hal.h
index 9953f0e5a287b20a6f419f8b4a1aaab8d187d974..71e245eeb1c5d0a3c1a022b20c848dbcc952d544 100644
--- a/cc3200/hal/cc3200_hal.h
+++ b/cc3200/hal/cc3200_hal.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/hal/fault_registers.h b/cc3200/hal/fault_registers.h
index 739745e92a0aa9cc9c15dec6e8c39a02ae7027ea..ade516b9e430e28e31a19280560472f51f14e90f 100644
--- a/cc3200/hal/fault_registers.h
+++ b/cc3200/hal/fault_registers.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/main.c b/cc3200/main.c
index 1ffb98188056f95e25a699ecfd17d2c49f311962..e2299e14604da069683f0489f3258964e274fcb3 100644
--- a/cc3200/main.c
+++ b/cc3200/main.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/misc/FreeRTOSHooks.c b/cc3200/misc/FreeRTOSHooks.c
index dac9a92826358e42b311a318dcba8bfd38b30d3c..c618279b7e0faca93cc685f1e9c5bee7307d1fc5 100644
--- a/cc3200/misc/FreeRTOSHooks.c
+++ b/cc3200/misc/FreeRTOSHooks.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/misc/antenna.c b/cc3200/misc/antenna.c
index 0fbf79f0fcfb6d54f43e03552904033242665638..afeed85e18a8b68bcb39632bbc1054b4b815a018 100644
--- a/cc3200/misc/antenna.c
+++ b/cc3200/misc/antenna.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/misc/antenna.h b/cc3200/misc/antenna.h
index 3bb87e32b9e7d9f6ceef492f756c2d20cd83d398..c9d845453e0950192a28db6f8331c41dfc34c412 100644
--- a/cc3200/misc/antenna.h
+++ b/cc3200/misc/antenna.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/misc/help.c b/cc3200/misc/help.c
index cce515898e5751b6c6b6a997140001ea09eec324..739303e193ef10d839c4775d51020a731fbeb44c 100644
--- a/cc3200/misc/help.c
+++ b/cc3200/misc/help.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/misc/mperror.c b/cc3200/misc/mperror.c
index 81b853b48217496a16072cfa5374731e56662453..082d940e2f3ac8a35dbedf8de8e57e5bda58a542 100644
--- a/cc3200/misc/mperror.c
+++ b/cc3200/misc/mperror.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/misc/mperror.h b/cc3200/misc/mperror.h
index 46a9b8cb0480f45f471869d151910ba48967f2c2..1c3eb62697009f3e09ddf757c68cc1cfc0c47d9a 100644
--- a/cc3200/misc/mperror.h
+++ b/cc3200/misc/mperror.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/misc/mpexception.c b/cc3200/misc/mpexception.c
index 068adb70b0c715b17a7a488c19793e4465842ce7..72b203fae3f83d0a6a8338c4df6bf7fb93ea43ec 100644
--- a/cc3200/misc/mpexception.c
+++ b/cc3200/misc/mpexception.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/misc/mpexception.h b/cc3200/misc/mpexception.h
index d23381cafca539092b30db998a6ae51876ef0959..88134857c1279c92414551e3b9127bed259abbf3 100644
--- a/cc3200/misc/mpexception.h
+++ b/cc3200/misc/mpexception.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/misc/mpirq.c b/cc3200/misc/mpirq.c
index 37149089f233af7aa392ed5865d7ae684712aa81..321663088d13a9b002fab37cd50040b42d997b21 100644
--- a/cc3200/misc/mpirq.c
+++ b/cc3200/misc/mpirq.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -143,7 +143,7 @@ void mp_irq_handler (mp_obj_t self_in) {
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 STATIC mp_obj_t mp_irq_init (mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_irq_obj_t *self = pos_args[0];
diff --git a/cc3200/misc/mpirq.h b/cc3200/misc/mpirq.h
index 8b4ab2f1b8db4a40c81576dfcd3f5d583f7c1c6b..35ce66e2da2bae68829328f23dd69c7875e7ae6d 100644
--- a/cc3200/misc/mpirq.h
+++ b/cc3200/misc/mpirq.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/modmachine.c b/cc3200/mods/modmachine.c
index fd1485607689aa8a1167af7d791606bb2c07084b..5f63d019675292e020b5e684e8b2883943b839bf 100644
--- a/cc3200/mods/modmachine.c
+++ b/cc3200/mods/modmachine.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -72,7 +72,7 @@ extern OsiTaskHandle    xSimpleLinkSpawnTaskHndl;
 ///
 
 /******************************************************************************/
-// Micro Python bindings;
+// MicroPython bindings;
 
 STATIC mp_obj_t machine_reset(void) {
     // disable wlan
diff --git a/cc3200/mods/modnetwork.c b/cc3200/mods/modnetwork.c
index d44f75acae678196a7480f49779ab61d3aa8cdec..249e1be3721d045616323db7ca65235c32f8d86a 100644
--- a/cc3200/mods/modnetwork.c
+++ b/cc3200/mods/modnetwork.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/modnetwork.h b/cc3200/mods/modnetwork.h
index 8e1196e8682dab703356c35921c271b5c234d2c6..6ec90a2bac189464280ef33034fe628267af06c5 100644
--- a/cc3200/mods/modnetwork.h
+++ b/cc3200/mods/modnetwork.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/modubinascii.c b/cc3200/mods/modubinascii.c
index 09f4b1e10171b3e353bf95546cc63548dcdbc798..8bc2feacc1ba5c388988d522bd7554ee35e85ae3 100644
--- a/cc3200/mods/modubinascii.c
+++ b/cc3200/mods/modubinascii.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -44,7 +44,7 @@
 
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 STATIC const mp_map_elem_t mp_module_binascii_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__),        MP_OBJ_NEW_QSTR(MP_QSTR_ubinascii) },
diff --git a/cc3200/mods/modubinascii.h b/cc3200/mods/modubinascii.h
index 3e784e9aec10248d5b266c5ddc348c584beb4c65..eb9fc4f21961094d2f77550769ea083019202d27 100644
--- a/cc3200/mods/modubinascii.h
+++ b/cc3200/mods/modubinascii.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/moduhashlib.c b/cc3200/mods/moduhashlib.c
index e1145e4d8f6e01002c871aabddb8985555dff7ca..c90c727c2ae8bd15b078ceb648ab89cbc032931f 100644
--- a/cc3200/mods/moduhashlib.c
+++ b/cc3200/mods/moduhashlib.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -117,7 +117,7 @@ STATIC mp_obj_t hash_read (mp_obj_t self_in) {
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 /// \classmethod \constructor([data[, block_size]])
 /// initial data must be given if block_size wants to be passed
diff --git a/cc3200/mods/moduos.c b/cc3200/mods/moduos.c
index ed8879bf3ee7b8c2285a1d73dc8fa91800bd7d08..51dc5834d4bd26b53f9591896fef2a4fe39a503c 100644
--- a/cc3200/mods/moduos.c
+++ b/cc3200/mods/moduos.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -78,7 +78,7 @@ void osmount_unmount_all (void) {
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 //
 
 STATIC const qstr os_uname_info_fields[] = {
diff --git a/cc3200/mods/moduos.h b/cc3200/mods/moduos.h
index 148cddf2e2b77debeb4fb8fd134e183b2cc6ff71..f183715c907ca49c6b70eaa33cf211a5eabedc36 100644
--- a/cc3200/mods/moduos.h
+++ b/cc3200/mods/moduos.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/modusocket.c b/cc3200/mods/modusocket.c
index 4e17bbae62461dde9b5d9fd80ad9018bb8823279..739355360701e11225f97055abc0664a2c800514 100644
--- a/cc3200/mods/modusocket.c
+++ b/cc3200/mods/modusocket.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/modusocket.h b/cc3200/mods/modusocket.h
index 80c1f24cd8a2a1fd0462d1dc6f3e316f239b332e..6e7758662e0822539b2c754c60c3816f6e38729a 100644
--- a/cc3200/mods/modusocket.h
+++ b/cc3200/mods/modusocket.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/modussl.c b/cc3200/mods/modussl.c
index 95ecdbce7d61edd2844a8f889c5b2a2187c683fb..8082675718cafca506c263b09db64c5c7bd53808 100644
--- a/cc3200/mods/modussl.c
+++ b/cc3200/mods/modussl.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -57,7 +57,7 @@ typedef struct _mp_obj_ssl_socket_t {
 STATIC const mp_obj_type_t ssl_socket_type;
 
 /******************************************************************************/
-// Micro Python bindings; SSL class
+// MicroPython bindings; SSL class
 
 // ssl sockets inherit from normal socket, so we take its
 // locals and stream methods
diff --git a/cc3200/mods/modutime.c b/cc3200/mods/modutime.c
index 48fde67e7e2af236642675967c3f15c4a567fe91..428b00f93e2d8c9fb9e02cb66b2f69dc566ba473 100644
--- a/cc3200/mods/modutime.c
+++ b/cc3200/mods/modutime.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -51,7 +51,7 @@
 /// and for sleeping.
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 /// \function localtime([secs])
 /// Convert a time expressed in seconds since Jan 1, 2000 into an 8-tuple which
diff --git a/cc3200/mods/modwipy.c b/cc3200/mods/modwipy.c
index b4c18d1530ff1ed5c4a83f906a41d4a2c53514bd..21a9cc63b5ee44f8bad0866189a8f0c239417a03 100644
--- a/cc3200/mods/modwipy.c
+++ b/cc3200/mods/modwipy.c
@@ -5,7 +5,7 @@
 
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 STATIC mp_obj_t mod_wipy_heartbeat (mp_uint_t n_args, const mp_obj_t *args) {
     if (n_args) {
diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c
index 68d892364f8bcafafe364ba0c9eea4df714b4b5c..77f5bd9915b658acfec6603d163afa405502c897 100644
--- a/cc3200/mods/modwlan.c
+++ b/cc3200/mods/modwlan.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -763,7 +763,7 @@ STATIC bool wlan_scan_result_is_unique (const mp_obj_list_t *nets, _u8 *bssid) {
 }
 
 /******************************************************************************/
-// Micro Python bindings; WLAN class
+// MicroPython bindings; WLAN class
 
 /// \class WLAN - WiFi driver
 
diff --git a/cc3200/mods/modwlan.h b/cc3200/mods/modwlan.h
index d37d276e8ce1c14561d2f030a473f00b5f9107cb..b806644f55e93f1f8b2d16d98404a7f92c389068 100644
--- a/cc3200/mods/modwlan.h
+++ b/cc3200/mods/modwlan.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/pybadc.c b/cc3200/mods/pybadc.c
index 696e7650b381dc8f51cbccdb982a565491cf4dfc..0b4f0ba68ce89fd793fb007509f218566b7941e1 100644
--- a/cc3200/mods/pybadc.c
+++ b/cc3200/mods/pybadc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -126,7 +126,7 @@ STATIC void pyb_adc_deinit_all_channels (void) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings : adc object                                         */
+/* MicroPython bindings : adc object                                         */
 
 STATIC void adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_adc_obj_t *self = self_in;
diff --git a/cc3200/mods/pybadc.h b/cc3200/mods/pybadc.h
index 50640ee6033dc7510dcd08da61908404c256f11c..db04b006bc20a1ab71afeb331851f1550ef8cf64 100644
--- a/cc3200/mods/pybadc.h
+++ b/cc3200/mods/pybadc.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/pybi2c.c b/cc3200/mods/pybi2c.c
index 9fc97d91402559a477e18d4743885cd974fbfede..9c62ffdc4c2b955a840d2dabec3d79b3a9a9912b 100644
--- a/cc3200/mods/pybi2c.c
+++ b/cc3200/mods/pybi2c.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -281,7 +281,7 @@ STATIC void pyb_i2c_readmem_into (mp_arg_val_t *args, vstr_t *vstr) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                      */
 /******************************************************************************/
 STATIC void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_i2c_obj_t *self = self_in;
diff --git a/cc3200/mods/pybi2c.h b/cc3200/mods/pybi2c.h
index d547f6330ef4cd57cfa81bfb9ab82d9d5a1b9840..dcc3f0468ceadcbae5e60fec3176297f0827d399 100644
--- a/cc3200/mods/pybi2c.h
+++ b/cc3200/mods/pybi2c.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/pybpin.c b/cc3200/mods/pybpin.c
index c2a46911740ec72d4874a5c2bfeb24cdf24c9dec..d59f113eb5a6e021907d41be3167bf31272d534d 100644
--- a/cc3200/mods/pybpin.c
+++ b/cc3200/mods/pybpin.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -519,7 +519,7 @@ STATIC void EXTI_Handler(uint port) {
 
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 STATIC const mp_arg_t pin_init_args[] = {
     { MP_QSTR_mode,                        MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
diff --git a/cc3200/mods/pybpin.h b/cc3200/mods/pybpin.h
index 6b4b7b1ed8d5f0837d0c9507cdb28ed9c9983282..74f0af2b3ca65177116792ec4b2e1344176dcfa5 100644
--- a/cc3200/mods/pybpin.h
+++ b/cc3200/mods/pybpin.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/pybrtc.c b/cc3200/mods/pybrtc.c
index 134bd440e780c82e91304ebe66e9a931be93c69c..14c4cd41998a6a27630cb47d78eea4f5c1903234 100644
--- a/cc3200/mods/pybrtc.c
+++ b/cc3200/mods/pybrtc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -278,7 +278,7 @@ STATIC void rtc_msec_add (uint16_t msecs_1, uint32_t *secs, uint16_t *msecs_2) {
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 STATIC const mp_arg_t pyb_rtc_init_args[] = {
     { MP_QSTR_id,                             MP_ARG_INT, {.u_int = 0} },
diff --git a/cc3200/mods/pybrtc.h b/cc3200/mods/pybrtc.h
index 3fd11ecd60ce8dd3478c9b2e25462edb3e4482d2..f73de3f5a75bdf2a96a6b06a8ad5d8ea8649293b 100644
--- a/cc3200/mods/pybrtc.h
+++ b/cc3200/mods/pybrtc.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/pybsd.c b/cc3200/mods/pybsd.c
index 306baea8baccb5bf2d7238362746d62af15a5330..5ba6119b29b08fa6a17b593b80bf44b291d4067a 100644
--- a/cc3200/mods/pybsd.c
+++ b/cc3200/mods/pybsd.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -118,7 +118,7 @@ STATIC mp_obj_t pyb_sd_init_helper (pybsd_obj_t *self, const mp_arg_val_t *args)
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 //
 
 STATIC const mp_arg_t pyb_sd_init_args[] = {
diff --git a/cc3200/mods/pybsd.h b/cc3200/mods/pybsd.h
index 084d7caaf20f129aab85db7405fc1753944c8ce1..af942084d774be73d04aff4a12b7bbe5982260ed 100644
--- a/cc3200/mods/pybsd.h
+++ b/cc3200/mods/pybsd.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/pybsleep.c b/cc3200/mods/pybsleep.c
index ced7fef852b145b675dfe5bd6f57ab45e6b478a1..a7488c5f14e6c21410174bc5a19769dfca9a5175 100644
--- a/cc3200/mods/pybsleep.c
+++ b/cc3200/mods/pybsleep.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/pybsleep.h b/cc3200/mods/pybsleep.h
index 513e6fa951cec7e068dbaf070541fe84115b472a..e98636178dc5dd7098fde24dea49e0906b94fb2f 100644
--- a/cc3200/mods/pybsleep.h
+++ b/cc3200/mods/pybsleep.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/pybspi.c b/cc3200/mods/pybspi.c
index 3cd384266afff925cdccd9d73ad90707115201b7..9edad579a3b8114d734b089151f4f01210b4b5b2 100644
--- a/cc3200/mods/pybspi.c
+++ b/cc3200/mods/pybspi.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -144,7 +144,7 @@ STATIC void pybspi_transfer (pyb_spi_obj_t *self, const char *txdata, char *rxda
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                      */
 /******************************************************************************/
 STATIC void pyb_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_spi_obj_t *self = self_in;
diff --git a/cc3200/mods/pybspi.h b/cc3200/mods/pybspi.h
index b533b6056e8f9a10827648034af3d08e5042b1e6..b0fce88703012901ec14a9afb3ac86bb6dbfb3b1 100644
--- a/cc3200/mods/pybspi.h
+++ b/cc3200/mods/pybspi.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/pybtimer.c b/cc3200/mods/pybtimer.c
index d25ac6c2b341546c6aeff74a8ec18ed8ad8eb69e..1ef9a4a4406b054b60b280c9dc3d62d4bf3ab090 100644
--- a/cc3200/mods/pybtimer.c
+++ b/cc3200/mods/pybtimer.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -264,7 +264,7 @@ STATIC void timer_channel_init (pyb_timer_channel_obj_t *ch) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                      */
 
 STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_timer_obj_t *tim = self_in;
diff --git a/cc3200/mods/pybtimer.h b/cc3200/mods/pybtimer.h
index a1b30cd2b0796794f5f5ef9cd11c39979a2cf291..0af0864ca111c61e20030ef69c37650399e863a4 100644
--- a/cc3200/mods/pybtimer.h
+++ b/cc3200/mods/pybtimer.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/pybuart.c b/cc3200/mods/pybuart.c
index 06938bdd401c3b920a20ee97a8073593b3f1298a..626357179bb839f549baf2e80d51d144ec552497 100644
--- a/cc3200/mods/pybuart.c
+++ b/cc3200/mods/pybuart.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -311,7 +311,7 @@ STATIC int uart_irq_flags (mp_obj_t self_in) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                      */
 
 STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_uart_obj_t *self = self_in;
diff --git a/cc3200/mods/pybuart.h b/cc3200/mods/pybuart.h
index 56440987f6f46011083c404107d256f75b2c8b53..d481242f1fa375a0e94d2f079324862869715827 100644
--- a/cc3200/mods/pybuart.h
+++ b/cc3200/mods/pybuart.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mods/pybwdt.c b/cc3200/mods/pybwdt.c
index 76c701ca07de06ecc16e718cd0939fdb5487b41a..114e7ac96aaf7df9ee9b53bd8adc0acf1b0010a5 100644
--- a/cc3200/mods/pybwdt.c
+++ b/cc3200/mods/pybwdt.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -87,7 +87,7 @@ void pybwdt_sl_alive (void) {
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 STATIC const mp_arg_t pyb_wdt_init_args[] = {
     { MP_QSTR_id,                             MP_ARG_OBJ,  {.u_obj = mp_const_none} },
diff --git a/cc3200/mods/pybwdt.h b/cc3200/mods/pybwdt.h
index 2844587cb383bdd8f794838bc62fbfc72edb3de8..275c49435c547d4fdf94117cf14f0a37adaa7832 100644
--- a/cc3200/mods/pybwdt.h
+++ b/cc3200/mods/pybwdt.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mpconfigport.h b/cc3200/mpconfigport.h
index 78f8c09480210fd52b4c2d4291d9ad135b6c44e8..dcde9aae0913a4492befc1b7abf9e485740e84a3 100644
--- a/cc3200/mpconfigport.h
+++ b/cc3200/mpconfigport.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -32,7 +32,7 @@
 #include "semphr.h"
 #endif
 
-// options to control how Micro Python is built
+// options to control how MicroPython is built
 
 #define MICROPY_ALLOC_PATH_MAX                      (128)
 #define MICROPY_PERSISTENT_CODE_LOAD                (1)
diff --git a/cc3200/mptask.c b/cc3200/mptask.c
index 50c3c769da397ddbf67b883b0f0883156054313e..09be8c441d9915607da982631b4b043615803a72 100644
--- a/cc3200/mptask.c
+++ b/cc3200/mptask.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/mptask.h b/cc3200/mptask.h
index 5345ecfda41ddbfa21ba9ffcfbf9311ab6dacc95..a1c3eb2cbf45ca3744c386faacc5f972f2f65d02 100644
--- a/cc3200/mptask.h
+++ b/cc3200/mptask.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/qstrdefsport.h b/cc3200/qstrdefsport.h
index 2fc56668c3c660b658ef90bc0a73091de6854712..d5f22d70a8fcae5c95342f21bfa80516c625dbc7 100644
--- a/cc3200/qstrdefsport.h
+++ b/cc3200/qstrdefsport.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/serverstask.c b/cc3200/serverstask.c
index 6b5899e1860e95ad44e0bfab2c4d8430dc170000..100b8d33b0e1e06629467cd079620ca2c95cffbc 100644
--- a/cc3200/serverstask.c
+++ b/cc3200/serverstask.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/serverstask.h b/cc3200/serverstask.h
index 77a3af2f3d60941ee0d98363dfa8e61d87570776..c4533d717490f39b384106afd1673f8e070203d8 100644
--- a/cc3200/serverstask.h
+++ b/cc3200/serverstask.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/telnet/telnet.c b/cc3200/telnet/telnet.c
index 26e45a75f15881a62d1e35836971713f72388e02..2f0818f6bacb90d8bfca3a86ca67f3f99d267b62 100644
--- a/cc3200/telnet/telnet.c
+++ b/cc3200/telnet/telnet.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/telnet/telnet.h b/cc3200/telnet/telnet.h
index 1e3173b11a98c7ba033107cc466c9b7c6dbac00a..51c569104181fc9ea6eafc752409341e5451a782 100644
--- a/cc3200/telnet/telnet.h
+++ b/cc3200/telnet/telnet.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/util/cryptohash.c b/cc3200/util/cryptohash.c
index d2d6222ffcff55316631198521910cdc5a5d6771..909dadc8cf4018e93fd8fe2449b56ee2d78da89e 100644
--- a/cc3200/util/cryptohash.c
+++ b/cc3200/util/cryptohash.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/util/cryptohash.h b/cc3200/util/cryptohash.h
index df3a8475c9fb0e8b33d9d30d9f62db365ac21610..15d46b705b24acb96db69c04173e2b1d2e189199 100644
--- a/cc3200/util/cryptohash.h
+++ b/cc3200/util/cryptohash.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/util/fifo.c b/cc3200/util/fifo.c
index 166f99d9851f45318cc973c7f950de7cab438d56..421f83710060be033591f0c7d249b8cc5252a01b 100644
--- a/cc3200/util/fifo.c
+++ b/cc3200/util/fifo.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/util/fifo.h b/cc3200/util/fifo.h
index ee7571c26568b3386f62a16f4ee506193d92501a..6ede57e1e57f34558a72221bd53bb28b0cab3356 100644
--- a/cc3200/util/fifo.h
+++ b/cc3200/util/fifo.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/util/gccollect.c b/cc3200/util/gccollect.c
index 8963852f7af585eec895251a027ed06c14fdf336..baee2eeef9fb09402cf4d7ca806c529ab438738a 100644
--- a/cc3200/util/gccollect.c
+++ b/cc3200/util/gccollect.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/util/gccollect.h b/cc3200/util/gccollect.h
index 3c4232b84771efde0017085c609420e6f2ad50aa..08d43d2837a92f18a560edd47f75b9614bceec28 100644
--- a/cc3200/util/gccollect.h
+++ b/cc3200/util/gccollect.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/util/gchelper.h b/cc3200/util/gchelper.h
index 0277a754b13f89968c86b71021e6c8ca741a5433..48e81bc61df925a208a82be1135c5a450437967e 100644
--- a/cc3200/util/gchelper.h
+++ b/cc3200/util/gchelper.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/util/random.c b/cc3200/util/random.c
index 54aaa829cb74b36be0fe3dbbe69961f63e1c085d..f8e9cdf0cb21fdb13f708ae64c54212b78f3829e 100644
--- a/cc3200/util/random.c
+++ b/cc3200/util/random.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -67,7 +67,7 @@ STATIC uint32_t lfsr (uint32_t input) {
 }
 
 /******************************************************************************/
-// Micro Python bindings;
+// MicroPython bindings;
 
 STATIC mp_obj_t machine_rng_get(void) {
     return mp_obj_new_int(rng_get());
diff --git a/cc3200/util/random.h b/cc3200/util/random.h
index 60b0b866392a39a245094cfaaec7c942538e216a..02cde6b52208dd14a03d05c7dfad2930d7fba258 100644
--- a/cc3200/util/random.h
+++ b/cc3200/util/random.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/util/sleeprestore.h b/cc3200/util/sleeprestore.h
index 1c5509db05166de44184b80721f19a43429b5c5a..e178f4c2d078da9df49de225cf3f3ed3b4bc3668 100644
--- a/cc3200/util/sleeprestore.h
+++ b/cc3200/util/sleeprestore.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/util/socketfifo.c b/cc3200/util/socketfifo.c
index eb25f3be3ea1fe16a8e3c2c26aee8cabeade3681..d0a71504854a7f9447a193179a6d88bb9dd0256c 100644
--- a/cc3200/util/socketfifo.c
+++ b/cc3200/util/socketfifo.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/util/socketfifo.h b/cc3200/util/socketfifo.h
index 1309201eec76eb3a2d53b48e8fd91a495a5d0e60..e6cf851b1a48c87a7c3afda3c5e7137288b8ec33 100644
--- a/cc3200/util/socketfifo.h
+++ b/cc3200/util/socketfifo.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/cc3200/version.h b/cc3200/version.h
index 83e3f8c0751e8414030cafc9798b42508eeb7e40..fccb95c5211b82fc62a1839985b4198edd301c23 100644
--- a/cc3200/version.h
+++ b/cc3200/version.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/drivers/nrf24l01/nrf24l01.py b/drivers/nrf24l01/nrf24l01.py
index b45c137c6cc651ae74fc81d87725ab2f9d6fc0e7..7274a79278a875cbc684f0ec899a5b60308d10fb 100644
--- a/drivers/nrf24l01/nrf24l01.py
+++ b/drivers/nrf24l01/nrf24l01.py
@@ -1,4 +1,4 @@
-"""NRF24L01 driver for Micro Python
+"""NRF24L01 driver for MicroPython
 """
 
 from micropython import const
diff --git a/drivers/sdcard/sdcard.py b/drivers/sdcard/sdcard.py
index e749d5376f7bcd7458eed3e129d84a6c7a7d5409..75a0c501ee07f0b22c7fcb7ea8441939c7013110 100644
--- a/drivers/sdcard/sdcard.py
+++ b/drivers/sdcard/sdcard.py
@@ -1,5 +1,5 @@
 """
-Micro Python driver for SD cards using SPI bus.
+MicroPython driver for SD cards using SPI bus.
 
 Requires an SPI bus and a CS pin.  Provides readblocks and writeblocks
 methods so the device can be mounted as a filesystem.
diff --git a/drivers/wiznet5k/README.md b/drivers/wiznet5k/README.md
index 4f907e0b1d1ac39a8585cd57c5aedf765f597647..88f25a2b8dbcb137d9de97abef1eff53d74ef7d2 100644
--- a/drivers/wiznet5k/README.md
+++ b/drivers/wiznet5k/README.md
@@ -1,6 +1,6 @@
 This is the driver for the WIZnet5x00 series of Ethernet controllers.
 
-Adapted for Micro Python.
+Adapted for MicroPython.
 
 Original source: https://github.com/Wiznet/W5500_EVB/tree/master/ioLibrary
 Taken on: 30 August 2014
diff --git a/esp8266/esp_mphal.c b/esp8266/esp_mphal.c
index 55f9a58948d43c7a096a32623d1342734e8a7867..61848fd3434da80b08eeb075b37a5d4025b82856 100644
--- a/esp8266/esp_mphal.c
+++ b/esp8266/esp_mphal.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/esp_mphal.h b/esp8266/esp_mphal.h
index 1d1d6de3fb71d5d4fe34efec690bbc95e28fa116..913bd70dc983215dcc421752ebaf78e66b0fb9ee 100644
--- a/esp8266/esp_mphal.h
+++ b/esp8266/esp_mphal.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/fatfs_port.c b/esp8266/fatfs_port.c
index 02384f6055ab5d5eab0aa19d25424642fc723359..a8865c817ea26dd0326e593749373e72864dbe13 100644
--- a/esp8266/fatfs_port.c
+++ b/esp8266/fatfs_port.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/gccollect.c b/esp8266/gccollect.c
index 1b9349f57463f9a9e63506c51b9f9ce69c70ca4c..cd5d4932c53b1bf44388538fa33a98a177194e66 100644
--- a/esp8266/gccollect.c
+++ b/esp8266/gccollect.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/gccollect.h b/esp8266/gccollect.h
index 0aee4277111cb4768f959913ccb8b06aca592fb8..5735d8a39018be8623610cd0c7b8750e00ea2e2d 100644
--- a/esp8266/gccollect.h
+++ b/esp8266/gccollect.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/hspi.c b/esp8266/hspi.c
index 436fb4f6f4295f00d579341a10f6debc0c216669..554a50460f85bf84bb1109486d8b39ae78c4387d 100644
--- a/esp8266/hspi.c
+++ b/esp8266/hspi.c
@@ -28,7 +28,7 @@
 /*
 Wrapper to setup HSPI/SPI GPIO pins and default SPI clock
     spi_no - SPI (0) or HSPI (1)
-Not used in Micropython.
+Not used in MicroPython.
 */
 void spi_init(uint8_t spi_no) {
     spi_init_gpio(spi_no, SPI_CLK_USE_DIV);
@@ -48,7 +48,7 @@ Configures SPI mode parameters for clock edge and clock polarity.
                (1) Data is valid on clock trailing edge
     spi_cpol - (0) Clock is low when inactive
                (1) Clock is high when inactive
-For Micropython this version is different from original.
+For MicroPython this version is different from original.
 */
 void spi_mode(uint8_t spi_no, uint8_t spi_cpha, uint8_t spi_cpol) {
     if (spi_cpol) {
@@ -99,7 +99,7 @@ void spi_init_gpio(uint8_t spi_no, uint8_t sysclk_as_spiclk) {
         // GPIO14 is HSPI CLK pin (Clock)
         PIN_FUNC_SELECT(PERIPHS_IO_MUX_MTMS_U, 2);
         // GPIO15 is HSPI CS pin (Chip Select / Slave Select)
-        // In Micropython, we are handling CS ourself in drivers.
+        // In MicroPython, we are handling CS ourself in drivers.
         // PIN_FUNC_SELECT(PERIPHS_IO_MUX_MTDO_U, 2);
     }
 }
diff --git a/esp8266/machine_adc.c b/esp8266/machine_adc.c
index 73ec0520827948894c49490d52f240f74f5003c1..c8c08695bd22a2de353ed9fde7f53ce034319e8f 100644
--- a/esp8266/machine_adc.c
+++ b/esp8266/machine_adc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/machine_pin.c b/esp8266/machine_pin.c
index 6f75a0a6a9700a07a776e28165184129e5c8c5c4..de65735ba78dd7aaa6aed57555ba0151cb755f70 100644
--- a/esp8266/machine_pin.c
+++ b/esp8266/machine_pin.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/machine_pwm.c b/esp8266/machine_pwm.c
index 5d30f09656351903454244c58045e8907f75217c..8d73e6bb17d8aa1a7a032912f955c96f86793641 100644
--- a/esp8266/machine_pwm.c
+++ b/esp8266/machine_pwm.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/machine_rtc.c b/esp8266/machine_rtc.c
index 984e8b6e8d0e6349d5e23cb493a3a91fbeca3a67..2ad44318f2f8b9c84f75899d87e25e504af1eff0 100644
--- a/esp8266/machine_rtc.c
+++ b/esp8266/machine_rtc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/main.c b/esp8266/main.c
index 43b83759ecb34c48f293535a0566282b349ec6d2..957198aa0589e4ceb58875a67a98c893ac103d9c 100644
--- a/esp8266/main.c
+++ b/esp8266/main.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/modesp.c b/esp8266/modesp.c
index 1aec1f90ee8d082c2ffa11eae9a79524ace7b195..a63d505645f4f0ef3baa5596a051a189ac5120a6 100644
--- a/esp8266/modesp.c
+++ b/esp8266/modesp.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/modnetwork.c b/esp8266/modnetwork.c
index a621522d04046d477c2d876f5cb60d6b9607bfe5..283abecafefe81c59316917e804d4df1ad18f018 100644
--- a/esp8266/modnetwork.c
+++ b/esp8266/modnetwork.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/modpyb.c b/esp8266/modpyb.c
index 9fe8039bc602260c0d105d33dfbef98ca86b5265..e977191ee6ff0cf3473d4b3bb46ae55cba14cd49 100644
--- a/esp8266/modpyb.c
+++ b/esp8266/modpyb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/moduos.c b/esp8266/moduos.c
index 807d2e18a5e46ca9746cf814d27a591f99b12fe3..d0554096edfa4b68171c79ddfc3a5a4892a283d6 100644
--- a/esp8266/moduos.c
+++ b/esp8266/moduos.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/modutime.c b/esp8266/modutime.c
index bdeb3bb45378c25a56a886394601b0fea138dec2..afb14dfd6a91b7ae66ab611ecafed5e65f214c98 100644
--- a/esp8266/modutime.c
+++ b/esp8266/modutime.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h
index ab5591bb7db6d0c2fa705dddad27709c59f354cc..bbded43f4b549151795792b24a16fac360baba67 100644
--- a/esp8266/mpconfigport.h
+++ b/esp8266/mpconfigport.h
@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-// options to control how Micro Python is built
+// options to control how MicroPython is built
 
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
 #define MICROPY_ALLOC_PATH_MAX      (128)
diff --git a/esp8266/qstrdefsport.h b/esp8266/qstrdefsport.h
index 7610eb33da53266b2e723a6b4cea50b70fbbb220..8f301a69c5adfd69283f209d4a570f4bf87f4aa9 100644
--- a/esp8266/qstrdefsport.h
+++ b/esp8266/qstrdefsport.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/examples/embedding/Makefile.upylib b/examples/embedding/Makefile.upylib
index bb48fd507576653262cfd6756e7dcea932fca9c5..a9b6535170e58a637773873320068f14db052d76 100644
--- a/examples/embedding/Makefile.upylib
+++ b/examples/embedding/Makefile.upylib
@@ -55,7 +55,7 @@ CFLAGS += -U _FORTIFY_SOURCE
 endif
 
 # On OSX, 'gcc' is a symlink to clang unless a real gcc is installed.
-# The unix port of micropython on OSX must be compiled with clang,
+# The unix port of MicroPython on OSX must be compiled with clang,
 # while cross-compile ports require gcc, so we test here for OSX and
 # if necessary override the value of 'CC' set in py/mkenv.mk
 ifeq ($(UNAME_S),Darwin)
diff --git a/examples/embedding/hello-embed.c b/examples/embedding/hello-embed.c
index e3a4847835208bf21528f972380c5f53ef4b779b..3473e5bcd8ce1e219b58a9e8248029e9e2d79002 100644
--- a/examples/embedding/hello-embed.c
+++ b/examples/embedding/hello-embed.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/examples/embedding/mpconfigport_minimal.h b/examples/embedding/mpconfigport_minimal.h
index 87c87fa9710631fda6c637bdebb3aa704c8c18bc..5b96aa4b010deab56a51c6325a4857b63d03526a 100644
--- a/examples/embedding/mpconfigport_minimal.h
+++ b/examples/embedding/mpconfigport_minimal.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-// options to control how Micro Python is built
+// options to control how MicroPython is built
 
 #define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
 #define MICROPY_ENABLE_GC           (1)
diff --git a/extmod/machine_mem.c b/extmod/machine_mem.c
index 88c176803feae26298fd864b4e2f1e4327468611..af987cb7f7dcd9dabcbfb28d14018e95d40f7915 100644
--- a/extmod/machine_mem.c
+++ b/extmod/machine_mem.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/machine_mem.h b/extmod/machine_mem.h
index 4bc9ac127e14149985c1572795fa293211430bde..a48a52c820883f089b4114e2aa55e58229b0f820 100644
--- a/extmod/machine_mem.h
+++ b/extmod/machine_mem.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index 4dda3c4426b4fe00972909657be7cce47904f945..d79191b3e5d5d919c3575511bac57357f0a62d70 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/modubinascii.h b/extmod/modubinascii.h
index 6c0156fc4e580702c933681825b5b80eb24dfce3..fb3169267820e5d3a407728185c7b6e66ba5fbef 100644
--- a/extmod/modubinascii.h
+++ b/extmod/modubinascii.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index d2d2e85de17f01529dbc59bf82ec662368f0bc5c..9678fd58fdc94a011eba544c93886b2c4607ff89 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index 13525cc3fa8c32453dccb3437f8e64e7e17bf2d5..f3beb39399f4418a17ee143ff5cc45467ff318fd 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c
index 567ee83da6e874881da0a91095f407790ff3e49d..e6e417d2bcdfce7d1505d07955af36d91dc534f4 100644
--- a/extmod/moduheapq.c
+++ b/extmod/moduheapq.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/modure.c b/extmod/modure.c
index b4c7a364fe2681cd38a80ef30b0572bba46e497f..b85ba267373e999f3a719576217d964812df2144 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 2b8b87b5ad5a9db0c3cf7848b037bf465f82faf3..a9f25c1954e2bcde91bec6887974eaf32b50fded 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index be1aa0359c19d65c53747d44c8c5bb2b6b62a0af..86dd8e29c81de67a950b2b668fd7da53df7e9adb 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index 6e045c403482bc8d19cdbd0f1b84dddc4ca3c253..a05d0f2ed05ea1102d6bde2d6d21c23df0fa2c99 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/vfs_fat.h b/extmod/vfs_fat.h
index 63c4abb826f83566f4127e6949c0d01d4a5a916a..443e4eda8228969f9360059db4eb2b8bc2fc252e 100644
--- a/extmod/vfs_fat.h
+++ b/extmod/vfs_fat.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/extmod/vfs_fat_diskio.c b/extmod/vfs_fat_diskio.c
index 24c00ffba17dc8bc28e2567353d5e1d6f6460c67..ff23c6b0cd1d0a21583bd18018f73d08f0a0616f 100644
--- a/extmod/vfs_fat_diskio.c
+++ b/extmod/vfs_fat_diskio.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * Original template for this file comes from:
  * Low level disk I/O module skeleton for FatFs, (C)ChaN, 2013
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index 22907c12a2ea4ebf4a8aca4a17158f5749332ebc..8fb48f01a6119d73d4d3ac2791adb2adb5edebde 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/lib/libc/string0.c b/lib/libc/string0.c
index 1b37169edde886e6e5622ed7f88ef5264f111e08..c2f2abd0f95cc2f04ed2e677dbb2e0b653aa9211 100644
--- a/lib/libc/string0.c
+++ b/lib/libc/string0.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/lib/libm/ef_rem_pio2.c b/lib/libm/ef_rem_pio2.c
index f7a695e179dadf91e1d5db256c8b04a589a2e858..ca55243fb4fdb515c1713b8b8f9136eee8906131 100644
--- a/lib/libm/ef_rem_pio2.c
+++ b/lib/libm/ef_rem_pio2.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/erf_lgamma.c b/lib/libm/erf_lgamma.c
index a0da86b8df02bf426fa29330d38d2e4bef914397..877816a0c213d7d611b11964adbb0e9695f3c661 100644
--- a/lib/libm/erf_lgamma.c
+++ b/lib/libm/erf_lgamma.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/fdlibm.h b/lib/libm/fdlibm.h
index 529a3975ac4f015b682e3d82650d7caf1aee5659..ace3b2da22f941ef6271e58aa455f0c4de60b689 100644
--- a/lib/libm/fdlibm.h
+++ b/lib/libm/fdlibm.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * This file is adapted from from newlib-nano-2, the newlib/libm/common/fdlib.h,
  * available from https://github.com/32bitmicro/newlib-nano-2.  The main change
diff --git a/lib/libm/kf_cos.c b/lib/libm/kf_cos.c
index f1f883ced08db466b58afd52bec2b6757643602a..691f9842fd87a9cea115c59108dc14fb0c20dda6 100644
--- a/lib/libm/kf_cos.c
+++ b/lib/libm/kf_cos.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/kf_rem_pio2.c b/lib/libm/kf_rem_pio2.c
index e267b65f9a677a3e4eec1c78504b5010f76b879f..c7e9479571ea8fdd453c79cc210a9418ce1a3c6a 100644
--- a/lib/libm/kf_rem_pio2.c
+++ b/lib/libm/kf_rem_pio2.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/kf_sin.c b/lib/libm/kf_sin.c
index 81390b4ebbc2177ef5f46f97c5bb9fb9008a4484..07ea993446082dcd6a89cec1917d362c813613d6 100644
--- a/lib/libm/kf_sin.c
+++ b/lib/libm/kf_sin.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/kf_tan.c b/lib/libm/kf_tan.c
index 68254c682c73a05d631b468171d4490773b553df..6da9bd81712426c32b25a6b726c41a50c93cfdce 100644
--- a/lib/libm/kf_tan.c
+++ b/lib/libm/kf_tan.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/math.c b/lib/libm/math.c
index d7e27e775b69a9f0029e9104f507037d6c54abea..984636627cdfeead24201b15076e2ae540887eba 100644
--- a/lib/libm/math.c
+++ b/lib/libm/math.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/lib/libm/sf_cos.c b/lib/libm/sf_cos.c
index 33cde50e287a427830be1d915659ff59b3b8bf44..fabb129cd97f398736e776ae58e21fc00c6f5a09 100644
--- a/lib/libm/sf_cos.c
+++ b/lib/libm/sf_cos.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/sf_erf.c b/lib/libm/sf_erf.c
index 00ac4baf1cea3da38dc476be437cbe736f51fc2e..3f0172c6e966aa60b1467c15a11d637629ee21f9 100644
--- a/lib/libm/sf_erf.c
+++ b/lib/libm/sf_erf.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/sf_frexp.c b/lib/libm/sf_frexp.c
index 397373fdeb8d323f3e271a21be2d660db9e659e0..df50fb773796fb0adaacabdfaf21bc797ad227ab 100644
--- a/lib/libm/sf_frexp.c
+++ b/lib/libm/sf_frexp.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/sf_ldexp.c b/lib/libm/sf_ldexp.c
index a0941df9fd81ce57024b65e18db82441890e40c5..37968d475ae9969eaede5864565e80bc7ce3e5a4 100644
--- a/lib/libm/sf_ldexp.c
+++ b/lib/libm/sf_ldexp.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/sf_modf.c b/lib/libm/sf_modf.c
index 4fcae057a5141d62e82bf156e3cc5171ca6ddd04..410db2a3738480320609bb1ce89561491c86fbf0 100644
--- a/lib/libm/sf_modf.c
+++ b/lib/libm/sf_modf.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/common
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/sf_sin.c b/lib/libm/sf_sin.c
index 585ab8d8c99c1ad96c3c532a8f2e0104b6d9b372..d2705077852c61e5a1e186815b8f0f0a215d3384 100644
--- a/lib/libm/sf_sin.c
+++ b/lib/libm/sf_sin.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/sf_tan.c b/lib/libm/sf_tan.c
index a9296d8bfb491fe76fdd60234230ddf8d30d441b..148b16d61823810c431602880b91b0353786c48e 100644
--- a/lib/libm/sf_tan.c
+++ b/lib/libm/sf_tan.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/wf_lgamma.c b/lib/libm/wf_lgamma.c
index 7d2f42c54b0d3b02770afd4311e05dad8bf4d7fb..d86ede790bd91060d7a70bc4425c6d303720b8ba 100644
--- a/lib/libm/wf_lgamma.c
+++ b/lib/libm/wf_lgamma.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/libm/wf_tgamma.c b/lib/libm/wf_tgamma.c
index afd16bf674fd2c116ecf7f93d7ca4c6adeb989ec..64b2488d1d3af4a94307ac2a4d38e1a9bea4647d 100644
--- a/lib/libm/wf_tgamma.c
+++ b/lib/libm/wf_tgamma.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * These math functions are taken from newlib-nano-2, the newlib/libm/math
  * directory, available from https://github.com/32bitmicro/newlib-nano-2.
diff --git a/lib/mp-readline/readline.c b/lib/mp-readline/readline.c
index 5b35c8660adcb64134cd8a68b4623f312e32b5c5..9d254d8cfebe79b81627fbde4ce9bff47c4a366b 100644
--- a/lib/mp-readline/readline.c
+++ b/lib/mp-readline/readline.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/lib/mp-readline/readline.h b/lib/mp-readline/readline.h
index f53fdeaa85fab39eb1ed04756b24c8d88f8a52c7..00aa9622a80234b153b32f28f6231fdd877e2c8e 100644
--- a/lib/mp-readline/readline.h
+++ b/lib/mp-readline/readline.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/lib/netutils/netutils.c b/lib/netutils/netutils.c
index a2ea31cf380af3ec3ec57f69fbdef4219f6a4059..a324521613d11b4871ece7333f40c498c90926ec 100644
--- a/lib/netutils/netutils.c
+++ b/lib/netutils/netutils.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/lib/netutils/netutils.h b/lib/netutils/netutils.h
index 1e147afa952e9a32d5b4d86d49116ab7b87ab175..4befc90db0e919fe57ffc7f4954a7668cc303428 100644
--- a/lib/netutils/netutils.h
+++ b/lib/netutils/netutils.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/lib/timeutils/timeutils.c b/lib/timeutils/timeutils.c
index 06915f25ae57c4656ec059921963e95fbd7e4dfc..eb3dc80d4b52566976f27fa580aabc0cd311b58e 100644
--- a/lib/timeutils/timeutils.c
+++ b/lib/timeutils/timeutils.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -67,7 +67,7 @@ mp_uint_t timeutils_year_day(mp_uint_t year, mp_uint_t month, mp_uint_t date) {
 
 void timeutils_seconds_since_2000_to_struct_time(mp_uint_t t, timeutils_struct_time_t *tm) {
     // The following algorithm was adapted from musl's __secs_to_tm and adapted
-    // for differences in Micro Python's timebase.
+    // for differences in MicroPython's timebase.
 
     mp_int_t seconds = t - LEAPOCH;
 
diff --git a/lib/timeutils/timeutils.h b/lib/timeutils/timeutils.h
index 1dc486e2e4a2a1431253d9b36b1e6ae78ee3ca99..9b1abeb8f3d366eaf0c5788717c93bed42459607 100644
--- a/lib/timeutils/timeutils.h
+++ b/lib/timeutils/timeutils.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/lib/utils/printf.c b/lib/utils/printf.c
index 303edfcca0408123f6df5bfa32f16b0271881e92..51dfa5b963473ca6ff46528e550fe70ef29ce3eb 100644
--- a/lib/utils/printf.c
+++ b/lib/utils/printf.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
index 7d0d1cc38bcacc8aa986327a87d4e2c098a12fe5..d3500b42b3bac7e30d9b20350e4a63cc6c3d4ad6 100644
--- a/lib/utils/pyexec.c
+++ b/lib/utils/pyexec.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/lib/utils/pyexec.h b/lib/utils/pyexec.h
index 69cdb476209be3c45ae29605c312b5e19a0cc9ec..bc98ba94a74872a667d826656a3527a3119d2852 100644
--- a/lib/utils/pyexec.h
+++ b/lib/utils/pyexec.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/logo/FONT-LICENSE.txt b/logo/FONT-LICENSE.txt
index 18ac0379f63f9fb0be64bce9645002d8dcedbad6..69c49d84c83c2c197c6a1b4c8ec46d6e51618ee6 100644
--- a/logo/FONT-LICENSE.txt
+++ b/logo/FONT-LICENSE.txt
@@ -1,4 +1,4 @@
-The font used for the Micro Python logo is "Exo",
+The font used for the MicroPython logo is "Exo",
 http://www.google.com/fonts/specimen/Exo.
 
 Copyright (c) 2013, Natanael Gama (https://plus.google.com/u/0/+NatanaelGama),
diff --git a/minimal/mpconfigport.h b/minimal/mpconfigport.h
index 47fc9842903e86ca666a8629a8a55e78460dff4d..ce4f8f2404766cce86b7feadfdf95cf0f898e7a2 100644
--- a/minimal/mpconfigport.h
+++ b/minimal/mpconfigport.h
@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-// options to control how Micro Python is built
+// options to control how MicroPython is built
 
 // You can disable the built-in MicroPython compiler by setting the following
 // config option to 0.  If you do this then you won't get a REPL prompt, but you
diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
index c04adaf6ad5e63af423a32bff443f0f7f3ecaf41..cdec130eed667c44cbda555e6cbcfb8676f71167 100644
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -44,7 +44,7 @@ COPT = -Os #-DNDEBUG
 endif
 
 # On OSX, 'gcc' is a symlink to clang unless a real gcc is installed.
-# The unix port of micropython on OSX must be compiled with clang,
+# The unix port of MicroPython on OSX must be compiled with clang,
 # while cross-compile ports require gcc, so we test here for OSX and
 # if necessary override the value of 'CC' set in py/mkenv.mk
 ifeq ($(UNAME_S),Darwin)
diff --git a/pic16bit/board.c b/pic16bit/board.c
index 77f059fc70c5a03698d7d856916221029844fa39..0321b0ee22de116ab841079b9ca9c1732109affb 100644
--- a/pic16bit/board.c
+++ b/pic16bit/board.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/pic16bit/board.h b/pic16bit/board.h
index f79dd349732d8d1bc6967bc0d023acc0577aef0c..f45f875449e9ed540f4e9cea2924850e0f2cc78c 100644
--- a/pic16bit/board.h
+++ b/pic16bit/board.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/pic16bit/main.c b/pic16bit/main.c
index 343fe86d0599bc35c8ac9e7cb5e0c333a1c8e49c..4a61c5ff532522b679f4bc1db1450098411c1c73 100644
--- a/pic16bit/main.c
+++ b/pic16bit/main.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/pic16bit/modpyb.c b/pic16bit/modpyb.c
index 326d37f8a17c93903b98bf1a13a6ec7511b436f1..4a608541e52bf48d6e769e7c767e99dd220a4c51 100644
--- a/pic16bit/modpyb.c
+++ b/pic16bit/modpyb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/pic16bit/modpyb.h b/pic16bit/modpyb.h
index 910ec1b6e277eebd52406472f5f53e644412afb6..ac19fd2f3650f2edd77cc8b7fe7444e14e582a43 100644
--- a/pic16bit/modpyb.h
+++ b/pic16bit/modpyb.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/pic16bit/modpybled.c b/pic16bit/modpybled.c
index 797246d13c40e1588043b232c85bb0a8225d739e..eb04689aa8d87d89726eeedfe7c0eb4a230ef4a0 100644
--- a/pic16bit/modpybled.c
+++ b/pic16bit/modpybled.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/pic16bit/modpybswitch.c b/pic16bit/modpybswitch.c
index aa102e82172cfa04a0e91906f48efba2ea844a43..4af0c9dfc5f0968ca9a097075f00e685b671500c 100644
--- a/pic16bit/modpybswitch.c
+++ b/pic16bit/modpybswitch.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/pic16bit/mpconfigport.h b/pic16bit/mpconfigport.h
index e4113956b36fff7a20281b69d8512fd944368e7e..3cd099c67a48fc6ea93ffa2bdb9ff1d1c30b48b0 100644
--- a/pic16bit/mpconfigport.h
+++ b/pic16bit/mpconfigport.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/pic16bit/pic16bit_mphal.c b/pic16bit/pic16bit_mphal.c
index 557b1e0dad76601948d849fde92679abb82f24e0..35955f2d3ee5726fe329d1258f327e88d507d243 100644
--- a/pic16bit/pic16bit_mphal.c
+++ b/pic16bit/pic16bit_mphal.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/pic16bit/pic16bit_mphal.h b/pic16bit/pic16bit_mphal.h
index ffcca41bfd1ed7e10e9256ed4b62f77ca2f456b2..f5da6cdc8d042efb459e4fecf2bcc210c150cd3e 100644
--- a/pic16bit/pic16bit_mphal.h
+++ b/pic16bit/pic16bit_mphal.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/argcheck.c b/py/argcheck.c
index 9f225345d55e3c187d9d810fcbd88c5fc7762ffd..22fd9cd2c7cd790cb7b91ff6b00a4b28536c6c3e 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/asmarm.c b/py/asmarm.c
index ff22aba90a43ef43a08c4528146dd29d14566995..552fdfb3443255825de04447f7bf042fb4ba26b8 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/asmarm.h b/py/asmarm.h
index c5900925f6a65d313b11dc5c2b82f188db264428..a302b159052d1c26c41b8cda216c9432561814d6 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/asmthumb.c b/py/asmthumb.c
index 7e92e4de41969e0cbc2f6b439442732e15b053fa..4360a6af9b1880319c8fcd8076d6ce9d7dbee49a 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 589c481cd558a10c45cff200a8521fa906619193..7070e03ac254bf5f630af584eb3b049a194e5902 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/asmx64.c b/py/asmx64.c
index 6775e8e93de4f5dd7d7e4e271422a5b06fc1ae28..aa2a8ec7cc1da987231f61cf2db6e0d3e1ebb8e1 100644
--- a/py/asmx64.c
+++ b/py/asmx64.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/asmx64.h b/py/asmx64.h
index a384cca007cb2ac67469b63e430fe0a7f804cd28..425bdf2d3971d19043d621359a36c79df69972c7 100644
--- a/py/asmx64.h
+++ b/py/asmx64.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/asmx86.c b/py/asmx86.c
index dd3ad02242fb04ef939334c50125286cbbc1e959..6a78fbd5ea4efdc103f89bf81d016a29e0adc25b 100644
--- a/py/asmx86.c
+++ b/py/asmx86.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/asmx86.h b/py/asmx86.h
index fd34228d10c2430c7a703a49015b4b8a27d9e220..0a00e2e7c2c3522b87cba13838903e4a0b56a6fa 100644
--- a/py/asmx86.h
+++ b/py/asmx86.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/bc.c b/py/bc.c
index 2e481bce777485b8ed1f1028fcec2ccd8384b8a0..522eb0aeb0783e3088bc0cbee8058c4ab2d2be1e 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/bc.h b/py/bc.h
index c55d31fe4cd1e1379498f9774b1be6a2dbd3fd6a..69e213e4223550e1b142bc8d784e4db7d95ecb9b 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/bc0.h b/py/bc0.h
index be8ac6c15c7a0648b7c54b236c9b40eaa8419256..f671c5b5a74c5c7e7b7669a70a61ed6e0e8c4ab6 100644
--- a/py/bc0.h
+++ b/py/bc0.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -26,7 +26,7 @@
 #ifndef MICROPY_INCLUDED_PY_BC0_H
 #define MICROPY_INCLUDED_PY_BC0_H
 
-// Micro Python byte-codes.
+// MicroPython byte-codes.
 // The comment at the end of the line (if it exists) tells the arguments to the byte-code.
 
 #define MP_BC_LOAD_CONST_FALSE   (0x10)
diff --git a/py/binary.c b/py/binary.c
index 4a999b9aab74a947bb987150655eeae2b3d0cbfc..e38aae8ea3908a5e2994ebe63986c0736d54268a 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/binary.h b/py/binary.h
index 04cc6d83bed3a8dc032b179e1eaf7149d1c8aa36..7b5c60f1ac526abe14d31aa94b4b9ebcbc575fdf 100644
--- a/py/binary.h
+++ b/py/binary.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/builtin.h b/py/builtin.h
index 4915383f25ce9c551e7270c153e80f329e3583c6..a637b6e22204d42d26baa97320786d20f6c0a132 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/builtinevex.c b/py/builtinevex.c
index 4390d0cc7c9f6d711523475852644fd7ca19ed0b..ba8048f7020ca12fb49c39d3c0d28843cfdd2b81 100644
--- a/py/builtinevex.c
+++ b/py/builtinevex.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 7a8474cac338632842114b664ecef5b5006e9308..e0ce91d9be429f9aadcae43924fa5ad95ccd9f51 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/compile.c b/py/compile.c
index d2e05d0b2e41f970ae626c25e7d1f9d0268e54ec..00052e190a805757797e23972a582a272ffc647d 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -569,7 +569,7 @@ STATIC void close_over_variables_etc(compiler_t *comp, scope_t *this_scope, int
                 for (int j = 0; j < this_scope->id_info_len; j++) {
                     id_info_t *id2 = &this_scope->id_info[j];
                     if (id2->kind == ID_INFO_KIND_FREE && id->qst == id2->qst) {
-                        // in Micro Python we load closures using LOAD_FAST
+                        // in MicroPython we load closures using LOAD_FAST
                         EMIT_LOAD_FAST(id->qst, id->local_num);
                         nfree += 1;
                     }
@@ -654,9 +654,9 @@ STATIC void compile_funcdef_lambdef_param(compiler_t *comp, mp_parse_node_t pn)
 
             if (comp->have_star) {
                 comp->num_dict_params += 1;
-                // in Micro Python we put the default dict parameters into a dictionary using the bytecode
+                // in MicroPython we put the default dict parameters into a dictionary using the bytecode
                 if (comp->num_dict_params == 1) {
-                    // in Micro Python we put the default positional parameters into a tuple using the bytecode
+                    // in MicroPython we put the default positional parameters into a tuple using the bytecode
                     // we need to do this here before we start building the map for the default keywords
                     if (comp->num_default_params > 0) {
                         EMIT_ARG(build_tuple, comp->num_default_params);
@@ -700,7 +700,7 @@ STATIC void compile_funcdef_lambdef(compiler_t *comp, scope_t *scope, mp_parse_n
         return;
     }
 
-    // in Micro Python we put the default positional parameters into a tuple using the bytecode
+    // in MicroPython we put the default positional parameters into a tuple using the bytecode
     // the default keywords args may have already made the tuple; if not, do it now
     if (comp->num_default_params > 0 && comp->num_dict_params == 0) {
         EMIT_ARG(build_tuple, comp->num_default_params);
@@ -3275,7 +3275,7 @@ STATIC void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind
 #endif
 
 STATIC void scope_compute_things(scope_t *scope) {
-    // in Micro Python we put the *x parameter after all other parameters (except **y)
+    // in MicroPython we put the *x parameter after all other parameters (except **y)
     if (scope->scope_flags & MP_SCOPE_FLAG_VARARGS) {
         id_info_t *id_param = NULL;
         for (int i = scope->id_info_len - 1; i >= 0; i--) {
@@ -3313,7 +3313,7 @@ STATIC void scope_compute_things(scope_t *scope) {
     // compute the index of cell vars
     for (int i = 0; i < scope->id_info_len; i++) {
         id_info_t *id = &scope->id_info[i];
-        // in Micro Python the cells come right after the fast locals
+        // in MicroPython the cells come right after the fast locals
         // parameters are not counted here, since they remain at the start
         // of the locals, even if they are cell vars
         if (id->kind == ID_INFO_KIND_CELL && !(id->flags & ID_FLAG_IS_PARAM)) {
@@ -3333,14 +3333,14 @@ STATIC void scope_compute_things(scope_t *scope) {
                     id_info_t *id2 = &scope->id_info[j];
                     if (id2->kind == ID_INFO_KIND_FREE && id->qst == id2->qst) {
                         assert(!(id2->flags & ID_FLAG_IS_PARAM)); // free vars should not be params
-                        // in Micro Python the frees come first, before the params
+                        // in MicroPython the frees come first, before the params
                         id2->local_num = num_free;
                         num_free += 1;
                     }
                 }
             }
         }
-        // in Micro Python shift all other locals after the free locals
+        // in MicroPython shift all other locals after the free locals
         if (num_free > 0) {
             for (int i = 0; i < scope->id_info_len; i++) {
                 id_info_t *id = &scope->id_info[i];
diff --git a/py/compile.h b/py/compile.h
index f6b262d18cb0e6c5fb02249e4f8714a4f0bc83cb..3297e83aeba94678fc8f551298bdafbcb6a32449 100644
--- a/py/compile.h
+++ b/py/compile.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/emit.h b/py/emit.h
index a58e20e3d7500fe3dd3ba4386994ca5aef30db49..2b2c904f601c5542bba197ed96d9247c769e8981 100644
--- a/py/emit.h
+++ b/py/emit.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/emitbc.c b/py/emitbc.c
index 127bf0bf9a80770b46749a7b5775ed445f75b1db..6770209257b7ef9ab531fad9125a8f7b98050d63 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/emitcommon.c b/py/emitcommon.c
index e914431d325d761d263f1aa478e4f111874b2b2c..07b1dbb4ce02fa607cd764eb8167ba8416350523 100644
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/emitglue.c b/py/emitglue.c
index fb7a549264b272b3d016eb479e04bf353a97b950..383e6a136b83e9d0936fbf7cfd62ef02ebc95b11 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/emitglue.h b/py/emitglue.h
index 3099965966e67b3c6346f9c299e2918e55448a8c..43930333d64ac391bcf9b2c1f485e63df2c09060 100644
--- a/py/emitglue.h
+++ b/py/emitglue.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c
index c1a4eac5d065f8cdc07bd0d1a85a7ed28f76f8f3..577f65672077edbb2a987096ddd181820d2d0212 100644
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/emitnative.c b/py/emitnative.c
index 99adc809c75e1612ecb519c381c728b3177a0f78..5ed69ff9b0ca2315729173c218cfa22135e76cb7 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/formatfloat.c b/py/formatfloat.c
index 2f10d425a82a921ab3da26a100355d3195df9cf4..4130e8b26b01793cd634584dbf3ec3f2d20b534b 100644
--- a/py/formatfloat.c
+++ b/py/formatfloat.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/formatfloat.h b/py/formatfloat.h
index 9c8d137bb1c2b8a0831e2daeaddc8c5d2f035edc..9a1643b4ddff51402c191791ce3fc85536e2c038 100644
--- a/py/formatfloat.h
+++ b/py/formatfloat.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/frozenmod.c b/py/frozenmod.c
index 1eaaf574a27953283992bfe8b2e5d637e2a7d905..06d4f84c8e05718d9f045f0fdb827fa47ec25671 100644
--- a/py/frozenmod.c
+++ b/py/frozenmod.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/frozenmod.h b/py/frozenmod.h
index 6993167ac4d4e4533ecacd0e1e97ca13e4cae395..8cddef6819c5928090dedcc5dbbcfce1c299a470 100644
--- a/py/frozenmod.h
+++ b/py/frozenmod.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/gc.c b/py/gc.c
index 2af886c56bdc58ec5ebbd9220c880b400cfdec32..7253b7db6830e45883fdd92d23a6a857dba46a71 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/gc.h b/py/gc.h
index 13669551706188285945f27d09255b6c0b7ffe1a..739349c1f5b28b6d7270ad0008ddbf422a711e98 100644
--- a/py/gc.h
+++ b/py/gc.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/grammar.h b/py/grammar.h
index 0b70538d48c4460dcb19a6863111d2da1c2820d5..6abb1de8c033c9863e6a47c2865abefaa9218d32 100644
--- a/py/grammar.h
+++ b/py/grammar.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -32,7 +32,7 @@
 // #       single_input is a single interactive statement;
 // #       file_input is a module or sequence of commands read from an input file;
 // #       eval_input is the input for the eval() functions.
-// # NB: compound_stmt in single_input is followed by extra NEWLINE! --> not in Micro Python
+// # NB: compound_stmt in single_input is followed by extra NEWLINE! --> not in MicroPython
 // single_input: NEWLINE | simple_stmt | compound_stmt
 // file_input: (NEWLINE | stmt)* ENDMARKER
 // eval_input: testlist NEWLINE* ENDMARKER
diff --git a/py/lexer.c b/py/lexer.c
index 6e5cc18f44b935b878775ccef60f744fad82285f..32b3567cc23f3630f8fba9ecb45e53ad12bd0b9c 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/lexer.h b/py/lexer.h
index 435aa096b1adada8102b81132612a24a191ef276..a29709107d9394133a7d1e6e24cbe8c27e77bdfb 100644
--- a/py/lexer.h
+++ b/py/lexer.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -32,7 +32,7 @@
 #include "py/qstr.h"
 #include "py/reader.h"
 
-/* lexer.h -- simple tokeniser for Micro Python
+/* lexer.h -- simple tokeniser for MicroPython
  *
  * Uses (byte) length instead of null termination.
  * Tokens are the same - UTF-8 with (byte) length.
diff --git a/py/malloc.c b/py/malloc.c
index f48cb8da4fd47d4b3aa6d092bd1b7eba921648b7..e679e20926e64791eda0b3b089a353f5c6bf1612 100644
--- a/py/malloc.c
+++ b/py/malloc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -46,7 +46,7 @@
 #include "py/gc.h"
 
 // We redirect standard alloc functions to GC heap - just for the rest of
-// this module. In the rest of micropython source, system malloc can be
+// this module. In the rest of MicroPython source, system malloc can be
 // freely accessed - for interfacing with system and 3rd-party libs for
 // example. On the other hand, some (e.g. bare-metal) ports may use GC
 // heap as system heap, so, to avoid warnings, we do undef's first.
diff --git a/py/map.c b/py/map.c
index 50d74f38f562d4e9989988df16cc35dd2ef7aa04..7f3c90059085e0aa86101325969568e49364475d 100644
--- a/py/map.c
+++ b/py/map.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/misc.h b/py/misc.h
index cebbd38ea0771c085015ef8047885b06091a23c1..71425b85e1e75fbaddb7bdca933068e67b1763b9 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/mkrules.mk b/py/mkrules.mk
index e6608200169c381e91cd87d3747328d1c17854d3..860074caaea2c9717926e95999afa6e186b42c42 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -47,7 +47,7 @@ $(BUILD)/%.o: %.c
 	$(call compile_c)
 
 # List all native flags since the current build system doesn't have
-# the micropython configuration available. However, these flags are
+# the MicroPython configuration available. However, these flags are
 # needed to extract all qstrings
 QSTR_GEN_EXTRA_CFLAGS += -DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB -DN_ARM -DN_XTENSA
 QSTR_GEN_EXTRA_CFLAGS += -I$(BUILD)/tmp
diff --git a/py/modarray.c b/py/modarray.c
index 356e48bee0523a9ed693ae34c9e23513db86f31d..c0cdca9286f1fc174a46f582ed131ca941afca11 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index 8fbf4daeb23c537e99b2be1353d90afb5284b22b..1711ae58b12e145568213b6cb3f4f054f64f8b94 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/modcmath.c b/py/modcmath.c
index 7ad8f5ad60e62569bc3a0e6062422288df4fb126..627a2cbadbfbb0da0493a3f1f1a91e0d40d22a04 100644
--- a/py/modcmath.c
+++ b/py/modcmath.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/modcollections.c b/py/modcollections.c
index e610a28d2444d7ffacd27c055d62099585214f3a..1a1560387ad2ea9a93b2fee90550c7e825aadc82 100644
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/modgc.c b/py/modgc.c
index 24564622ec31ed03755faab0fdaf305ef775b610..d45e007ebe7c2854a19a1b230a81ccfc8704bff0 100644
--- a/py/modgc.c
+++ b/py/modgc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/modio.c b/py/modio.c
index a6a09327871b48ec7598b14cc898b6a5c4d13df9..353a002865c1d58f74bf840242b9283fa73821b7 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/modmath.c b/py/modmath.c
index d5d135fc113a1a5e248bab104ea06a1b6d5139bc..c56056a5dd2d82f59a7b4ffaa8e2976f288730cd 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/modmicropython.c b/py/modmicropython.c
index 46a3922e6dbf4c987defee8ec2479c6fb2bd061b..6fa3f9ad2849c8873585648e1d290f353932d78e 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/modstruct.c b/py/modstruct.c
index 3c99ef1d8d7cd534f171f38121ed71ea64779ed8..1daa3333889d98375559f35bc61a40a429287cf7 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/modsys.c b/py/modsys.c
index 0a8f3cd50e98356686c23202a2665f231618b993..ee6f8686e014cd5e3fef60660226c09551df11f7 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -87,7 +87,7 @@ STATIC const mp_rom_obj_tuple_t mp_sys_implementation_obj = {
 #undef I
 
 #ifdef MICROPY_PY_SYS_PLATFORM
-/// \constant platform - the platform that Micro Python is running on
+/// \constant platform - the platform that MicroPython is running on
 STATIC const MP_DEFINE_STR_OBJ(platform_obj, MICROPY_PY_SYS_PLATFORM);
 #endif
 
diff --git a/py/mphal.h b/py/mphal.h
index 93a0a40ced5409ba18394547565425b3c26becce..92de01d08b9136cbcbab62e31e7964c083172ea0 100644
--- a/py/mphal.h
+++ b/py/mphal.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/mpprint.c b/py/mpprint.c
index 0afd8ca3b1da9ffda9fbff19919a0ea368802a10..6c02d7cefb5f0de582d7e8f34c04a06cd35769b0 100644
--- a/py/mpprint.c
+++ b/py/mpprint.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/mpprint.h b/py/mpprint.h
index 20bd875b4afe6a1ab56b081361778f9142abf271..07462bddcc962f2bd750a42333fafe6bad8808d5 100644
--- a/py/mpprint.h
+++ b/py/mpprint.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/mpstate.c b/py/mpstate.c
index 4fc8bc506e825881774b583f37650cb7a387f132..6ce64adfd1fe001cb2712bdf5ad18f3fbc4589f5 100644
--- a/py/mpstate.c
+++ b/py/mpstate.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/mpstate.h b/py/mpstate.h
index b09ba08cfe347850e4684868e0dc34ea718d5b4d..eca14a9e44af6afff7fa2038b4d5b452b4598260 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -36,7 +36,7 @@
 #include "py/objlist.h"
 #include "py/objexcept.h"
 
-// This file contains structures defining the state of the Micro Python
+// This file contains structures defining the state of the MicroPython
 // memory system, runtime and virtual machine.  The state is a global
 // variable, but in the future it is hoped that the state can become local.
 
diff --git a/py/mpz.c b/py/mpz.c
index f58e262e2358110e9e2586d953a782ea6cb40079..d300a8e5db6a26d647cf306fb0a75f36d0a128ef 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/mpz.h b/py/mpz.h
index 55967cc4c30188a5020b15781244ce7132ab10d3..e2d0c30aac32a226205fd45bf6344707acf86cf4 100644
--- a/py/mpz.h
+++ b/py/mpz.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/nativeglue.c b/py/nativeglue.c
index c75e5ec0476315c995e608f95a5e79f9635d7e9a..46c6906d96bb59cda67fbdca809a34905c953de2 100644
--- a/py/nativeglue.c
+++ b/py/nativeglue.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -42,7 +42,7 @@
 
 #if MICROPY_EMIT_NATIVE
 
-// convert a Micro Python object to a valid native value based on type
+// convert a MicroPython object to a valid native value based on type
 mp_uint_t mp_convert_obj_to_native(mp_obj_t obj, mp_uint_t type) {
     DEBUG_printf("mp_convert_obj_to_native(%p, " UINT_FMT ")\n", obj, type);
     switch (type & 0xf) {
@@ -66,7 +66,7 @@ mp_uint_t mp_convert_obj_to_native(mp_obj_t obj, mp_uint_t type) {
 
 #if MICROPY_EMIT_NATIVE || MICROPY_EMIT_INLINE_ASM
 
-// convert a native value to a Micro Python object based on type
+// convert a native value to a MicroPython object based on type
 mp_obj_t mp_convert_native_to_obj(mp_uint_t val, mp_uint_t type) {
     DEBUG_printf("mp_convert_native_to_obj(" UINT_FMT ", " UINT_FMT ")\n", val, type);
     switch (type & 0xf) {
diff --git a/py/nlr.h b/py/nlr.h
index 624e973070ec0f9bc26d4e3966a2d7f3c04aa349..63fe392d9e5de49d3cddc2cddc8425429cabd2ee 100644
--- a/py/nlr.h
+++ b/py/nlr.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/nlrsetjmp.c b/py/nlrsetjmp.c
index c3873e0b6d21ca9b1cf9b24f9c5cbf13e074fffd..1fb45944034fab680b36843178f9ae959ef3628b 100644
--- a/py/nlrsetjmp.c
+++ b/py/nlrsetjmp.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/obj.c b/py/obj.c
index 1238b7011abf8fe8aa6c3f36154bbd0956f8231c..515a95b2e4549737fa6221a8d4d1af82aa9d25cb 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/obj.h b/py/obj.h
index f88c10004746540d6e8a63f4576a681de3a0ecb3..22bfda0f9982715be58f09c9c45527ba5710a2e2 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objarray.c b/py/objarray.c
index 21479a800fdb1b058be3ddad8941fc9a8d8da93b..99146bd4c170f6e10bdf0568c68a56667ba0cb14 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objattrtuple.c b/py/objattrtuple.c
index 8c5e7957570cec8e811a37f7f7dac608181793c6..3cc298d4e90006e78c30fbbc6b8159eeea459f13 100644
--- a/py/objattrtuple.c
+++ b/py/objattrtuple.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objbool.c b/py/objbool.c
index 5bc04bb6f9da2406ef84961ff543277197a4e084..e5bc3c2287f056be518a05e7bd0163683be2afac 100644
--- a/py/objbool.c
+++ b/py/objbool.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objboundmeth.c b/py/objboundmeth.c
index 57be6a6cfd4f8cc6119e5e0eaea21c62615d3c63..890f8b15b68ca59640d6f3294e949b6dcd988205 100644
--- a/py/objboundmeth.c
+++ b/py/objboundmeth.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objcell.c b/py/objcell.c
index 06a88b95474bd112d6d23f43e57a35cc63d3617d..111906412eb5bb313f49395ad8d7a6e6618edf90 100644
--- a/py/objcell.c
+++ b/py/objcell.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objclosure.c b/py/objclosure.c
index 3e12358bbd01f64623739d2225692a2358b33cae..4eb9eb8b84aea25741304580ad6dbd3790f6014b 100644
--- a/py/objclosure.c
+++ b/py/objclosure.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objcomplex.c b/py/objcomplex.c
index e4fbed1e8dcbb2ad69ee68da3e0bc03243c4a514..f945f3560824b06b530cea3a1c61f3e1bd2df595 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objdict.c b/py/objdict.c
index 23d3008b8f3e2a7a4b4da4046a0ff4b8357782f8..a272ebdb633f9b1d221c833daec04879c560d7a9 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objenumerate.c b/py/objenumerate.c
index faae6516c011a44bcf8111dac4aacb3533be4c3a..1a9d30f8368fd8e32e2f6eecb4a7538bc1aeb5c7 100644
--- a/py/objenumerate.c
+++ b/py/objenumerate.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objexcept.c b/py/objexcept.c
index 4722aca9146516b9daec8e2a0bdd59caefd8bb91..a9fe04094149e72560935c872f41ebdc10f4fcc1 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objexcept.h b/py/objexcept.h
index 2232e1e21460fc6118d8b686b4ef17b8b7ed9e89..f67651a7eb1e29fb1a9a361bc22569d91c5285ea 100644
--- a/py/objexcept.h
+++ b/py/objexcept.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objfilter.c b/py/objfilter.c
index a655b8a785a0d2e1856a9ecbe6c6be9c9353427d..cb965d8c32350e0e247a1d08249e98c7d6eba134 100644
--- a/py/objfilter.c
+++ b/py/objfilter.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objfloat.c b/py/objfloat.c
index d0e6166121069fd674fba288a853bc398d099cba..15edd810f14501dd34439ca1baebc8f3b6a84a5f 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objfun.c b/py/objfun.c
index 9f35891243dc8b26049a893861edafc22beb6f4c..eaba1312935702ff602d46fb82baece9b0b474e8 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -480,7 +480,7 @@ typedef mp_uint_t (*inline_asm_fun_2_t)(mp_uint_t, mp_uint_t);
 typedef mp_uint_t (*inline_asm_fun_3_t)(mp_uint_t, mp_uint_t, mp_uint_t);
 typedef mp_uint_t (*inline_asm_fun_4_t)(mp_uint_t, mp_uint_t, mp_uint_t, mp_uint_t);
 
-// convert a Micro Python object to a sensible value for inline asm
+// convert a MicroPython object to a sensible value for inline asm
 STATIC mp_uint_t convert_obj_for_inline_asm(mp_obj_t obj) {
     // TODO for byte_array, pass pointer to the array
     if (MP_OBJ_IS_SMALL_INT(obj)) {
diff --git a/py/objfun.h b/py/objfun.h
index 450c98f7650f6f86f9d86e8478c259c2863d6463..fbb35162618f419b9bc5b990d48e4b1d6ca03158 100644
--- a/py/objfun.h
+++ b/py/objfun.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 9d6e636b382a01dd299a505fa0bd4dbfd7acbbf6..2f39f3a52bbc7ac56eecbccf1360c28e629dedb1 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objgenerator.h b/py/objgenerator.h
index d61332a206c2f7e3b59f4db2f5d67db9a1c8f67b..80bf9cd8603f0427d05c784bfa908af6cf8fc342 100644
--- a/py/objgenerator.h
+++ b/py/objgenerator.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objgetitemiter.c b/py/objgetitemiter.c
index a3c754448fb31f240fe6ec2171a8d5c2ba433a61..afd6fb22b01b98deaace3010f5eff75200ccc06d 100644
--- a/py/objgetitemiter.c
+++ b/py/objgetitemiter.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objint.c b/py/objint.c
index 2749ec51c235ef0b40995d73c6c89ab0fccba175..29d889629fb19fb77b9c9c50f44dbfd5c40c6ace 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objint.h b/py/objint.h
index f341306ed7f2237e3e8ad32fcc5b43f5a52c3a51..394c23714be2deada70986995383e41e1a7d75d2 100644
--- a/py/objint.h
+++ b/py/objint.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 1d184a7dc25c06d80b0eec01829d2da37787f332..02c005d2fde1097a9737ad0c70c7990da94d8330 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index 26492aab48e747025f45552059fbd6a6bdf1c687..0791a8af2c2b3149fa0cf45c4e2b2175e23b807d 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objlist.c b/py/objlist.c
index 45e69c8bcfc67a27fd22356d4e664f13efc3fbe3..ba1c506771dbbd5d13f0a119bc3b1c40db4b0bb7 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objlist.h b/py/objlist.h
index 740ba9fda920fbc4854187c548895579f2a698e4..28b5495a921298fd61709b6c1ade02bb5210c028 100644
--- a/py/objlist.h
+++ b/py/objlist.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objmap.c b/py/objmap.c
index 111c964fdd62007102b99b99c93154d8921e92d7..908c61507e77e9ee3d89e91d4e379664c20e68d6 100644
--- a/py/objmap.c
+++ b/py/objmap.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objmodule.c b/py/objmodule.c
index 43bb36b98c84d6c7b0a1e79a34961aab3083062a..fc8507c27bfb191337a157f302b9d6b38746a394 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objmodule.h b/py/objmodule.h
index 5bfbe51d5fe38c34eba211f9951f539d05727b89..b5c07dc333e6735717707f580308efdb19aac106 100644
--- a/py/objmodule.h
+++ b/py/objmodule.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index 7ec5c2f41233237b9dfbe9b573730a220e2d7e41..fb9d9f02cfb374ecf261118a1f10318ffe331483 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objnone.c b/py/objnone.c
index 5d5b83540db25b7bd6d45903cb05ae5a1714a11c..cd7319bec8fd5ee5adf12cac1c449b29ef215f3e 100644
--- a/py/objnone.c
+++ b/py/objnone.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objobject.c b/py/objobject.c
index f9a7d17c34ded9a5f8f00c9a33e271501887c948..49d2ec62ee94dc0f3c1649b504afc911215c7fe9 100644
--- a/py/objobject.c
+++ b/py/objobject.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objproperty.c b/py/objproperty.c
index 8189935d20b59c87b1af1a8faea7c290bfd29384..0934fad058ed7128b038d38f2f56d266e8827cc6 100644
--- a/py/objproperty.c
+++ b/py/objproperty.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objrange.c b/py/objrange.c
index 8c4e14f49cd8f959741fab30d0bc83882c11307d..33b07a9d4414438e55426598756435826a54ead1 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objreversed.c b/py/objreversed.c
index fc85e72bfb58532354fd6537ed0031d267cb96a3..a596a2fde35f77eb7bfee98cf5d43bcca85d15e2 100644
--- a/py/objreversed.c
+++ b/py/objreversed.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objset.c b/py/objset.c
index f74bc74a071fa2f68b84d412008954812a3d4a9b..376439b73e0abfe5e00f132413cc69e1d01d973c 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objsingleton.c b/py/objsingleton.c
index 394c12767715bc92a728c2a38f019ab60f4e75e2..ea72ae38cc508275b1e0dbf91d087b6db0f25f9f 100644
--- a/py/objsingleton.c
+++ b/py/objsingleton.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objslice.c b/py/objslice.c
index 928be6dab1427f188fb60e25580087f8587a3680..358c44d0615a2f36c18d7a225ed7d322b94e4360 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objstr.c b/py/objstr.c
index cea10770c8d43d2e9a3da706ab57c9468839c193..ddad7d3bdf8f970474a70412c83f7019a747e80c 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objstr.h b/py/objstr.h
index 6fbed405a79c58380b620edb5694bb9fb1a7961d..3aef8c68e2e49dd5ab9e4ddf12f1098b994fbdde 100644
--- a/py/objstr.h
+++ b/py/objstr.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objstringio.c b/py/objstringio.c
index 645c441cb2d6c98ea2b11713a4bb8ff04d9b3a2f..046d32580656080b952bbabbfe820905080ec84b 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index d534285865a1833f4fef173485ce37baace4375c..0cf791ff7c4d5c2c9ae14a97dfe9ca7e979168a5 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objtuple.c b/py/objtuple.c
index eaf0e37f47a5a6822d5f6e4c331ead6ca3fe17a6..0b05755fb345c3b5a2ce72f0e74b2d346a5995c7 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objtuple.h b/py/objtuple.h
index 68670239594f19d42230f087766c99420416c15d..05c6490fe62cbb013cc04d0552704487db6edc69 100644
--- a/py/objtuple.h
+++ b/py/objtuple.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objtype.c b/py/objtype.c
index 0c0826cf9371362c5c6c0e34f751fa6a82a1927a..a258915f34baee0953fd48cd0d03c92f1148a60c 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -917,8 +917,8 @@ const mp_obj_type_t mp_type_type = {
 };
 
 mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict) {
-    assert(MP_OBJ_IS_TYPE(bases_tuple, &mp_type_tuple)); // Micro Python restriction, for now
-    assert(MP_OBJ_IS_TYPE(locals_dict, &mp_type_dict)); // Micro Python restriction, for now
+    assert(MP_OBJ_IS_TYPE(bases_tuple, &mp_type_tuple)); // MicroPython restriction, for now
+    assert(MP_OBJ_IS_TYPE(locals_dict, &mp_type_dict)); // MicroPython restriction, for now
 
     // TODO might need to make a copy of locals_dict; at least that's how CPython does it
 
diff --git a/py/objtype.h b/py/objtype.h
index 104b20aab18428b9df866d82c78e3569d090af20..52419f3cdc8ccc86fd2e14c6c22493830c9a58ca 100644
--- a/py/objtype.h
+++ b/py/objtype.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/objzip.c b/py/objzip.c
index 6f72d1595456942696b8fd87c72eb14a4a665667..0183925e3c523ea730bd36c0287f487b4260fb90 100644
--- a/py/objzip.c
+++ b/py/objzip.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/opmethods.c b/py/opmethods.c
index 80a953fb89f97fec9e50237141e5c25ecca75f4f..1200ba39efdf9c1ec6c9ae028c4af2deb5bc40c6 100644
--- a/py/opmethods.c
+++ b/py/opmethods.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/parse.c b/py/parse.c
index 2f16748a6ce735a6749ec78f1c5752251fb58216..e399aac53540ab81d3fea76f1bb6225986fb08e6 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/parse.h b/py/parse.h
index fec18825b882e756745660eccacbe5039ccafd04..9a1a2b4dd433d9b2325efd39b4e52ab635280169 100644
--- a/py/parse.h
+++ b/py/parse.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/parsenum.c b/py/parsenum.c
index 17711884340017a7ca73397eaf66f635a8c27b1d..b62029f7c7d2a689cdb728271095307051cf479e 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/parsenum.h b/py/parsenum.h
index 77fd0f4a5057d1642abfa98aab3ec1d53600f149..a5bed731d24f0960f4a4a7f3402738666f2148ed 100644
--- a/py/parsenum.h
+++ b/py/parsenum.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/parsenumbase.c b/py/parsenumbase.c
index 73a3372f0ac69ee45c4e432cc5af4475f03594fc..ba10591226f23c74aa5c9ebc60f575103eedc4a3 100644
--- a/py/parsenumbase.c
+++ b/py/parsenumbase.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/parsenumbase.h b/py/parsenumbase.h
index 143796df489daab32bb7d908417b887ce49482e4..3a525f993c8a4234346a62bf9f26df38ff0de880 100644
--- a/py/parsenumbase.h
+++ b/py/parsenumbase.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/qstr.c b/py/qstr.c
index 5aa1610648e4da73d45f353c919a73647fd1526f..fdb38f1dec4b3675bccd5340609b1a91173d2ddb 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/qstr.h b/py/qstr.h
index 4116eb81d47380764785a6691524a112adad59fd..e2bdcc351e238288a562df7a784af4c821ad8349 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index 4581e5e1b1e741dfd41c7d51752b1bd08b0757fe..9375b9101a6504899a13d3beffb213aa9d434038 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/repl.c b/py/repl.c
index 8e55eb017dad718835a5809e3a7ae85d8a614f0a..7e8922e19ac69ac54907542a64874b33f270d5a9 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/repl.h b/py/repl.h
index c2499a270a4b6a7bbdb1b4bd7d1fdab5bceccb88..a7a4136cad188f231686c351f480e58492a08252 100644
--- a/py/repl.h
+++ b/py/repl.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/runtime.c b/py/runtime.c
index ecc3ae2f51c8498e404e7cff8c5ed3773e903fa8..6a0db007e34b913d5e17184c5d20973fceb56746 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -1038,7 +1038,7 @@ void mp_load_method_maybe(mp_obj_t obj, qstr attr, mp_obj_t *dest) {
     } else if (type->locals_dict != NULL) {
         // generic method lookup
         // this is a lookup in the object (ie not class or type)
-        assert(type->locals_dict->base.type == &mp_type_dict); // Micro Python restriction, for now
+        assert(type->locals_dict->base.type == &mp_type_dict); // MicroPython restriction, for now
         mp_map_t *locals_map = &type->locals_dict->map;
         mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
         if (elem != NULL) {
diff --git a/py/runtime.h b/py/runtime.h
index 0add564cc6abeaf0e9420b6510cf5cecc954e2d5..fe492885b15a881de8fccf2c81900d49fcb1866d 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/runtime0.h b/py/runtime0.h
index 060ee8c0adfed4424a1656e858bb184f03e1f691..d22c2fabe6e7689a066aa34575327621cec02685 100644
--- a/py/runtime0.h
+++ b/py/runtime0.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/runtime_utils.c b/py/runtime_utils.c
index e0495495aa74948810c2a434b4172ab0d1d88a3b..56a918064530e25915c34141427cd027e43d72d9 100644
--- a/py/runtime_utils.c
+++ b/py/runtime_utils.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/scope.c b/py/scope.c
index 8fe6f960adbbc60c898a9ebd6dd4b3c5ccf11380..1a6ae7b8ad6e15343e86c0ee410ad9f1d865a87e 100644
--- a/py/scope.c
+++ b/py/scope.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/scope.h b/py/scope.h
index 4d0c1b1d9b279e7e2d38b0cc6ea3d74d51bfb64e..e3b6a57c794c691388da9f39a7b923ade7bdddaa 100644
--- a/py/scope.h
+++ b/py/scope.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/sequence.c b/py/sequence.c
index 32db640dc1222720a9fa187b74ef8f04dc831586..0752ee109838b31bd640f5113e3e63a8bd0f3b8c 100644
--- a/py/sequence.c
+++ b/py/sequence.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/showbc.c b/py/showbc.c
index 0bccf8427f5ea02e7c43430d02a2bf9a1e82bd40..bb2b084ed795499b8f729a55afd9725046777a79 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/smallint.c b/py/smallint.c
index 4c42ee0cc993158dcd82ce8dd5d6a96b2f42231a..aa542ca7bf29ada2ebc8d1797b36e8eaefb40009 100644
--- a/py/smallint.c
+++ b/py/smallint.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/smallint.h b/py/smallint.h
index b2bfc6df91ebd3d385a8c82e7e5b5206c513e8e8..42679a78fb2036f2f3d5948d98b028a8f4f2f57f 100644
--- a/py/smallint.h
+++ b/py/smallint.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/stackctrl.c b/py/stackctrl.c
index 1843e7339eaed1c73d2a59b10853bbaf1d11be09..0bcd82f4f6295516564b95a865242c3192fe971f 100644
--- a/py/stackctrl.c
+++ b/py/stackctrl.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/stackctrl.h b/py/stackctrl.h
index 84c0e1427eed1945f8dddbaf0d722de4d510386f..ff8da0ab138c380ef5da54bdb60d038fabf7fe9f 100644
--- a/py/stackctrl.h
+++ b/py/stackctrl.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/stream.c b/py/stream.c
index 018609903455715745bfca75d5cb23bda0bbca64..5d1868153818533bce305b745c9a737f821c4542 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/stream.h b/py/stream.h
index 0b5fd7cc097dd6a770cc9a0b6a7e3c1791cf4ccf..401ae313cd88b18db19e421a188d934a4e95777f 100644
--- a/py/stream.h
+++ b/py/stream.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/unicode.c b/py/unicode.c
index c6f872038d7e0ded9484f26e540b1f85da6de35f..eddb007d5eea96ff38bb2d88d81ada078590e7e7 100644
--- a/py/unicode.c
+++ b/py/unicode.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/unicode.h b/py/unicode.h
index f99c9705d5d0a8972fd0f16531b753c3dbdf3fe5..19487a65ae8b95dbe07f0f0375a1c77d397d8d3d 100644
--- a/py/unicode.h
+++ b/py/unicode.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/vm.c b/py/vm.c
index bb120e7757a50adb18df2dd2f0d184236c61b7a2..c7fc83d048ca188a3d02e23f243c81cb7693aeaa 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/vmentrytable.h b/py/vmentrytable.h
index dd9789e34851df0fbf030c97b3184d34ce88c66a..352a6dc315cc547aa6e7bcbfd68b740927d4918c 100644
--- a/py/vmentrytable.h
+++ b/py/vmentrytable.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/vstr.c b/py/vstr.c
index f41bd2e232b92e7d1812c7b5a5bca896b87a076c..8a00f6c6f7ebc5fcebb7ef6205c335d806a9a857 100644
--- a/py/vstr.c
+++ b/py/vstr.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/py/warning.c b/py/warning.c
index 4cdf3b3f1024f80112df5af40e27aef3077b2910..46b31ecca7a5fb5d7fd353dfea7c1a33e3534499 100644
--- a/py/warning.c
+++ b/py/warning.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/qemu-arm/mpconfigport.h b/qemu-arm/mpconfigport.h
index ebec027e806bb28f097b5f82ea51f3cdc892e539..87e537af74ec30662e783ebe702c798d8bc73fd6 100644
--- a/qemu-arm/mpconfigport.h
+++ b/qemu-arm/mpconfigport.h
@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-// options to control how Micro Python is built
+// options to control how MicroPython is built
 
 #define MICROPY_ALLOC_PATH_MAX      (512)
 #define MICROPY_EMIT_X64            (0)
diff --git a/stmhal/accel.c b/stmhal/accel.c
index 0e6eaf03db3e59285e100c76ee311942e0eac595..512a6e313ae8a40167dcd40d4cd3deaf88fffcd1 100644
--- a/stmhal/accel.c
+++ b/stmhal/accel.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -102,7 +102,7 @@ STATIC void accel_start(void) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                      */
 
 #define NUM_AXIS (3)
 #define FILT_DEPTH (4)
diff --git a/stmhal/accel.h b/stmhal/accel.h
index 42b15632929c5ccfb33ad77433cae322dd503767..fc35f77756684d3ec300af1bf015eecbd38e79c4 100644
--- a/stmhal/accel.h
+++ b/stmhal/accel.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/adc.c b/stmhal/adc.c
index 6485e2ab77576398a9f99431841bcf373e7f73d9..dd59e29c88195ecb490734e85d23526c2626711c 100644
--- a/stmhal/adc.c
+++ b/stmhal/adc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -263,7 +263,7 @@ STATIC uint32_t adc_read_channel(ADC_HandleTypeDef *adcHandle) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings : adc object (single channel)                        */
+/* MicroPython bindings : adc object (single channel)                         */
 
 STATIC void adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_obj_adc_t *self = self_in;
@@ -596,7 +596,7 @@ float adc_read_core_vref(ADC_HandleTypeDef *adcHandle) {
 #endif
 
 /******************************************************************************/
-/* Micro Python bindings : adc_all object                                     */
+/* MicroPython bindings : adc_all object                                      */
 
 STATIC mp_obj_t adc_all_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // check number of arguments
diff --git a/stmhal/adc.h b/stmhal/adc.h
index 6ec5584643b2bce42c067f9b2748ac4eef402b71..c90e6b34339a411227fbca89d1ed935ff96ac0d7 100644
--- a/stmhal/adc.h
+++ b/stmhal/adc.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/bufhelper.c b/stmhal/bufhelper.c
index ca76e9496d2d8ddfc497b47492597175dd36e766..79511969b737a6837caeea0e0e8b8ffe7e2bac0c 100644
--- a/stmhal/bufhelper.c
+++ b/stmhal/bufhelper.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/bufhelper.h b/stmhal/bufhelper.h
index 55f57be8e462004389289a9d94c6111d95cabcd2..c1967bf4309052f9d843424b41a5b5d76dcb3dec 100644
--- a/stmhal/bufhelper.h
+++ b/stmhal/bufhelper.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/can.c b/stmhal/can.c
index 6152022b76eddd503d7cb3af47b44b4e4e7d7373..9047e78ca698b0923416acc0b1b2e87034a686a7 100644
--- a/stmhal/can.c
+++ b/stmhal/can.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -262,7 +262,7 @@ STATIC HAL_StatusTypeDef CAN_Transmit(CAN_HandleTypeDef *hcan, uint32_t Timeout)
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 STATIC void pyb_can_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_can_obj_t *self = self_in;
diff --git a/stmhal/can.h b/stmhal/can.h
index 7c40e9bf99ba4dd0cf8c2997d9e156492bcd9a0a..86001281390a44e2f3bac33e07048e2d35ed007d 100644
--- a/stmhal/can.h
+++ b/stmhal/can.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/dac.c b/stmhal/dac.c
index 243aa08c3e2520e77b51c9a61e4295dcb25f7716..cdb3a9bcd710b8b495a2eca26fdef17a93880160 100644
--- a/stmhal/dac.c
+++ b/stmhal/dac.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -124,7 +124,7 @@ STATIC uint32_t TIMx_Config(mp_obj_t timer) {
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 typedef enum {
     DAC_STATE_RESET,
diff --git a/stmhal/dac.h b/stmhal/dac.h
index 93192c0fee1d42d4b22fa6c3b26615d03b4b44c8..f487f52a92fe38cc214023bf53ea1f89579ccde8 100644
--- a/stmhal/dac.h
+++ b/stmhal/dac.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/dma.c b/stmhal/dma.c
index e43b67e73d1106b9267b4b138b5e5b07d4bd20c7..df6275d652ce9b71ad7f40d256195fa393b3c61c 100644
--- a/stmhal/dma.c
+++ b/stmhal/dma.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/dma.h b/stmhal/dma.h
index d8b11ca3a99a1d8c3448d0d5cb7158b40fe1d3a9..55fb62175811b403a926f30964cf34c7145171aa 100644
--- a/stmhal/dma.h
+++ b/stmhal/dma.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/extint.c b/stmhal/extint.c
index 70023557f460349ced95fb71e45071619e3802a8..24a68c2a22b62e60fea09a6e9dfba4d59302800d 100644
--- a/stmhal/extint.c
+++ b/stmhal/extint.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/extint.h b/stmhal/extint.h
index 0eae8942cedd5326b80aba38a1e508c9722081fa..846790b9be99cdfca987f7ad07e82c85bfdf8d95 100644
--- a/stmhal/extint.h
+++ b/stmhal/extint.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/flash.c b/stmhal/flash.c
index e374be0e50655d3ba01ffc5114038bba97cc4076..bebb3a16193e895fbb74b3b485dd9019cf0cb1d7 100644
--- a/stmhal/flash.c
+++ b/stmhal/flash.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/flash.h b/stmhal/flash.h
index c5b5bf3522be0f15cff4234c30dd4ce0230b0c9c..688e70a3cd5f89f90d992258702699b2d02547b5 100644
--- a/stmhal/flash.h
+++ b/stmhal/flash.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/font_petme128_8x8.h b/stmhal/font_petme128_8x8.h
index f27277760fa92cfc8a7c1753fe509168aece7a9c..8b0cc9cb017f2e1ac5998fe3e0fb23be5f5970e5 100644
--- a/stmhal/font_petme128_8x8.h
+++ b/stmhal/font_petme128_8x8.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/gccollect.c b/stmhal/gccollect.c
index d7223dedc3f05fc6bf4272594b502c71c97980b0..937fb6f36eab956dd488be48450ed135242663ba 100644
--- a/stmhal/gccollect.c
+++ b/stmhal/gccollect.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/gccollect.h b/stmhal/gccollect.h
index 2cb32a8d4551b1d1720169d9979f91bcd8c3296b..1b64a51a6a11189314498d51854be926ab5b18da 100644
--- a/stmhal/gccollect.h
+++ b/stmhal/gccollect.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/hal/l4/inc/stm32l4xx_hal_uart.h b/stmhal/hal/l4/inc/stm32l4xx_hal_uart.h
index b890c3d9871693c10e34f32f8cef408fa6506554..52ca6406bc89cec80b6ecef244a2349895df3b30 100644
--- a/stmhal/hal/l4/inc/stm32l4xx_hal_uart.h
+++ b/stmhal/hal/l4/inc/stm32l4xx_hal_uart.h
@@ -1370,7 +1370,7 @@ void UART_AdvFeatureConfig(UART_HandleTypeDef *huart);
 /**
   * @}
   */
-/* Functions added by micropython */
+/* Functions added by MicroPython */
 uint32_t HAL_UART_CalcBrr(uint32_t fck, uint32_t baud);
 
 #ifdef __cplusplus
diff --git a/stmhal/hal/l4/src/stm32l4xx_hal_uart.c b/stmhal/hal/l4/src/stm32l4xx_hal_uart.c
index 2b0d76d301a0cbecf59cc192f9093d4282efa1ae..adb3d79ab73358230b7bdc9a7ea7e675bfec6b2e 100644
--- a/stmhal/hal/l4/src/stm32l4xx_hal_uart.c
+++ b/stmhal/hal/l4/src/stm32l4xx_hal_uart.c
@@ -2104,7 +2104,7 @@ static HAL_StatusTypeDef UART_Receive_IT(UART_HandleTypeDef *huart)
 
 /**
   * @brief Calculate register BRR value without using uint64.
-  * @note   This function is added by the micropython project.
+  * @note   This function is added by the MicroPython project.
   * @param  fck: Input clock frequency to the uart block in Hz.
   * @param  baud: baud rate should be one of {300, 600, 1200, 2400, 4800, 9600, 19200, 57600, 115200}.
   * @retval BRR value
diff --git a/stmhal/help.c b/stmhal/help.c
index 83ef7e596fd1b9234e76bc326ef0e0c39d15b596..87b2af526e71de3e7c8081372fe7839a211dec9d 100644
--- a/stmhal/help.c
+++ b/stmhal/help.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/i2c.c b/stmhal/i2c.c
index f77222715ae7e78bff62511fb353c3c2898704a7..f102fd0f2c2249bccb3e1ab7b08255e5bb735c1f 100644
--- a/stmhal/i2c.c
+++ b/stmhal/i2c.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -511,7 +511,7 @@ STATIC HAL_StatusTypeDef i2c_wait_dma_finished(I2C_HandleTypeDef *i2c, uint32_t
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                       */
 
 STATIC inline bool in_master_mode(pyb_i2c_obj_t *self) { return self->i2c->Init.OwnAddress1 == PYB_I2C_MASTER_ADDRESS; }
 
diff --git a/stmhal/i2c.h b/stmhal/i2c.h
index eda076e82902c7b47e3d2597694202b5330710c4..6affe3973b10dae17f188b59c6f7ff5c9d05b21e 100644
--- a/stmhal/i2c.h
+++ b/stmhal/i2c.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/irq.c b/stmhal/irq.c
index 44758e11bce11c3f8dad85a9b6e3b83f4b549716..d6db8e83d8765f6a11eb5c31720f85a74d57839a 100644
--- a/stmhal/irq.c
+++ b/stmhal/irq.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/irq.h b/stmhal/irq.h
index 8d44b50edf482504be77ecd10bc116197bdfb062..2cf58639ea0129ee7e18dc4c6ce453ac9a7c3acb 100644
--- a/stmhal/irq.h
+++ b/stmhal/irq.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/lcd.c b/stmhal/lcd.c
index cdf9fa0d1a6c90637bbf96cb0f8a81fe0bfcc69e..7368193cf881c02e1b192c044bc87b39fed4f99c 100644
--- a/stmhal/lcd.c
+++ b/stmhal/lcd.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/lcd.h b/stmhal/lcd.h
index be4f6ed2512906715ffa62f85da2c48a1713e62b..c0d9bd97da210fb0c89fea7b60de988f443d663f 100644
--- a/stmhal/lcd.h
+++ b/stmhal/lcd.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/led.c b/stmhal/led.c
index 4b9895fc5599d843e494f1b75bcce94ce19d271b..030a814dd6d1b41296926a16c709ceee7f89a08a 100644
--- a/stmhal/led.c
+++ b/stmhal/led.c
@@ -279,7 +279,7 @@ void led_debug(int n, int delay) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                       */
 
 void led_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_led_obj_t *self = self_in;
diff --git a/stmhal/led.h b/stmhal/led.h
index fc9348181828161b409d247aa159b2ceea5b0926..f1b05d1e28270285a41a626b1fe898a47952c217 100644
--- a/stmhal/led.h
+++ b/stmhal/led.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/main.c b/stmhal/main.c
index 566c2db07f5af46fec0bfe71251a4783aea5a553..056c590cda7eaab14f1189cb3cf81a48400a4876 100644
--- a/stmhal/main.c
+++ b/stmhal/main.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -511,7 +511,7 @@ soft_reset:
     // GC init
     gc_init(&_heap_start, &_heap_end);
 
-    // Micro Python init
+    // MicroPython init
     mp_init();
     mp_obj_list_init(mp_sys_path, 0);
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
diff --git a/stmhal/modnetwork.c b/stmhal/modnetwork.c
index 09a80ef3cbc77ac1a0397cc71ef376577024729f..6b4949a0de60d338a52f4300d6a0e95fa9d99c37 100644
--- a/stmhal/modnetwork.c
+++ b/stmhal/modnetwork.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/modnetwork.h b/stmhal/modnetwork.h
index 83e4255d5a502da94d41b7390422992f9ee0ae4b..ecda94da4139b59a5df312489694da82548c52ed 100644
--- a/stmhal/modnetwork.h
+++ b/stmhal/modnetwork.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/modnwcc3k.c b/stmhal/modnwcc3k.c
index 957d74e6ece15fde52fe30cdfed0e08cb144e025..a04a2d260ccf7f71a106e68adceb0316bcaf2ff8 100644
--- a/stmhal/modnwcc3k.c
+++ b/stmhal/modnwcc3k.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -412,7 +412,7 @@ STATIC int cc3k_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request
 }
 
 /******************************************************************************/
-// Micro Python bindings; CC3K class
+// MicroPython bindings; CC3K class
 
 typedef struct _cc3k_obj_t {
     mp_obj_base_t base;
diff --git a/stmhal/modnwwiznet5k.c b/stmhal/modnwwiznet5k.c
index 4752cdc0bc73f5ea13e2e610ac46519ec01b48b4..eb7eb84438500508369f32504e5cac528c213c1a 100644
--- a/stmhal/modnwwiznet5k.c
+++ b/stmhal/modnwwiznet5k.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -314,7 +314,7 @@ STATIC mp_obj_t wiznet5k_socket_disconnect(mp_obj_t self_in) {
 #endif
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 /// \classmethod \constructor(spi, pin_cs, pin_rst)
 /// Create and return a WIZNET5K object.
diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c
index 7322c6a5bab96771b81b99ca1a151f5827daae53..5dc28e13250fcbf258f1ed40d1fbca64b28bd1dd 100644
--- a/stmhal/modpyb.c
+++ b/stmhal/modpyb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/modstm.c b/stmhal/modstm.c
index eabbf08e4a9c898824fa5affa26063fdf59e2e8f..2084c0aa0e380a828642007353c7c480236bcddc 100644
--- a/stmhal/modstm.c
+++ b/stmhal/modstm.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/moduos.c b/stmhal/moduos.c
index ece6019fbfe790a335af1f91344b2146b9bac979..77a60c0cbc60518e1ece25c8ddb4e08eb0508600 100644
--- a/stmhal/moduos.c
+++ b/stmhal/moduos.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/modusocket.c b/stmhal/modusocket.c
index 081a322ae20ebc76fa6697166adfb5dedd58282b..e1da53a4b351c2db7bc34ccf134b97366bb4f84d 100644
--- a/stmhal/modusocket.c
+++ b/stmhal/modusocket.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/modutime.c b/stmhal/modutime.c
index 58c43a55ebf3004b46ae665fe2ced2392127f436..fe13f80c0695678ea6ba258e2ef630fe13ccbd38 100644
--- a/stmhal/modutime.c
+++ b/stmhal/modutime.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/pendsv.c b/stmhal/pendsv.c
index 7b3906f250ea8214d1c4ee9bf970189c6b361388..00ea12f4603d3152ff51af5fa760849c9390b251 100644
--- a/stmhal/pendsv.c
+++ b/stmhal/pendsv.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/pendsv.h b/stmhal/pendsv.h
index b64e61386d12d82fb6f79dae542d293b628028be..6a9eb0d794d0b423a606a78a18067fcfdd38b176 100644
--- a/stmhal/pendsv.h
+++ b/stmhal/pendsv.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/pin.c b/stmhal/pin.c
index f30474e1f56789384f0b5c6aa68de415433443b9..0dce0c1c08a3389dfd54c16917a049393607b6a5 100644
--- a/stmhal/pin.c
+++ b/stmhal/pin.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/pin.h b/stmhal/pin.h
index 1ec4bd6b87a9495860bfb9abe00e8768cb475864..90de79e5ceb5cf4307df19fec6990976f86221b4 100644
--- a/stmhal/pin.h
+++ b/stmhal/pin.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/pin_defs_stmhal.h b/stmhal/pin_defs_stmhal.h
index d6a2ef4242a4c46178deeff221edc229687d2ed8..6cf3b1b8328a037c61a1064869b779fe8e8c378c 100644
--- a/stmhal/pin_defs_stmhal.h
+++ b/stmhal/pin_defs_stmhal.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/pin_named_pins.c b/stmhal/pin_named_pins.c
index fac19ee97b0f6e003401a19e4c162774cf8407b5..726da54dd6cf3c017c7980ea96a0155b33c5ad96 100644
--- a/stmhal/pin_named_pins.c
+++ b/stmhal/pin_named_pins.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/portmodules.h b/stmhal/portmodules.h
index 4e892da96334f60b5beed1615fe073e0c3a9682f..b575109b89688938406b0e9115dc7ae7e04c9116 100644
--- a/stmhal/portmodules.h
+++ b/stmhal/portmodules.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/qstrdefsport.h b/stmhal/qstrdefsport.h
index 1d83f43bdd538042aed2310307bf90855660231b..31220c5a42b237fba6a7daf16fbeab5c8b63282d 100644
--- a/stmhal/qstrdefsport.h
+++ b/stmhal/qstrdefsport.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/rng.c b/stmhal/rng.c
index a5a9874d1c1546b05e7b42135bea185f6f91083b..c0c5e9aeb559fcb4218b29ca58928356c53d2e54 100644
--- a/stmhal/rng.c
+++ b/stmhal/rng.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/rng.h b/stmhal/rng.h
index f022f3a6779e65ea8b2fbf9953e7f342d7d8db28..43e49fe72e9c936d2a217166f10d201e987c9b5c 100644
--- a/stmhal/rng.h
+++ b/stmhal/rng.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/rtc.c b/stmhal/rtc.c
index 755684570d6620e9bc034b5576b594abf7879a68..4efc56d5c8f3f9aaaa369808ee7677d6df03d0a7 100644
--- a/stmhal/rtc.c
+++ b/stmhal/rtc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -412,7 +412,7 @@ STATIC void RTC_CalendarConfig(void) {
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 typedef struct _pyb_rtc_obj_t {
     mp_obj_base_t base;
diff --git a/stmhal/rtc.h b/stmhal/rtc.h
index f382fa6b635154f9847146be02e4822942531248..09ab2aedff1031fa40e70f2ad03b2c3edb0ba460 100644
--- a/stmhal/rtc.h
+++ b/stmhal/rtc.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/sdcard.c b/stmhal/sdcard.c
index 5260e0a500712861ec202d13002e9ccacd133eef..dfa7158a4c5b9903872b5907b9f53fdb2618d281 100644
--- a/stmhal/sdcard.c
+++ b/stmhal/sdcard.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -356,7 +356,7 @@ mp_uint_t sdcard_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t n
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 //
 // Expose the SD card as an object with the block protocol.
 
diff --git a/stmhal/sdcard.h b/stmhal/sdcard.h
index d595f0f1afdcacc9273714aee5500368347eb41a..8c698fc2f7d8b62dcfa5113044979f1ee56da7d1 100644
--- a/stmhal/sdcard.h
+++ b/stmhal/sdcard.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/servo.c b/stmhal/servo.c
index e4bcbc30e5aeb239c0253bac8c06997708fa0d61..fa39587a8e7541e05713def7e1a21538e515fd56 100644
--- a/stmhal/servo.c
+++ b/stmhal/servo.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -147,7 +147,7 @@ STATIC void servo_init_channel(pyb_servo_obj_t *s) {
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 STATIC mp_obj_t pyb_servo_set(mp_obj_t port, mp_obj_t value) {
     int p = mp_obj_get_int(port);
diff --git a/stmhal/servo.h b/stmhal/servo.h
index 18fd493d52fba84b1aa1c29f1da01954578b3545..c602a07da5ecfdf613f84636dfcb48b42e1fcccd 100644
--- a/stmhal/servo.h
+++ b/stmhal/servo.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/spi.c b/stmhal/spi.c
index b710fc3a7c3af0f93606013b20fe5cf899c34060..574fed07394e4a8dd2a8cc00d824323a1fe45400 100644
--- a/stmhal/spi.c
+++ b/stmhal/spi.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/spi.h b/stmhal/spi.h
index e6752fdd18e3c63d191b95026a405f23e604dbc9..eda109a7ef2a3c681950aca2a67fdfbd36e71877 100644
--- a/stmhal/spi.h
+++ b/stmhal/spi.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/stm32_it.c b/stmhal/stm32_it.c
index 357b6d79d7a2bd98f771ab80e25cf19e829fb471..2111da1ae130d7d1db5304f06f3c6f885f026c64 100644
--- a/stmhal/stm32_it.c
+++ b/stmhal/stm32_it.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * Original template from ST Cube library.  See below for header.
  *
diff --git a/stmhal/stm32_it.h b/stmhal/stm32_it.h
index d6ed1b2b9bb377271d8ec29b3fa58a13c07dad84..b498dee8dae3904fcf4fc8ca35b3b0112c7d62cd 100644
--- a/stmhal/stm32_it.h
+++ b/stmhal/stm32_it.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * Original template from ST Cube library.  See below for header.
  *
diff --git a/stmhal/storage.c b/stmhal/storage.c
index 1931cd6079b67f54ae2b8a3b08a3eb01d8dbf0f6..6da1ba95c6d610c2fdccabda49c678901d0f8245 100644
--- a/stmhal/storage.c
+++ b/stmhal/storage.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/storage.h b/stmhal/storage.h
index 0ecb5715a23f703c550bf8f8fd01d89e7be6b255..291e09a9aedca9d6f4576b54c4370cf03ba6f75e 100644
--- a/stmhal/storage.h
+++ b/stmhal/storage.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/system_stm32.c b/stmhal/system_stm32.c
index a63bd3c5701ec6a445b10d1d949ffc1287cfcff0..7fc16b14833d0ca2a049d9681924d79ed0732f80 100644
--- a/stmhal/system_stm32.c
+++ b/stmhal/system_stm32.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * Taken from ST Cube library and modified.  See below for original header.
  *
diff --git a/stmhal/systick.c b/stmhal/systick.c
index 4eac583e2a05a8667eff51143de866423901aee2..c07d0fabce345896ce859a3aded247e44e17f459 100644
--- a/stmhal/systick.c
+++ b/stmhal/systick.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/systick.h b/stmhal/systick.h
index 524afae40eed6eba719724c0f5b066db3f4bb1b4..c1def50c29da5a9e8e0adcb0377fcc12be87854e 100644
--- a/stmhal/systick.h
+++ b/stmhal/systick.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/timer.c b/stmhal/timer.c
index 6513f95d374f518302fe9f23a6ebf2fde1447fb1..570558775b7816e9b125c22e66470d1d0bbda4d6 100644
--- a/stmhal/timer.c
+++ b/stmhal/timer.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -247,7 +247,7 @@ uint32_t timer_get_source_freq(uint32_t tim_id) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                       */
 
 STATIC const mp_obj_type_t pyb_timer_channel_type;
 
diff --git a/stmhal/timer.h b/stmhal/timer.h
index 72e461f2f17b49e3fd085950aba6ce691729f2bf..775accc3d42a40c18ebc5471482d92635bd14c56 100644
--- a/stmhal/timer.h
+++ b/stmhal/timer.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/uart.c b/stmhal/uart.c
index b4ff40e797d98552c966b572bcac5f97186ac8bf..ddff8b9f2a803755804dac85cadeed7cbaf5cdde 100644
--- a/stmhal/uart.c
+++ b/stmhal/uart.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -509,7 +509,7 @@ void uart_irq_handler(mp_uint_t uart_id) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                       */
 
 STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_uart_obj_t *self = self_in;
diff --git a/stmhal/uart.h b/stmhal/uart.h
index 749530954238fce310fc3bb8cec9c34afa78aaab..e96b25b5f45bdbc159f1f19b6bd354d7ac1291fa 100644
--- a/stmhal/uart.h
+++ b/stmhal/uart.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/usb.c b/stmhal/usb.c
index f70dea1428256e336f9352f3f70f2cb45c812bb9..9bf351f499e2e413b0832da1c42e91f5900bf7d2 100644
--- a/stmhal/usb.c
+++ b/stmhal/usb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -169,7 +169,7 @@ void usb_vcp_send_strn_cooked(const char *str, int len) {
 }
 
 /******************************************************************************/
-// Micro Python bindings for USB
+// MicroPython bindings for USB
 
 /*
   Philosophy of USB driver and Python API: pyb.usb_mode(...) configures the USB
@@ -324,7 +324,7 @@ bad_mode:
 MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_mode_obj, 0, pyb_usb_mode);
 
 /******************************************************************************/
-// Micro Python bindings for USB VCP
+// MicroPython bindings for USB VCP
 
 /// \moduleref pyb
 /// \class USB_VCP - USB virtual comm port
@@ -525,7 +525,7 @@ const mp_obj_type_t pyb_usb_vcp_type = {
 };
 
 /******************************************************************************/
-// Micro Python bindings for USB HID
+// MicroPython bindings for USB HID
 
 typedef struct _pyb_usb_hid_obj_t {
     mp_obj_base_t base;
diff --git a/stmhal/usb.h b/stmhal/usb.h
index e04fe70d77533ce2aa8cbf6ff1a63e6fc3b6b444..d39f49a6ccadb0ea80dca72907660570136bc62f 100644
--- a/stmhal/usb.h
+++ b/stmhal/usb.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/usbd_cdc_interface.h b/stmhal/usbd_cdc_interface.h
index 6f9a1e8a3f831bb6757763026fc13142aaa5cb2d..811a2892805243ac45d9daf24877f3d47121b1ed 100644
--- a/stmhal/usbd_cdc_interface.h
+++ b/stmhal/usbd_cdc_interface.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  */
 #ifndef MICROPY_INCLUDED_STMHAL_USBD_CDC_INTERFACE_H
 #define MICROPY_INCLUDED_STMHAL_USBD_CDC_INTERFACE_H
diff --git a/stmhal/usbd_conf.c b/stmhal/usbd_conf.c
index e2bd6c949fbdb9f71dc8a03657799d7c31d681e8..d39144851ffccd82696afd46e4fce9324129f0c7 100644
--- a/stmhal/usbd_conf.c
+++ b/stmhal/usbd_conf.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  */
 
 /**
diff --git a/stmhal/usbd_conf.h b/stmhal/usbd_conf.h
index b69ba52c2f629c3b59688998ab4723644a91c718..34ebe27b9a09401489197bc10a761b8b5d7614b8 100644
--- a/stmhal/usbd_conf.h
+++ b/stmhal/usbd_conf.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  */
 
 /**
diff --git a/stmhal/usbd_desc.c b/stmhal/usbd_desc.c
index 1ad960b4688691d783d7e291cd792f3a31b3d3a7..09e1608c84b7102c3952193de5061a93cb7d01d9 100644
--- a/stmhal/usbd_desc.c
+++ b/stmhal/usbd_desc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  */
 
 /**
diff --git a/stmhal/usbd_desc.h b/stmhal/usbd_desc.h
index f48e364e1feaeee0699fda64446706050d15b6fa..05cbbe5b179f0595fc4d812f90d17310219c52f2 100644
--- a/stmhal/usbd_desc.h
+++ b/stmhal/usbd_desc.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/usbd_msc_storage.h b/stmhal/usbd_msc_storage.h
index a4bc8004afcc9f3093572a147349ac04c4907bc7..6cc40d2d623a0257cf072f4d875b478ef754481b 100644
--- a/stmhal/usbd_msc_storage.h
+++ b/stmhal/usbd_msc_storage.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/usbdev/class/inc/usbd_cdc_msc_hid0.h b/stmhal/usbdev/class/inc/usbd_cdc_msc_hid0.h
index ec03c860a4187faedf588c56b9669ed7880b10df..08882bb1aec1d989d37aa66dc052cbac4dc619fc 100644
--- a/stmhal/usbdev/class/inc/usbd_cdc_msc_hid0.h
+++ b/stmhal/usbdev/class/inc/usbd_cdc_msc_hid0.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/usbdev/class/src/usbd_cdc_msc_hid.c b/stmhal/usbdev/class/src/usbd_cdc_msc_hid.c
index e0edf13702d8461213014b2c615867b3f1bd904b..d61073f4d5f2d6d985afc65ffc4abeaf62f91f31 100644
--- a/stmhal/usbdev/class/src/usbd_cdc_msc_hid.c
+++ b/stmhal/usbdev/class/src/usbd_cdc_msc_hid.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/stmhal/usrsw.c b/stmhal/usrsw.c
index 63cd440d41e4b1adde16b4b6e2fcf2bc61a15aad..a7721ad779a1098a5b52244e05a18fce82d8f5cd 100644
--- a/stmhal/usrsw.c
+++ b/stmhal/usrsw.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -63,7 +63,7 @@ int switch_get(void) {
 }
 
 /******************************************************************************/
-// Micro Python bindings
+// MicroPython bindings
 
 typedef struct _pyb_switch_obj_t {
     mp_obj_base_t base;
diff --git a/stmhal/usrsw.h b/stmhal/usrsw.h
index 9fbe6109d6552773f3aa08fbcd4bdefb091094fd..d96e3c2813bf432c7508ad5e006e4ea25d1c3cce 100644
--- a/stmhal/usrsw.h
+++ b/stmhal/usrsw.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/teensy/hal_ftm.c b/teensy/hal_ftm.c
index 28992881be725f799430336b85a731dbea049f51..3c031bf6dd875c6eb34ce993d6171ad834221e1d 100644
--- a/teensy/hal_ftm.c
+++ b/teensy/hal_ftm.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/teensy/hal_ftm.h b/teensy/hal_ftm.h
index ad627358b6324b2dca70b3986419339f9e412350..84fae8312b9d9b95462e9f0c7563216d2703e445 100644
--- a/teensy/hal_ftm.h
+++ b/teensy/hal_ftm.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/teensy/help.c b/teensy/help.c
index 3b3916b943c542679121ed62af8795dc9a91fdbc..ebe4bed6bf8d54fa7d14ae1b76d680a015f52c0d 100644
--- a/teensy/help.c
+++ b/teensy/help.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/teensy/led.c b/teensy/led.c
index c7ac8be1ff47add0a56bbb53dc69d26d96bb40e9..c043e4399612453052e40f9592c601551da45262 100644
--- a/teensy/led.c
+++ b/teensy/led.c
@@ -81,7 +81,7 @@ void led_toggle(pyb_led_t led) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                       */
 
 void led_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_led_obj_t *self = self_in;
diff --git a/teensy/main.c b/teensy/main.c
index 41bbeb5d9356c610a3c2cc8f7e5c6e88363911a0..3edaa28a06eca96c746b659d6dedd92312616cf1 100644
--- a/teensy/main.c
+++ b/teensy/main.c
@@ -266,7 +266,7 @@ soft_reset:
     // GC init
     gc_init(&_heap_start, (void*)HEAP_END);
 
-    // Micro Python init
+    // MicroPython init
     mp_init();
     mp_obj_list_init(mp_sys_path, 0);
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
diff --git a/teensy/modpyb.c b/teensy/modpyb.c
index 9f601e327b6cb501df081edc5632bf6e99740534..deb1f32f971d87ab52f5201e39e313b3c517bfd1 100644
--- a/teensy/modpyb.c
+++ b/teensy/modpyb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -154,7 +154,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(pyb_sync_obj, pyb_sync);
 /// \function millis()
 /// Returns the number of milliseconds since the board was last reset.
 ///
-/// The result is always a micropython smallint (31-bit signed number), so
+/// The result is always a MicroPython smallint (31-bit signed number), so
 /// after 2^30 milliseconds (about 12.4 days) this will start to return
 /// negative numbers.
 STATIC mp_obj_t pyb_millis(void) {
@@ -185,7 +185,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_elapsed_millis_obj, pyb_elapsed_millis);
 /// \function micros()
 /// Returns the number of microseconds since the board was last reset.
 ///
-/// The result is always a micropython smallint (31-bit signed number), so
+/// The result is always a MicroPython smallint (31-bit signed number), so
 /// after 2^30 microseconds (about 17.8 minutes) this will start to return
 /// negative numbers.
 STATIC mp_obj_t pyb_micros(void) {
diff --git a/teensy/mpconfigport.h b/teensy/mpconfigport.h
index de30924d9eb3518600fa8f925b89227ffe0d7673..69cd69d532b5d9de73c19aae3a6ab8eed4357615 100644
--- a/teensy/mpconfigport.h
+++ b/teensy/mpconfigport.h
@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-// options to control how Micro Python is built
+// options to control how MicroPython is built
 
 #define MICROPY_ALLOC_PATH_MAX      (128)
 #define MICROPY_EMIT_THUMB          (1)
diff --git a/teensy/timer.c b/teensy/timer.c
index 45bcc2b8fbb03b3573222d9fad752b4487d93d0e..bc560d85e0ca369e62de14309d84548f7352f2dd 100644
--- a/teensy/timer.c
+++ b/teensy/timer.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -119,7 +119,7 @@ mp_uint_t get_prescaler_shift(mp_int_t prescaler) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                       */
 
 STATIC const mp_obj_type_t pyb_timer_channel_type;
 
diff --git a/teensy/timer.h b/teensy/timer.h
index 89095b0764f02077b842d77a2b11cef7f683435a..75c2e654e2c57deb9cc8f62a781ac1f8ef961477 100644
--- a/teensy/timer.h
+++ b/teensy/timer.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/teensy/uart.c b/teensy/uart.c
index b4c0a4d5b62ceb14ce54086bfaa8c1387937ed72..3dd2c505198400c3fd6c570888aa3aabe4144f03 100644
--- a/teensy/uart.c
+++ b/teensy/uart.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -221,7 +221,7 @@ void uart_tx_strn_cooked(pyb_uart_obj_t *uart_obj, const char *str, uint len) {
 }
 
 /******************************************************************************/
-/* Micro Python bindings                                                      */
+/* MicroPython bindings                                                      */
 
 STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_uart_obj_t *self = self_in;
diff --git a/tests/basics/bytearray_slice_assign.py b/tests/basics/bytearray_slice_assign.py
index 48f5938a582f2b0d4f0b0982429fcf71e571bd76..7f7d1d119a7d840b8c8c49fc36a098e05aa330b6 100644
--- a/tests/basics/bytearray_slice_assign.py
+++ b/tests/basics/bytearray_slice_assign.py
@@ -4,7 +4,7 @@ except TypeError:
     print("SKIP")
     raise SystemExit
 
-# test slices; only 2 argument version supported by Micro Python at the moment
+# test slices; only 2 argument version supported by MicroPython at the moment
 x = bytearray(range(10))
 
 # Assignment
diff --git a/tests/basics/list_slice_assign.py b/tests/basics/list_slice_assign.py
index 1ad1ef27c1769fc27403cc56255c936f4cd653ba..885615717232ada1e94b725db2a0629a589dd51f 100644
--- a/tests/basics/list_slice_assign.py
+++ b/tests/basics/list_slice_assign.py
@@ -1,4 +1,4 @@
-# test slices; only 2 argument version supported by Micro Python at the moment
+# test slices; only 2 argument version supported by MicroPython at the moment
 x = list(range(10))
 
 # Assignment
diff --git a/tests/io/stringio1.py b/tests/io/stringio1.py
index fa50f282e14a608a7231a8ea8b1b43a2f89e439c..9f7c1e44ef60cdbd8ad6502370380f77a0f73659 100644
--- a/tests/io/stringio1.py
+++ b/tests/io/stringio1.py
@@ -36,7 +36,7 @@ print(a.read())
 a = io.StringIO()
 a.close()
 for f in [a.read, a.getvalue, lambda:a.write("")]:
-    # CPython throws for operations on closed I/O, micropython makes
+    # CPython throws for operations on closed I/O, MicroPython makes
     # the underlying string empty unless MICROPY_CPYTHON_COMPAT defined
     try:
         f()
diff --git a/tests/run-bench-tests b/tests/run-bench-tests
index 1e5e7804bef26fbee9a4b6b3c6fed79d316b7c63..d48b4b7ec5261bfea0dedac22c999fefa1268ec5 100755
--- a/tests/run-bench-tests
+++ b/tests/run-bench-tests
@@ -26,7 +26,7 @@ def run_tests(pyb, test_dict):
         print(base_test + ":")
         for test_file in tests:
 
-            # run Micro Python
+            # run MicroPython
             if pyb is None:
                 # run on PC
                 try:
diff --git a/tests/run-tests b/tests/run-tests
index bd4a1363cba68c98c55fb627a7306badf29cb46f..f9c26283dc8dc6d13e126be809b815841d05e3ff 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -388,7 +388,7 @@ def run_tests(pyb, tests, args, base_path="."):
         if args.write_exp:
             continue
 
-        # run Micro Python
+        # run MicroPython
         output_mupy = run_micropython(pyb, args, test_file)
 
         if output_mupy == b'SKIP\n':
diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index 86ec816e9017862a4ee5f73ac0951375c605b639..aff5b56e7b0927851ad5238d118e279adf5bc40b 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -33,7 +33,7 @@ import time
 import re
 from collections import namedtuple
 
-# Micropython supports syntax of CPython 3.4 with some features from 3.5, and
+# MicroPython supports syntax of CPython 3.4 with some features from 3.5, and
 # such version should be used to test for differences. If your default python3
 # executable is of lower version, you can point MICROPY_CPYTHON3 environment var
 # to the correct executable.
diff --git a/unix/Makefile b/unix/Makefile
index 83c79ac96dcc06995757d0be7916a9fbef19dcd1..8672b4f188bab27a6f67c08b6796c6296180f2f8 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -59,7 +59,7 @@ CFLAGS += -U _FORTIFY_SOURCE
 endif
 
 # On OSX, 'gcc' is a symlink to clang unless a real gcc is installed.
-# The unix port of micropython on OSX must be compiled with clang,
+# The unix port of MicroPython on OSX must be compiled with clang,
 # while cross-compile ports require gcc, so we test here for OSX and
 # if necessary override the value of 'CC' set in py/mkenv.mk
 ifeq ($(UNAME_S),Darwin)
diff --git a/unix/alloc.c b/unix/alloc.c
index 54fc1d3c4aa4aca6a248d0bef5cd8a5f6410a163..ca12d025b64b1504e8b39ca94da5a45fb8c08e92 100644
--- a/unix/alloc.c
+++ b/unix/alloc.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/fdfile.h b/unix/fdfile.h
index 591159deb5b449890ad31bfcc330f674d0df1692..69a9b6be414db7e14678cac90de31c9ba8347aca 100644
--- a/unix/fdfile.h
+++ b/unix/fdfile.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/file.c b/unix/file.c
index a60840c8137eb1c9c518a391cb93a056c267c8ca..f27e23547d38414fb506c73c0052b2e5f8f02d30 100644
--- a/unix/file.c
+++ b/unix/file.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/gccollect.c b/unix/gccollect.c
index 4ec8c2bf549c0bc332bfd0b5f2f3909ef470f69d..02f6fc91a840031e00ed08ef90327265ce8d8985 100644
--- a/unix/gccollect.c
+++ b/unix/gccollect.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/input.c b/unix/input.c
index 4b10350dfc89ee669fa73d7a3537d440a4b4ddb9..7d60b46cc7856bca4c2c70c7cc7472d540c9b556 100644
--- a/unix/input.c
+++ b/unix/input.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/main.c b/unix/main.c
index 633144c86371f64aa31c7cecd2f20d95a91840f7..e861d7f112c08eac8d1e233a6a2cc1309efaaa69 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/modffi.c b/unix/modffi.c
index 8b392f1c38ce4c0f9971ecf7fbb02679aacccc3a..6c5e4f22ee7ad7436cd309ebaa3753ef5dab9eea 100644
--- a/unix/modffi.c
+++ b/unix/modffi.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/modjni.c b/unix/modjni.c
index 896f2f9193e93b1337c237b6af56107b02b7ca1b..540964d446fb82f221114f4e135d01a0fc9d836b 100644
--- a/unix/modjni.c
+++ b/unix/modjni.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/modmachine.c b/unix/modmachine.c
index 33a3b098e4ebbfc020f0a428d39c9a7fd3cefa49..48dddec0ae72dd485fe8ca3e71ebf55a7e9bea1f 100644
--- a/unix/modmachine.c
+++ b/unix/modmachine.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/modos.c b/unix/modos.c
index 8e746c1637a14bc70ce7e6a928249e8f3c1d8649..8b5d5790f33477a45248fa834d010fccd1f1970e 100644
--- a/unix/modos.c
+++ b/unix/modos.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/modsocket.c b/unix/modsocket.c
index c1f88defce05033185f01363be341483bf717832..c612f870d91c6cd7ee1f834c6830504b3e668260 100644
--- a/unix/modsocket.c
+++ b/unix/modsocket.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/modtermios.c b/unix/modtermios.c
index 5e82e772ac78d11bc1f92642e22a50de65e1428a..fe19aac83c6957d47b2c30e5a9c6e2c581e30fd1 100644
--- a/unix/modtermios.c
+++ b/unix/modtermios.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/modtime.c b/unix/modtime.c
index 2a6487df2a4530e888daf9752e82900c06d723be..a74b81f374e898ba80d8cc48170571deeaebeca8 100644
--- a/unix/modtime.c
+++ b/unix/modtime.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/moduselect.c b/unix/moduselect.c
index 37a3a33b28a5d2d8f1c01eec4705630ba6a35ce5..ba1c195ef4b705a6236f69ab2345c8c5294ba575 100644
--- a/unix/moduselect.c
+++ b/unix/moduselect.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h
index 047121fe660da73347b97481a39a74c3bf4d2d0c..b557f3d448861e51ab95ec705049e0830c9a80f2 100644
--- a/unix/mpconfigport.h
+++ b/unix/mpconfigport.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-// options to control how Micro Python is built
+// options to control how MicroPython is built
 
 #define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
 #define MICROPY_PERSISTENT_CODE_LOAD (1)
diff --git a/unix/mpconfigport_fast.h b/unix/mpconfigport_fast.h
index b5be9f334fba206266f44055e646398a27366010..442159eb4f615c4de1444467b0035204b94a6548 100644
--- a/unix/mpconfigport_fast.h
+++ b/unix/mpconfigport_fast.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/mpconfigport_minimal.h b/unix/mpconfigport_minimal.h
index b4d9f814391e0accb82c9f07401e0cc26a66464d..e37605eabf4f19d948b985b4ea81752a4ae73336 100644
--- a/unix/mpconfigport_minimal.h
+++ b/unix/mpconfigport_minimal.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-// options to control how Micro Python is built
+// options to control how MicroPython is built
 
 #define MICROPY_ALLOC_QSTR_CHUNK_INIT (64)
 #define MICROPY_ALLOC_PARSE_RULE_INIT (8)
diff --git a/unix/mphalport.h b/unix/mphalport.h
index cf227872f90404931b2cc62ace37cc05996434aa..ff7a51567c909d230a2ec57f203f50d8eab09e9c 100644
--- a/unix/mphalport.h
+++ b/unix/mphalport.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/qstrdefsport.h b/unix/qstrdefsport.h
index 8ab2db58f537a559d483b72014e1b529a6b3d163..ebfaa6ccab036ffd4cca93dcb6bf3a63d1c9f500 100644
--- a/unix/qstrdefsport.h
+++ b/unix/qstrdefsport.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/unix/unix_mphal.c b/unix/unix_mphal.c
index 800484498e671f4efea49d086a3719c0ecc331cd..02cdbea11fe68c01e1bfd097854ae3d011a764ae 100644
--- a/unix/unix_mphal.c
+++ b/unix/unix_mphal.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/windows/init.c b/windows/init.c
index 669092347837772f4efbc8ff1f31625ee10d4263..09fa10417bbe3fbcb2c5f3b95f53b8578918da7a 100644
--- a/windows/init.c
+++ b/windows/init.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/windows/init.h b/windows/init.h
index 480befef66e0c55cf5a15cd9fbb17eb3a2b9a9ef..c6fddb257ee6cbb2a2bba8c6d8245ae2ec63c8a4 100644
--- a/windows/init.h
+++ b/windows/init.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h
index f2f6cbd323defa21c32e2eceee66f1384344f22b..c4e6ba131ae28a289c09a9bccad27415b5bff4ad 100644
--- a/windows/mpconfigport.h
+++ b/windows/mpconfigport.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-// options to control how Micro Python is built
+// options to control how MicroPython is built
 
 // Linking with GNU readline (MICROPY_USE_READLINE == 2) causes binary to be licensed under GPL
 #ifndef MICROPY_USE_READLINE
diff --git a/windows/msvc/gettimeofday.c b/windows/msvc/gettimeofday.c
index 6d7264ae7e201966320cb691d50b65b5a8c3366f..5f816df7097d08d06be5bfe0fda61e87e5cafca9 100644
--- a/windows/msvc/gettimeofday.c
+++ b/windows/msvc/gettimeofday.c
@@ -1,5 +1,5 @@
 /*
-* This file is part of the Micro Python project, http://micropython.org/
+* This file is part of the MicroPython project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
diff --git a/windows/msvc/sys/time.h b/windows/msvc/sys/time.h
index a36648beb787dbcc8dc35a761363840c531a869e..7c95d409e43737d477da7583dfb44e646f7b801d 100644
--- a/windows/msvc/sys/time.h
+++ b/windows/msvc/sys/time.h
@@ -1,5 +1,5 @@
 /*
-* This file is part of the Micro Python project, http://micropython.org/
+* This file is part of the MicroPython project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
diff --git a/windows/msvc/unistd.h b/windows/msvc/unistd.h
index 87787c3d8dd4f36c87668c51eb89058eab5ae14a..1a1629be4ff16cd54b87861f41572f680d8f3942 100644
--- a/windows/msvc/unistd.h
+++ b/windows/msvc/unistd.h
@@ -1,5 +1,5 @@
 /*
-* This file is part of the Micro Python project, http://micropython.org/
+* This file is part of the MicroPython project, http://micropython.org/
 *
 * The MIT License (MIT)
 *
diff --git a/windows/realpath.c b/windows/realpath.c
index c0ed6b84da52af7e13156c973289735fe44ef731..ac9adf81253f4c78a3638bf93748bfdfce833900 100644
--- a/windows/realpath.c
+++ b/windows/realpath.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/windows/realpath.h b/windows/realpath.h
index c7bb3acd7e335a815e79463a0d4fbe667d4cd745..869fe80fae89d7efffde12af58400976a07011aa 100644
--- a/windows/realpath.h
+++ b/windows/realpath.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/windows/sleep.c b/windows/sleep.c
index b8f0a2e9b06895aab2200de57eb699089a718e3b..6043ec7b7b0ca7997178a2b5f02b7d37ddafeb31 100644
--- a/windows/sleep.c
+++ b/windows/sleep.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/windows/sleep.h b/windows/sleep.h
index 6c0c003321bfcada1fe6d40ba437217d55fa96d0..430ec3a436de0cca8804bb3834d373cd5255da2f 100644
--- a/windows/sleep.h
+++ b/windows/sleep.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/windows/windows_mphal.c b/windows/windows_mphal.c
index a73140e54496ea028d3e076bf35e2131fffb3357..153b0442354343b8bee89db5fecb0de939db9bd8 100644
--- a/windows/windows_mphal.c
+++ b/windows/windows_mphal.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/windows/windows_mphal.h b/windows/windows_mphal.h
index 854e14a7a8a3ea90b1b96d1f2734daf555b6e184..5a93d4e184b9fcfa75f3e1868987db4acb5c54d1 100644
--- a/windows/windows_mphal.h
+++ b/windows/windows_mphal.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/zephyr/machine_pin.c b/zephyr/machine_pin.c
index 38971399cc9544135a9cfa91a7b750f64a1db8c8..c3722926a00193b34d6925476313a447d3bf3831 100644
--- a/zephyr/machine_pin.c
+++ b/zephyr/machine_pin.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
diff --git a/zephyr/modutime.c b/zephyr/modutime.c
index 0c268046a90d4adb49d426ecb82e096e1343fc77..a5d32fe66589df3e9299b059bca32eeb9c50e373 100644
--- a/zephyr/modutime.c
+++ b/zephyr/modutime.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *