all: Rename mp_umodule*, mp_module_umodule* to remove the "u" prefix.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>

22 files changed, 150 insertions, 150 deletions

diff --git a/extmod/misc.h b/extmod/misc.h
index a9392aa10..80e5b59a0 100644
--- a/extmod/misc.h
+++ b/extmod/misc.h
@@ -32,17 +32,17 @@
 #include <stddef.h>
 #include "py/runtime.h"
 
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_dupterm_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_dupterm_obj);
 
 #if MICROPY_PY_OS_DUPTERM
-bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream);
-void mp_uos_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached);
-uintptr_t mp_uos_dupterm_poll(uintptr_t poll_flags);
-int mp_uos_dupterm_rx_chr(void);
-void mp_uos_dupterm_tx_strn(const char *str, size_t len);
-void mp_uos_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc);
+bool mp_os_dupterm_is_builtin_stream(mp_const_obj_t stream);
+void mp_os_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached);
+uintptr_t mp_os_dupterm_poll(uintptr_t poll_flags);
+int mp_os_dupterm_rx_chr(void);
+void mp_os_dupterm_tx_strn(const char *str, size_t len);
+void mp_os_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc);
 #else
-#define mp_uos_dupterm_tx_strn(s, l)
+#define mp_os_dupterm_tx_strn(s, l)
 #endif
 
 #endif // MICROPY_INCLUDED_EXTMOD_MISC_H
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 35ba745e3..628c643a5 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -999,12 +999,12 @@ STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_bluetooth_globals, mp_module_bluetooth_globals_table);
 
-const mp_obj_module_t mp_module_ubluetooth = {
+const mp_obj_module_t mp_module_bluetooth = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_bluetooth_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_bluetooth, mp_module_ubluetooth);
+MP_REGISTER_MODULE(MP_QSTR_bluetooth, mp_module_bluetooth);
 
 // Helpers
 
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index 85205bc3d..bfb8195d9 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -198,11 +198,11 @@ STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_binascii_globals, mp_module_binascii_globals_table);
 
-const mp_obj_module_t mp_module_ubinascii = {
+const mp_obj_module_t mp_module_binascii = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_binascii_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_binascii, mp_module_ubinascii);
+MP_REGISTER_MODULE(MP_QSTR_binascii, mp_module_binascii);
 
 #endif // MICROPY_PY_UBINASCII
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index 730ae4c6f..e727f5054 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -356,7 +356,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &ucryptolib_aes_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t mp_module_ucryptolib_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_cryptolib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cryptolib) },
     { MP_ROM_QSTR(MP_QSTR_aes), MP_ROM_PTR(&ucryptolib_aes_type) },
     #if MICROPY_PY_UCRYPTOLIB_CONSTS
@@ -368,13 +368,13 @@ STATIC const mp_rom_map_elem_t mp_module_ucryptolib_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_ucryptolib_globals, mp_module_ucryptolib_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_cryptolib_globals, mp_module_cryptolib_globals_table);
 
-const mp_obj_module_t mp_module_ucryptolib = {
+const mp_obj_module_t mp_module_cryptolib = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_ucryptolib_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_cryptolib_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_cryptolib, mp_module_ucryptolib);
+MP_REGISTER_MODULE(MP_QSTR_cryptolib, mp_module_cryptolib);
 
 #endif // MICROPY_PY_UCRYPTOLIB
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index addf09476..ef1a29fc7 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -354,7 +354,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     );
 #endif // MICROPY_PY_UHASHLIB_MD5
 
-STATIC const mp_rom_map_elem_t mp_module_uhashlib_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_hashlib) },
     #if MICROPY_PY_UHASHLIB_SHA256
     { MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&uhashlib_sha256_type) },
@@ -367,13 +367,13 @@ STATIC const mp_rom_map_elem_t mp_module_uhashlib_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_uhashlib_globals, mp_module_uhashlib_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals_table);
 
-const mp_obj_module_t mp_module_uhashlib = {
+const mp_obj_module_t mp_module_hashlib = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_uhashlib_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_hashlib_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_hashlib, mp_module_uhashlib);
+MP_REGISTER_MODULE(MP_QSTR_hashlib, mp_module_hashlib);
 
 #endif // MICROPY_PY_UHASHLIB
diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c
index 9c3df6525..fb6cb8118 100644
--- a/extmod/moduheapq.c
+++ b/extmod/moduheapq.c
@@ -104,21 +104,21 @@ STATIC mp_obj_t mod_uheapq_heapify(mp_obj_t heap_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_uheapq_heapify_obj, mod_uheapq_heapify);
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t mp_module_uheapq_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_heapq_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_heapq) },
     { MP_ROM_QSTR(MP_QSTR_heappush), MP_ROM_PTR(&mod_uheapq_heappush_obj) },
     { MP_ROM_QSTR(MP_QSTR_heappop), MP_ROM_PTR(&mod_uheapq_heappop_obj) },
     { MP_ROM_QSTR(MP_QSTR_heapify), MP_ROM_PTR(&mod_uheapq_heapify_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_uheapq_globals, mp_module_uheapq_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_heapq_globals, mp_module_heapq_globals_table);
 
-const mp_obj_module_t mp_module_uheapq = {
+const mp_obj_module_t mp_module_heapq = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_uheapq_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_heapq_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_heapq, mp_module_uheapq);
+MP_REGISTER_MODULE(MP_QSTR_heapq, mp_module_heapq);
 #endif
 
 #endif // MICROPY_PY_UHEAPQ
diff --git a/extmod/modujson.c b/extmod/modujson.c
index 106595aab..44dd316b6 100644
--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@@ -366,7 +366,7 @@ STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_loads_obj, mod_ujson_loads);
 
-STATIC const mp_rom_map_elem_t mp_module_ujson_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_json_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_json) },
     { MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&mod_ujson_dump_obj) },
     { MP_ROM_QSTR(MP_QSTR_dumps), MP_ROM_PTR(&mod_ujson_dumps_obj) },
@@ -374,13 +374,13 @@ STATIC const mp_rom_map_elem_t mp_module_ujson_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_loads), MP_ROM_PTR(&mod_ujson_loads_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_ujson_globals, mp_module_ujson_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_json_globals, mp_module_json_globals_table);
 
-const mp_obj_module_t mp_module_ujson = {
+const mp_obj_module_t mp_module_json = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_ujson_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_json_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_json, mp_module_ujson);
+MP_REGISTER_MODULE(MP_QSTR_json, mp_module_json);
 
 #endif // MICROPY_PY_UJSON
diff --git a/extmod/moduos.c b/extmod/moduos.c
index a7d15ef96..8c40f4537 100644
--- a/extmod/moduos.c
+++ b/extmod/moduos.c
@@ -65,7 +65,7 @@
 #if MICROPY_PY_UOS_SYNC
 // sync()
 // Sync all filesystems.
-STATIC mp_obj_t mp_uos_sync(void) {
+STATIC mp_obj_t mp_os_sync(void) {
     #if MICROPY_VFS_FAT
     for (mp_vfs_mount_t *vfs = MP_STATE_VM(vfs_mount_table); vfs != NULL; vfs = vfs->next) {
         // this assumes that vfs->obj is fs_user_mount_t with block device functions
@@ -74,7 +74,7 @@ STATIC mp_obj_t mp_uos_sync(void) {
     #endif
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_sync_obj, mp_uos_sync);
+MP_DEFINE_CONST_FUN_OBJ_0(mp_os_sync_obj, mp_os_sync);
 #endif
 
 #if MICROPY_PY_UOS_UNAME
@@ -85,39 +85,39 @@ MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_sync_obj, mp_uos_sync);
 #define CONST_RELEASE const
 #endif
 
-STATIC const qstr mp_uos_uname_info_fields[] = {
+STATIC const qstr mp_os_uname_info_fields[] = {
     MP_QSTR_sysname,
     MP_QSTR_nodename,
     MP_QSTR_release,
     MP_QSTR_version,
     MP_QSTR_machine
 };
-STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC CONST_RELEASE MP_DEFINE_STR_OBJ(mp_uos_uname_info_release_obj, MICROPY_VERSION_STRING);
-STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE MICROPY_BUILD_TYPE_PAREN);
-STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
+STATIC const MP_DEFINE_STR_OBJ(mp_os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(mp_os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC CONST_RELEASE MP_DEFINE_STR_OBJ(mp_os_uname_info_release_obj, MICROPY_VERSION_STRING);
+STATIC const MP_DEFINE_STR_OBJ(mp_os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE MICROPY_BUILD_TYPE_PAREN);
+STATIC const MP_DEFINE_STR_OBJ(mp_os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
 
 STATIC MP_DEFINE_ATTRTUPLE(
-    mp_uos_uname_info_obj,
-    mp_uos_uname_info_fields,
+    mp_os_uname_info_obj,
+    mp_os_uname_info_fields,
     5,
-    MP_ROM_PTR(&mp_uos_uname_info_sysname_obj),
-    MP_ROM_PTR(&mp_uos_uname_info_nodename_obj),
-    MP_ROM_PTR(&mp_uos_uname_info_release_obj),
-    MP_ROM_PTR(&mp_uos_uname_info_version_obj),
-    MP_ROM_PTR(&mp_uos_uname_info_machine_obj)
+    MP_ROM_PTR(&mp_os_uname_info_sysname_obj),
+    MP_ROM_PTR(&mp_os_uname_info_nodename_obj),
+    MP_ROM_PTR(&mp_os_uname_info_release_obj),
+    MP_ROM_PTR(&mp_os_uname_info_version_obj),
+    MP_ROM_PTR(&mp_os_uname_info_machine_obj)
     );
 
-STATIC mp_obj_t mp_uos_uname(void) {
+STATIC mp_obj_t mp_os_uname(void) {
     #if MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC
-    const char *release = mp_uos_uname_release();
-    mp_uos_uname_info_release_obj.len = strlen(release);
-    mp_uos_uname_info_release_obj.data = (const byte *)release;
+    const char *release = mp_os_uname_release();
+    mp_os_uname_info_release_obj.len = strlen(release);
+    mp_os_uname_info_release_obj.data = (const byte *)release;
     #endif
-    return MP_OBJ_FROM_PTR(&mp_uos_uname_info_obj);
+    return MP_OBJ_FROM_PTR(&mp_os_uname_info_obj);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_uname_obj, mp_uos_uname);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_os_uname_obj, mp_os_uname);
 
 #endif
 
@@ -125,24 +125,24 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) },
 
     #if MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV
-    { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mp_uos_getenv_obj) },
-    { MP_ROM_QSTR(MP_QSTR_putenv), MP_ROM_PTR(&mp_uos_putenv_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unsetenv), MP_ROM_PTR(&mp_uos_unsetenv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mp_os_getenv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_putenv), MP_ROM_PTR(&mp_os_putenv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_unsetenv), MP_ROM_PTR(&mp_os_unsetenv_obj) },
     #endif
     #if MICROPY_PY_UOS_SEP
     { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) },
     #endif
     #if MICROPY_PY_UOS_SYNC
-    { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mp_uos_sync_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mp_os_sync_obj) },
     #endif
     #if MICROPY_PY_UOS_SYSTEM
-    { MP_ROM_QSTR(MP_QSTR_system), MP_ROM_PTR(&mp_uos_system_obj) },
+    { MP_ROM_QSTR(MP_QSTR_system), MP_ROM_PTR(&mp_os_system_obj) },
     #endif
     #if MICROPY_PY_UOS_UNAME
-    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&mp_uos_uname_obj) },
+    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&mp_os_uname_obj) },
     #endif
     #if MICROPY_PY_OS_URANDOM
-    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_uos_urandom_obj) },
+    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_os_urandom_obj) },
     #endif
 
     #if MICROPY_VFS
@@ -161,13 +161,13 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     // The following are MicroPython extensions.
 
     #if MICROPY_PY_OS_DUPTERM
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_os_dupterm_obj) },
     #endif
     #if MICROPY_PY_UOS_DUPTERM_NOTIFY
-    { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&mp_uos_dupterm_notify_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&mp_os_dupterm_notify_obj) },
     #endif
     #if MICROPY_PY_UOS_ERRNO
-    { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_uos_errno_obj) },
+    { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_os_errno_obj) },
     #endif
 
     #if MICROPY_VFS
@@ -190,11 +190,11 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
 
-const mp_obj_module_t mp_module_uos = {
+const mp_obj_module_t mp_module_os = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&os_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_os, mp_module_uos);
+MP_REGISTER_MODULE(MP_QSTR_os, mp_module_os);
 
 #endif // MICROPY_PY_UOS
diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index 079e27536..791ae8344 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -70,11 +70,11 @@ STATIC const mp_rom_map_elem_t modplatform_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(modplatform_globals, modplatform_globals_table);
 
-const mp_obj_module_t mp_module_uplatform = {
+const mp_obj_module_t mp_module_platform = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&modplatform_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_platform, mp_module_uplatform);
+MP_REGISTER_MODULE(MP_QSTR_platform, mp_module_platform);
 
 #endif // MICROPY_PY_UPLATFORM
diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index 6b59c0ae3..86e3a872c 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -230,7 +230,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_urandom___init___obj, mod_urandom___init__)
 #endif
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t mp_module_urandom_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_random_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_random) },
     #if SEED_ON_IMPORT
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&mod_urandom___init___obj) },
@@ -248,14 +248,14 @@ STATIC const mp_rom_map_elem_t mp_module_urandom_globals_table[] = {
     #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_urandom_globals, mp_module_urandom_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_random_globals, mp_module_random_globals_table);
 
-const mp_obj_module_t mp_module_urandom = {
+const mp_obj_module_t mp_module_random = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_urandom_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_random_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_random, mp_module_urandom);
+MP_REGISTER_MODULE(MP_QSTR_random, mp_module_random);
 #endif
 
 #endif // MICROPY_PY_URANDOM
diff --git a/extmod/modure.c b/extmod/modure.c
index c27125bf1..4798f07b0 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -465,12 +465,12 @@ STATIC const mp_rom_map_elem_t mp_module_re_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_re_globals, mp_module_re_globals_table);
 
-const mp_obj_module_t mp_module_ure = {
+const mp_obj_module_t mp_module_re = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_re_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_re, mp_module_ure);
+MP_REGISTER_MODULE(MP_QSTR_re, mp_module_re);
 #endif
 
 // Source files #include'd here to make sure they're compiled in
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 4df0f4d56..5bb5f4f48 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -368,11 +368,11 @@ STATIC const mp_rom_map_elem_t mp_module_select_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_select_globals, mp_module_select_globals_table);
 
-const mp_obj_module_t mp_module_uselect = {
+const mp_obj_module_t mp_module_select = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_select_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_select, mp_module_uselect);
+MP_REGISTER_MODULE(MP_QSTR_select, mp_module_select);
 
 #endif // MICROPY_PY_USELECT
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 6d14ebdfb..6c2b4ff06 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -615,7 +615,7 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_usocket_getaddrinfo_obj, 2, 6, mod_usocket_getaddrinfo);
 
-STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_socket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socket) },
 
     { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socket_type) },
@@ -646,13 +646,13 @@ STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
     */
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_socket_globals, mp_module_socket_globals_table);
 
-const mp_obj_module_t mp_module_usocket = {
+const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_usocket_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_usocket);
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket);
 
 #endif // MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index 393a945fa..6e490a594 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -352,11 +352,11 @@ STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_ssl_globals, mp_module_ssl_globals_table);
 
-const mp_obj_module_t mp_module_ussl = {
+const mp_obj_module_t mp_module_ssl = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ussl);
+MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl);
 
 #endif // MICROPY_PY_USSL && MICROPY_SSL_AXTLS
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index c12c943d8..117a06b6b 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -502,11 +502,11 @@ STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_ssl_globals, mp_module_ssl_globals_table);
 
-const mp_obj_module_t mp_module_ussl = {
+const mp_obj_module_t mp_module_ssl = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ussl);
+MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl);
 
 #endif // MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS
diff --git a/extmod/modutime.c b/extmod/modutime.c
index 5d8148f98..9731f5ff0 100644
--- a/extmod/modutime.c
+++ b/extmod/modutime.c
@@ -55,7 +55,7 @@
 STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0 || args[0] == mp_const_none) {
         // Get current date and time.
-        return mp_utime_localtime_get();
+        return mp_time_localtime_get();
     } else {
         // Convert given seconds to tuple.
         mp_int_t seconds = mp_obj_get_int(args[0]);
@@ -74,7 +74,7 @@ STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_tuple(8, tuple);
     }
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_utime_localtime_obj, 0, 1, time_localtime);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_time_localtime_obj, 0, 1, time_localtime);
 
 // mktime()
 // This is the inverse function of localtime. Its argument is a full 8-tuple
@@ -94,7 +94,7 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
         mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
         mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_mktime_obj, time_mktime);
+MP_DEFINE_CONST_FUN_OBJ_1(mp_time_mktime_obj, time_mktime);
 
 #endif // MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME
 
@@ -103,22 +103,22 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_mktime_obj, time_mktime);
 // time()
 // Return the number of seconds since the Epoch.
 STATIC mp_obj_t time_time(void) {
-    return mp_utime_time_get();
+    return mp_time_time_get();
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_utime_time_obj, time_time);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_time_time_obj, time_time);
 
 // time_ns()
 // Returns the number of nanoseconds since the Epoch, as an integer.
 STATIC mp_obj_t time_time_ns(void) {
     return mp_obj_new_int_from_ull(mp_hal_time_ns());
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mp_utime_time_ns_obj, time_time_ns);
+MP_DEFINE_CONST_FUN_OBJ_0(mp_time_time_ns_obj, time_time_ns);
 
 #endif // MICROPY_PY_UTIME_TIME_TIME_NS
 
 STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
     #ifdef MICROPY_PY_UTIME_CUSTOM_SLEEP
-    mp_utime_sleep(seconds_o);
+    mp_time_sleep(seconds_o);
     #else
     #if MICROPY_PY_BUILTINS_FLOAT
     mp_hal_delay_ms((mp_uint_t)(1000 * mp_obj_get_float(seconds_o)));
@@ -128,7 +128,7 @@ STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
     #endif
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_sleep_obj, time_sleep);
+MP_DEFINE_CONST_FUN_OBJ_1(mp_time_sleep_obj, time_sleep);
 
 STATIC mp_obj_t time_sleep_ms(mp_obj_t arg) {
     mp_int_t ms = mp_obj_get_int(arg);
@@ -137,7 +137,7 @@ STATIC mp_obj_t time_sleep_ms(mp_obj_t arg) {
     }
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_sleep_ms_obj, time_sleep_ms);
+MP_DEFINE_CONST_FUN_OBJ_1(mp_time_sleep_ms_obj, time_sleep_ms);
 
 STATIC mp_obj_t time_sleep_us(mp_obj_t arg) {
     mp_int_t us = mp_obj_get_int(arg);
@@ -146,22 +146,22 @@ STATIC mp_obj_t time_sleep_us(mp_obj_t arg) {
     }
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_sleep_us_obj, time_sleep_us);
+MP_DEFINE_CONST_FUN_OBJ_1(mp_time_sleep_us_obj, time_sleep_us);
 
 STATIC mp_obj_t time_ticks_ms(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mp_utime_ticks_ms_obj, time_ticks_ms);
+MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_ms_obj, time_ticks_ms);
 
 STATIC mp_obj_t time_ticks_us(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_us() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mp_utime_ticks_us_obj, time_ticks_us);
+MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_us_obj, time_ticks_us);
 
 STATIC mp_obj_t time_ticks_cpu(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_cpu() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mp_utime_ticks_cpu_obj, time_ticks_cpu);
+MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_cpu_obj, time_ticks_cpu);
 
 STATIC mp_obj_t time_ticks_diff(mp_obj_t end_in, mp_obj_t start_in) {
     // we assume that the arguments come from ticks_xx so are small ints
@@ -173,7 +173,7 @@ STATIC mp_obj_t time_ticks_diff(mp_obj_t end_in, mp_obj_t start_in) {
         - MICROPY_PY_UTIME_TICKS_PERIOD / 2;
     return MP_OBJ_NEW_SMALL_INT(diff);
 }
-MP_DEFINE_CONST_FUN_OBJ_2(mp_utime_ticks_diff_obj, time_ticks_diff);
+MP_DEFINE_CONST_FUN_OBJ_2(mp_time_ticks_diff_obj, time_ticks_diff);
 
 STATIC mp_obj_t time_ticks_add(mp_obj_t ticks_in, mp_obj_t delta_in) {
     // we assume that first argument come from ticks_xx so is small int
@@ -194,31 +194,31 @@ STATIC mp_obj_t time_ticks_add(mp_obj_t ticks_in, mp_obj_t delta_in) {
 
     return MP_OBJ_NEW_SMALL_INT((ticks + delta) & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
 }
-MP_DEFINE_CONST_FUN_OBJ_2(mp_utime_ticks_add_obj, time_ticks_add);
+MP_DEFINE_CONST_FUN_OBJ_2(mp_time_ticks_add_obj, time_ticks_add);
 
 STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_time) },
 
     #if MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME
-    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&mp_utime_localtime_obj) },
-    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&mp_utime_localtime_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&mp_utime_mktime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&mp_time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&mp_time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&mp_time_mktime_obj) },
     #endif
 
     #if MICROPY_PY_UTIME_TIME_TIME_NS
-    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_utime_time_obj) },
-    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_time_time_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_time_time_ns_obj) },
     #endif
 
-    { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_time_sleep_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_time_sleep_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_time_sleep_us_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_time_ticks_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_time_ticks_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_time_ticks_cpu_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_time_ticks_add_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_time_ticks_diff_obj) },
 
     #ifdef MICROPY_PY_UTIME_EXTRA_GLOBALS
     MICROPY_PY_UTIME_EXTRA_GLOBALS
@@ -226,11 +226,11 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table);
 
-const mp_obj_module_t mp_module_utime = {
+const mp_obj_module_t mp_module_time = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_time_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_time, mp_module_utime);
+MP_REGISTER_MODULE(MP_QSTR_time, mp_module_time);
 
 #endif // MICROPY_PY_UTIME
diff --git a/extmod/modutime.h b/extmod/modutime.h
index 2e10afb89..f5ea6b55b 100644
--- a/extmod/modutime.h
+++ b/extmod/modutime.h
@@ -29,15 +29,15 @@
 
 #include "py/obj.h"
 
-MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_mktime_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_ms_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_us_obj);
-MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_ms_obj);
-MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_us_obj);
-MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_cpu_obj);
-MP_DECLARE_CONST_FUN_OBJ_2(mp_utime_ticks_diff_obj);
-MP_DECLARE_CONST_FUN_OBJ_2(mp_utime_ticks_add_obj);
-MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_time_ns_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mp_time_mktime_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mp_time_sleep_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mp_time_sleep_ms_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mp_time_sleep_us_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_time_ticks_ms_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_time_ticks_us_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_time_ticks_cpu_obj);
+MP_DECLARE_CONST_FUN_OBJ_2(mp_time_ticks_diff_obj);
+MP_DECLARE_CONST_FUN_OBJ_2(mp_time_ticks_add_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_time_time_ns_obj);
 
 #endif // MICROPY_INCLUDED_EXTMOD_MODUTIME_H
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index 4aa572934..8187fa2b2 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -218,18 +218,18 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &utimeq_locals_dict
     );
 
-STATIC const mp_rom_map_elem_t mp_module_utimeq_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_timeq_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_timeq) },
     { MP_ROM_QSTR(MP_QSTR_timeq), MP_ROM_PTR(&utimeq_type) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_utimeq_globals, mp_module_utimeq_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_timeq_globals, mp_module_timeq_globals_table);
 
-const mp_obj_module_t mp_module_utimeq = {
+const mp_obj_module_t mp_module_timeq = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_utimeq_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_timeq_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_timeq, mp_module_utimeq);
+MP_REGISTER_MODULE(MP_QSTR_timeq, mp_module_timeq);
 
 #endif // MICROPY_PY_UTIMEQ
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index ca7152bb1..301f72fba 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -306,11 +306,11 @@ STATIC const mp_rom_map_elem_t uwebsocket_module_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(uwebsocket_module_globals, uwebsocket_module_globals_table);
 
-const mp_obj_module_t mp_module_uwebsocket = {
+const mp_obj_module_t mp_module_websocket = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&uwebsocket_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_websocket, mp_module_uwebsocket);
+MP_REGISTER_MODULE(MP_QSTR_websocket, mp_module_websocket);
 
 #endif // MICROPY_PY_UWEBSOCKET
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index f41ca2b01..504c637c3 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -210,21 +210,21 @@ error:
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_uzlib_decompress_obj, 1, 3, mod_uzlib_decompress);
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_rom_map_elem_t mp_module_uzlib_globals_table[] = {
+STATIC const mp_rom_map_elem_t mp_module_zlib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zlib) },
     { MP_ROM_QSTR(MP_QSTR_decompress), MP_ROM_PTR(&mod_uzlib_decompress_obj) },
     { MP_ROM_QSTR(MP_QSTR_DecompIO), MP_ROM_PTR(&decompio_type) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(mp_module_uzlib_globals, mp_module_uzlib_globals_table);
+STATIC MP_DEFINE_CONST_DICT(mp_module_zlib_globals, mp_module_zlib_globals_table);
 
-const mp_obj_module_t mp_module_uzlib = {
+const mp_obj_module_t mp_module_zlib = {
     .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_uzlib_globals,
+    .globals = (mp_obj_dict_t *)&mp_module_zlib_globals,
 };
 
 
-MP_REGISTER_MODULE(MP_QSTR_zlib, mp_module_uzlib);
+MP_REGISTER_MODULE(MP_QSTR_zlib, mp_module_zlib);
 #endif
 
 // Source files #include'd here to make sure they're compiled in
diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
index 981d05a63..c72b365be 100644
--- a/extmod/uos_dupterm.c
+++ b/extmod/uos_dupterm.c
@@ -38,7 +38,7 @@
 
 #include "shared/runtime/interrupt_char.h"
 
-void mp_uos_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc) {
+void mp_os_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc) {
     mp_obj_t term = MP_STATE_VM(dupterm_objs[dupterm_idx]);
     MP_STATE_VM(dupterm_objs[dupterm_idx]) = MP_OBJ_NULL;
     mp_printf(&mp_plat_print, msg);
@@ -54,7 +54,7 @@ void mp_uos_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc) {
     }
 }
 
-uintptr_t mp_uos_dupterm_poll(uintptr_t poll_flags) {
+uintptr_t mp_os_dupterm_poll(uintptr_t poll_flags) {
     uintptr_t poll_flags_out = 0;
 
     for (size_t idx = 0; idx < MICROPY_PY_OS_DUPTERM; ++idx) {
@@ -67,7 +67,7 @@ uintptr_t mp_uos_dupterm_poll(uintptr_t poll_flags) {
         mp_uint_t ret = 0;
         const mp_stream_p_t *stream_p = mp_get_stream(s);
         #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
-        if (mp_uos_dupterm_is_builtin_stream(s)) {
+        if (mp_os_dupterm_is_builtin_stream(s)) {
             ret = stream_p->ioctl(s, MP_STREAM_POLL, poll_flags, &errcode);
         } else
         #endif
@@ -93,14 +93,14 @@ uintptr_t mp_uos_dupterm_poll(uintptr_t poll_flags) {
     return poll_flags_out;
 }
 
-int mp_uos_dupterm_rx_chr(void) {
+int mp_os_dupterm_rx_chr(void) {
     for (size_t idx = 0; idx < MICROPY_PY_OS_DUPTERM; ++idx) {
         if (MP_STATE_VM(dupterm_objs[idx]) == MP_OBJ_NULL) {
             continue;
         }
 
         #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
-        if (mp_uos_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) {
+        if (mp_os_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) {
             byte buf[1];
             int errcode = 0;
             const mp_stream_p_t *stream_p = mp_get_stream(MP_STATE_VM(dupterm_objs[idx]));
@@ -121,7 +121,7 @@ int mp_uos_dupterm_rx_chr(void) {
             mp_uint_t out_sz = stream_p->read(MP_STATE_VM(dupterm_objs[idx]), buf, 1, &errcode);
             if (out_sz == 0) {
                 nlr_pop();
-                mp_uos_deactivate(idx, "dupterm: EOF received, deactivating\n", MP_OBJ_NULL);
+                mp_os_deactivate(idx, "dupterm: EOF received, deactivating\n", MP_OBJ_NULL);
             } else if (out_sz == MP_STREAM_ERROR) {
                 // errcode is valid
                 if (mp_is_nonblocking_error(errcode)) {
@@ -140,7 +140,7 @@ int mp_uos_dupterm_rx_chr(void) {
                 return buf[0];
             }
         } else {
-            mp_uos_deactivate(idx, "dupterm: Exception in read() method, deactivating: ", MP_OBJ_FROM_PTR(nlr.ret_val));
+            mp_os_deactivate(idx, "dupterm: Exception in read() method, deactivating: ", MP_OBJ_FROM_PTR(nlr.ret_val));
         }
     }
 
@@ -148,14 +148,14 @@ int mp_uos_dupterm_rx_chr(void) {
     return -1;
 }
 
-void mp_uos_dupterm_tx_strn(const char *str, size_t len) {
+void mp_os_dupterm_tx_strn(const char *str, size_t len) {
     for (size_t idx = 0; idx < MICROPY_PY_OS_DUPTERM; ++idx) {
         if (MP_STATE_VM(dupterm_objs[idx]) == MP_OBJ_NULL) {
             continue;
         }
 
         #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
-        if (mp_uos_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) {
+        if (mp_os_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) {
             int errcode = 0;
             const mp_stream_p_t *stream_p = mp_get_stream(MP_STATE_VM(dupterm_objs[idx]));
             stream_p->write(MP_STATE_VM(dupterm_objs[idx]), str, len, &errcode);
@@ -168,12 +168,12 @@ void mp_uos_dupterm_tx_strn(const char *str, size_t len) {
             mp_stream_write(MP_STATE_VM(dupterm_objs[idx]), str, len, MP_STREAM_RW_WRITE);
             nlr_pop();
         } else {
-            mp_uos_deactivate(idx, "dupterm: Exception in write() method, deactivating: ", MP_OBJ_FROM_PTR(nlr.ret_val));
+            mp_os_deactivate(idx, "dupterm: Exception in write() method, deactivating: ", MP_OBJ_FROM_PTR(nlr.ret_val));
         }
     }
 }
 
-STATIC mp_obj_t mp_uos_dupterm(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t mp_os_dupterm(size_t n_args, const mp_obj_t *args) {
     mp_int_t idx = 0;
     if (n_args == 2) {
         idx = mp_obj_get_int(args[1]);
@@ -195,12 +195,12 @@ STATIC mp_obj_t mp_uos_dupterm(size_t n_args, const mp_obj_t *args) {
     }
 
     #if MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED
-    mp_uos_dupterm_stream_detached_attached(previous_obj, args[0]);
+    mp_os_dupterm_stream_detached_attached(previous_obj, args[0]);
     #endif
 
     return previous_obj;
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_dupterm_obj, 1, 2, mp_uos_dupterm);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_dupterm_obj, 1, 2, mp_os_dupterm);
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t dupterm_objs[MICROPY_PY_OS_DUPTERM]);
 
diff --git a/extmod/utime_mphal.c b/extmod/utime_mphal.c
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/extmod/utime_mphal.c