diff --git a/bare-arm/mpconfigport.h b/bare-arm/mpconfigport.h
index 97e866bdb737..17f794521813 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 22ad1968d5c8..3f5e72f8bd65 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 32ef5290b45a..b3d766d1e242 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 9f04dbf23758..af15cca3508f 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 9712857453cb..d03efe0240b7 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 e5285d4e465a..5a370f8c99a7 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 e67fe23ae611..9c911a0d08ab 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 7c04c7b05418..8f05bb320e72 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 0d9ab35f8345..cfb8dec21d38 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 b56e3f4ce5af..5461f9180aeb 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 7d16002e46c6..af4c14fa3bad 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 fece70095bc0..5be2c6063c9b 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 dcca70472804..51248e4bf3bc 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 dcaaf57e1bbb..742c9a6f7f6b 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 5c0e9c30fb74..b4848e99e809 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 9953f0e5a287..71e245eeb1c5 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 739745e92a0a..ade516b9e430 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 1ffb98188056..e2299e14604d 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 dac9a9282635..c618279b7e0f 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 0fbf79f0fcfb..afeed85e18a8 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 3bb87e32b9e7..c9d845453e09 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 cce515898e57..739303e193ef 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 81b853b48217..082d940e2f3a 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 46a9b8cb0480..1c3eb6269700 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 068adb70b0c7..72b203fae3f8 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 d23381cafca5..88134857c127 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 37149089f233..321663088d13 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 8b4ab2f1b8db..35ce66e2da2b 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 fd1485607689..5f63d0196752 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 d44f75acae67..249e1be3721d 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 8e1196e8682d..6ec90a2bac18 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 09f4b1e10171..8bc2feacc1ba 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 3e784e9aec10..eb9fc4f21961 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 e1145e4d8f6e..c90c727c2ae8 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 ed8879bf3ee7..51dc5834d4bd 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 148cddf2e2b7..f183715c907c 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 4e17bbae6246..739355360701 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 80c1f24cd8a2..6e7758662e08 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 95ecdbce7d61..8082675718ca 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 48fde67e7e2a..428b00f93e2d 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 b4c18d1530ff..21a9cc63b5ee 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 68d892364f8b..77f5bd9915b6 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 d37d276e8ce1..b806644f55e9 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 696e7650b381..0b4f0ba68ce8 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 50640ee6033d..db04b006bc20 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 9fc97d914025..9c62ffdc4c2b 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 d547f6330ef4..dcc3f0468cea 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 c2a46911740e..d59f113eb5a6 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 6b4b7b1ed8d5..74f0af2b3ca6 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 134bd440e780..14c4cd41998a 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 3fd11ecd60ce..f73de3f5a75b 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 306baea8bacc..5ba6119b29b0 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 084d7caaf20f..af942084d774 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 ced7fef852b1..a7488c5f14e6 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 513e6fa951ce..e98636178dc5 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 3cd384266aff..9edad579a3b8 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 b533b6056e8f..b0fce8870301 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 d25ac6c2b341..1ef9a4a4406b 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 a1b30cd2b079..0af0864ca111 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 06938bdd401c..626357179bb8 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 56440987f6f4..d481242f1fa3 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 76c701ca07de..114e7ac96aaf 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 2844587cb383..275c49435c54 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 78f8c0948021..dcde9aae0913 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 50c3c769da39..09be8c441d99 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 5345ecfda41d..a1c3eb2cbf45 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 2fc56668c3c6..d5f22d70a8fc 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 6b5899e1860e..100b8d33b0e1 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 77a3af2f3d60..c4533d717490 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 26e45a75f158..2f0818f6bacb 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 1e3173b11a98..51c569104181 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 d2d6222ffcff..909dadc8cf40 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 df3a8475c9fb..15d46b705b24 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 166f99d9851f..421f83710060 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 ee7571c26568..6ede57e1e57f 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 8963852f7af5..baee2eeef9fb 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 3c4232b84771..08d43d2837a9 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 0277a754b13f..48e81bc61df9 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 54aaa829cb74..f8e9cdf0cb21 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 60b0b866392a..02cde6b52208 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 1c5509db0516..e178f4c2d078 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 eb25f3be3ea1..d0a71504854a 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 1309201eec76..e6cf851b1a48 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 83e3f8c0751e..fccb95c5211b 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 b45c137c6cc6..7274a79278a8 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 e749d5376f7b..75a0c501ee07 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 4f907e0b1d1a..88f25a2b8dbc 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 55f9a58948d4..61848fd3434d 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 1d1d6de3fb71..913bd70dc983 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 02384f6055ab..a8865c817ea2 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 1b9349f57463..cd5d4932c53b 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 0aee4277111c..5735d8a39018 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 436fb4f6f429..554a50460f85 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 73ec05208279..c8c08695bd22 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 6f75a0a6a970..de65735ba78d 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 5d30f0965635..8d73e6bb17d8 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 984e8b6e8d0e..2ad44318f2f8 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 43b83759ecb3..957198aa0589 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 1aec1f90ee8d..a63d505645f4 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 a621522d0404..283abecafefe 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 9fe8039bc602..e977191ee6ff 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 807d2e18a5e4..d0554096edfa 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 bdeb3bb45378..afb14dfd6a91 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 ab5591bb7db6..bbded43f4b54 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 7610eb33da53..8f301a69c5ad 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 bb48fd507576..a9b6535170e5 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 e3a484783520..3473e5bcd8ce 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 87c87fa97106..5b96aa4b010d 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 88c176803fea..af987cb7f7dc 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 4bc9ac127e14..a48a52c82088 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 4dda3c4426b4..d79191b3e5d5 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 6c0156fc4e58..fb3169267820 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 d2d2e85de17f..9678fd58fdc9 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 13525cc3fa8c..f3beb39399f4 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 567ee83da6e8..e6e417d2bcdf 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 b4c7a364fe26..b85ba267373e 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 2b8b87b5ad5a..a9f25c1954e2 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 be1aa0359c19..86dd8e29c81d 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 6e045c403482..a05d0f2ed05e 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 63c4abb826f8..443e4eda8228 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 24c00ffba17d..ff23c6b0cd1d 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 22907c12a2ea..8fb48f01a611 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 1b37169edde8..c2f2abd0f95c 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 f7a695e179da..ca55243fb4fd 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 a0da86b8df02..877816a0c213 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 529a3975ac4f..ace3b2da22f9 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 f1f883ced08d..691f9842fd87 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 e267b65f9a67..c7e9479571ea 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 81390b4ebbc2..07ea99344608 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 68254c682c73..6da9bd817124 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 d7e27e775b69..984636627cdf 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 33cde50e287a..fabb129cd97f 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 00ac4baf1cea..3f0172c6e966 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 397373fdeb8d..df50fb773796 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 a0941df9fd81..37968d475ae9 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 4fcae057a514..410db2a37384 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 585ab8d8c99c..d2705077852c 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 a9296d8bfb49..148b16d61823 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 7d2f42c54b0d..d86ede790bd9 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 afd16bf674fd..64b2488d1d3a 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 5b35c8660adc..9d254d8cfebe 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 f53fdeaa85fa..00aa9622a802 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 a2ea31cf380a..a324521613d1 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 1e147afa952e..4befc90db0e9 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 06915f25ae57..eb3dc80d4b52 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 1dc486e2e4a2..9b1abeb8f3d3 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 303edfcca040..51dfa5b96347 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 7d0d1cc38bca..d3500b42b3ba 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 69cdb476209b..bc98ba94a748 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 18ac0379f63f..69c49d84c83c 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 47fc9842903e..ce4f8f240476 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 c04adaf6ad5e..cdec130eed66 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 77f059fc70c5..0321b0ee22de 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 f79dd349732d..f45f875449e9 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 343fe86d0599..4a61c5ff5325 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 326d37f8a17c..4a608541e52b 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 910ec1b6e277..ac19fd2f3650 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 797246d13c40..eb04689aa8d8 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 aa102e82172c..4af0c9dfc5f0 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 e4113956b36f..3cd099c67a48 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 557b1e0dad76..35955f2d3ee5 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 ffcca41bfd1e..f5da6cdc8d04 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 9f225345d55e..22fd9cd2c7cd 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 ff22aba90a43..552fdfb34432 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 c5900925f6a6..a302b159052d 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 7e92e4de4196..4360a6af9b18 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 589c481cd558..7070e03ac254 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 6775e8e93de4..aa2a8ec7cc1d 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 a384cca007cb..425bdf2d3971 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 dd3ad02242fb..6a78fbd5ea4e 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 fd34228d10c2..0a00e2e7c2c3 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 2e481bce7774..522eb0aeb078 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 c55d31fe4cd1..69e213e42235 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 be8ac6c15c7a..f671c5b5a74c 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 4a999b9aab74..e38aae8ea390 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 04cc6d83bed3..7b5c60f1ac52 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 4915383f25ce..a637b6e22204 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 4390d0cc7c9f..ba8048f7020c 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 7a8474cac338..e0ce91d9be42 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 d2e05d0b2e41..00052e190a80 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 f6b262d18cb0..3297e83aeba9 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 a58e20e3d750..2b2c904f601c 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 127bf0bf9a80..6770209257b7 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 e914431d325d..07b1dbb4ce02 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 fb7a549264b2..383e6a136b83 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 3099965966e6..43930333d64a 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 c1a4eac5d065..577f65672077 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 99adc809c75e..5ed69ff9b0ca 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 2f10d425a82a..4130e8b26b01 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 9c8d137bb1c2..9a1643b4ddff 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 1eaaf574a279..06d4f84c8e05 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 6993167ac4d4..8cddef6819c5 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 2af886c56bdc..7253b7db6830 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 136695517061..739349c1f5b2 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 0b70538d48c4..6abb1de8c033 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 6e5cc18f44b9..32b3567cc23f 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 435aa096b1ad..a29709107d93 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 f48cb8da4fd4..e679e20926e6 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 50d74f38f562..7f3c90059085 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 cebbd38ea077..71425b85e1e7 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 e6608200169c..860074caaea2 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 356e48bee052..c0cdca9286f1 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 8fbf4daeb23c..1711ae58b12e 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 7ad8f5ad60e6..627a2cbadbfb 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 e610a28d2444..1a1560387ad2 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 24564622ec31..d45e007ebe7c 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 a6a09327871b..353a002865c1 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 d5d135fc113a..c56056a5dd2d 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 46a3922e6dbf..6fa3f9ad2849 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 3c99ef1d8d7c..1daa3333889d 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 0a8f3cd50e98..ee6f8686e014 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 93a0a40ced54..92de01d08b91 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 0afd8ca3b1da..6c02d7cefb5f 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 20bd875b4afe..07462bddcc96 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 4fc8bc506e82..6ce64adfd1fe 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 b09ba08cfe34..eca14a9e44af 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 f58e262e2358..d300a8e5db6a 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 55967cc4c301..e2d0c30aac32 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 c75e5ec04763..46c6906d96bb 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 624e973070ec..63fe392d9e5d 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 c3873e0b6d21..1fb45944034f 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 1238b7011abf..515a95b2e454 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 f88c10004746..22bfda0f9982 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 21479a800fdb..99146bd4c170 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 8c5e7957570c..3cc298d4e900 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 5bc04bb6f9da..e5bc3c2287f0 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 57be6a6cfd4f..890f8b15b68c 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 06a88b95474b..111906412eb5 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 3e12358bbd01..4eb9eb8b84ae 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 e4fbed1e8dcb..f945f3560824 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 23d3008b8f3e..a272ebdb633f 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 faae6516c011..1a9d30f8368f 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 4722aca91465..a9fe04094149 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 2232e1e21460..f67651a7eb1e 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 a655b8a785a0..cb965d8c3235 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 d0e616612106..15edd810f145 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 9f35891243dc..eaba13129357 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 450c98f7650f..fbb35162618f 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 9d6e636b382a..2f39f3a52bbc 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 d61332a206c2..80bf9cd8603f 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 a3c754448fb3..afd6fb22b01b 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 2749ec51c235..29d889629fb1 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 f341306ed7f2..394c23714be2 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 1d184a7dc25c..02c005d2fde1 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 26492aab48e7..0791a8af2c2b 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 45e69c8bcfc6..ba1c506771db 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 740ba9fda920..28b5495a9212 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 111c964fdd62..908c61507e77 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 43bb36b98c84..fc8507c27bfb 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 5bfbe51d5fe3..b5c07dc333e6 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 7ec5c2f41233..fb9d9f02cfb3 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 5d5b83540db2..cd7319bec8fd 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 f9a7d17c34de..49d2ec62ee94 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 8189935d20b5..0934fad058ed 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 8c4e14f49cd8..33b07a9d4414 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 fc85e72bfb58..a596a2fde35f 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 f74bc74a071f..376439b73e0a 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 394c12767715..ea72ae38cc50 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 928be6dab142..358c44d0615a 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 cea10770c8d4..ddad7d3bdf8f 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 6fbed405a79c..3aef8c68e2e4 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 645c441cb2d6..046d32580656 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 d534285865a1..0cf791ff7c4d 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 eaf0e37f47a5..0b05755fb345 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 68670239594f..05c6490fe62c 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 0c0826cf9371..a258915f34ba 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 104b20aab184..52419f3cdc8c 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 6f72d1595456..0183925e3c52 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 80a953fb89f9..1200ba39efdf 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 2f16748a6ce7..e399aac53540 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 fec18825b882..9a1a2b4dd433 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 177118843400..b62029f7c7d2 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 77fd0f4a5057..a5bed731d24f 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 73a3372f0ac6..ba10591226f2 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 143796df489d..3a525f993c8a 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 5aa1610648e4..fdb38f1dec4b 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 4116eb81d473..e2bdcc351e23 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 4581e5e1b1e7..9375b9101a65 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 8e55eb017dad..7e8922e19ac6 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 c2499a270a4b..a7a4136cad18 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 ecc3ae2f51c8..6a0db007e34b 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 0add564cc6ab..fe492885b15a 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 060ee8c0adfe..d22c2fabe6e7 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 e0495495aa74..56a918064530 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 8fe6f960adbb..1a6ae7b8ad6e 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 4d0c1b1d9b27..e3b6a57c794c 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 32db640dc122..0752ee109838 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 0bccf8427f5e..bb2b084ed795 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 4c42ee0cc993..aa542ca7bf29 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 b2bfc6df91eb..42679a78fb20 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 1843e7339eae..0bcd82f4f629 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 84c0e1427eed..ff8da0ab138c 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 018609903455..5d1868153818 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 0b5fd7cc097d..401ae313cd88 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 c6f872038d7e..eddb007d5eea 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 f99c9705d5d0..19487a65ae8b 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 bb120e7757a5..c7fc83d048ca 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 dd9789e34851..352a6dc315cc 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 f41bd2e232b9..8a00f6c6f7eb 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 4cdf3b3f1024..46b31ecca7a5 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 ebec027e806b..87e537af74ec 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 0e6eaf03db3e..512a6e313ae8 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 42b15632929c..fc35f7775668 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 6485e2ab7757..dd59e29c8819 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 6ec5584643b2..c90e6b34339a 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 ca76e9496d2d..79511969b737 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 55f57be8e462..c1967bf43090 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 6152022b76ed..9047e78ca698 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 7c40e9bf99ba..86001281390a 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 243aa08c3e25..cdb3a9bcd710 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 93192c0fee1d..f487f52a92fe 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 e43b67e73d11..df6275d652ce 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 d8b11ca3a99a..55fb62175811 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 70023557f460..24a68c2a22b6 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 0eae8942cedd..846790b9be99 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 e374be0e5065..bebb3a16193e 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 c5b5bf3522be..688e70a3cd5f 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 f27277760fa9..8b0cc9cb017f 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 d7223dedc3f0..937fb6f36eab 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 2cb32a8d4551..1b64a51a6a11 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 b890c3d98716..52ca6406bc89 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 2b0d76d301a0..adb3d79ab733 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 83ef7e596fd1..87b2af526e71 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 f77222715ae7..f102fd0f2c22 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 eda076e82902..6affe3973b10 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 44758e11bce1..d6db8e83d876 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 8d44b50edf48..2cf58639ea01 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 cdf9fa0d1a6c..7368193cf881 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 be4f6ed25129..c0d9bd97da21 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 4b9895fc5599..030a814dd6d1 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 fc9348181828..f1b05d1e2827 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 566c2db07f5a..056c590cda7e 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 @@ int main(void) {
     // 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 09a80ef3cbc7..6b4949a0de60 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 83e4255d5a50..ecda94da4139 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 957d74e6ece1..a04a2d260ccf 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 4752cdc0bc73..eb7eb8443850 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 7322c6a5bab9..5dc28e13250f 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 eabbf08e4a9c..2084c0aa0e38 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 ece6019fbfe7..77a60c0cbc60 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 081a322ae20e..e1da53a4b351 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 58c43a55ebf3..fe13f80c0695 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 7b3906f250ea..00ea12f4603d 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 b64e61386d12..6a9eb0d794d0 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 f30474e1f567..0dce0c1c08a3 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 1ec4bd6b87a9..90de79e5ceb5 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 d6a2ef4242a4..6cf3b1b8328a 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 fac19ee97b0f..726da54dd6cf 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 4e892da96334..b575109b8968 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 1d83f43bdd53..31220c5a42b2 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 a5a9874d1c15..c0c5e9aeb559 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 f022f3a6779e..43e49fe72e9c 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 755684570d66..4efc56d5c8f3 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 f382fa6b6351..09ab2aedff10 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 5260e0a50071..dfa7158a4c5b 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 d595f0f1afdc..8c698fc2f7d8 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 e4bcbc30e5ae..fa39587a8e75 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 18fd493d52fb..c602a07da5ec 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 b710fc3a7c3a..574fed07394e 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 e6752fdd18e3..eda109a7ef2a 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 357b6d79d7a2..2111da1ae130 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 d6ed1b2b9bb3..b498dee8dae3 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 1931cd6079b6..6da1ba95c6d6 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 0ecb5715a23f..291e09a9aedc 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 a63bd3c5701e..7fc16b14833d 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 4eac583e2a05..c07d0fabce34 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 524afae40eed..c1def50c29da 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 6513f95d374f..570558775b78 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 72e461f2f17b..775accc3d42a 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 b4ff40e797d9..ddff8b9f2a80 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 749530954238..e96b25b5f45b 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 f70dea142825..9bf351f499e2 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 @@ STATIC mp_obj_t pyb_usb_mode(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
 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 e04fe70d7753..d39f49a6ccad 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 6f9a1e8a3f83..811a28928052 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 e2bd6c949fbd..d39144851ffc 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 b69ba52c2f62..34ebe27b9a09 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 1ad960b46886..09e1608c84b7 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 f48e364e1fea..05cbbe5b179f 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 a4bc8004afcc..6cc40d2d623a 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 ec03c860a418..08882bb1aec1 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 e0edf13702d8..d61073f4d5f2 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 63cd440d41e4..a7721ad779a1 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 9fbe6109d655..d96e3c2813bf 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 28992881be72..3c031bf6dd87 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 ad627358b632..84fae8312b9d 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 3b3916b943c5..ebe4bed6bf8d 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 c7ac8be1ff47..c043e4399612 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 41bbeb5d9356..3edaa28a06ec 100644
--- a/teensy/main.c
+++ b/teensy/main.c
@@ -266,7 +266,7 @@ int main(void) {
     // 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 9f601e327b6c..deb1f32f971d 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 de30924d9eb3..69cd69d532b5 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 45bcc2b8fbb0..bc560d85e0ca 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 89095b0764f0..75c2e654e2c5 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 b4c0a4d5b62c..3dd2c5051984 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 48f5938a582f..7f7d1d119a7d 100644
--- a/tests/basics/bytearray_slice_assign.py
+++ b/tests/basics/bytearray_slice_assign.py
@@ -4,7 +4,7 @@
     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 1ad1ef27c176..885615717232 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 fa50f282e14a..9f7c1e44ef60 100644
--- a/tests/io/stringio1.py
+++ b/tests/io/stringio1.py
@@ -36,7 +36,7 @@
 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 1e5e7804bef2..d48b4b7ec526 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 bd4a1363cba6..f9c26283dc8d 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 86ec816e9017..aff5b56e7b09 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -33,7 +33,7 @@
 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 83c79ac96dcc..8672b4f188ba 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 54fc1d3c4aa4..ca12d025b64b 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 591159deb5b4..69a9b6be414d 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 a60840c8137e..f27e23547d38 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 4ec8c2bf549c..02f6fc91a840 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 4b10350dfc89..7d60b46cc785 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 633144c86371..e861d7f112c0 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 8b392f1c38ce..6c5e4f22ee7a 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 896f2f9193e9..540964d446fb 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 33a3b098e4eb..48dddec0ae72 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 8e746c1637a1..8b5d5790f334 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 c1f88defce05..c612f870d91c 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 5e82e772ac78..fe19aac83c69 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 2a6487df2a45..a74b81f374e8 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 37a3a33b28a5..ba1c195ef4b7 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 047121fe660d..b557f3d44886 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 b5be9f334fba..442159eb4f61 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 b4d9f814391e..e37605eabf4f 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 cf227872f904..ff7a51567c90 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 8ab2db58f537..ebfaa6ccab03 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 800484498e67..02cdbea11fe6 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 669092347837..09fa10417bbe 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 480befef66e0..c6fddb257ee6 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 f2f6cbd323de..c4e6ba131ae2 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 6d7264ae7e20..5f816df7097d 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 a36648beb787..7c95d409e437 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 87787c3d8dd4..1a1629be4ff1 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 c0ed6b84da52..ac9adf81253f 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 c7bb3acd7e33..869fe80fae89 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 b8f0a2e9b068..6043ec7b7b0c 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 6c0c003321bf..430ec3a436de 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 a73140e54496..153b04423543 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 854e14a7a8a3..5a93d4e184b9 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 38971399cc95..c3722926a001 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 0c268046a90d..a5d32fe66589 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)
  *