all: Rename *umodule*.c to remove the "u" prefix.

Updates any includes, and references from Makefiles/CMake. This essentially reverts what was done long ago in commit 136b5cb This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared <[email protected]>
BPI-STEAM · Jun 8, 2023 · 45ac651 · 45ac651
1 parent 0ceccd4
commit 45ac651
Show file tree

Hide file tree

Showing 75 changed files with 81 additions and 81 deletions.
diff --git a/extmod/utime_mphal.c → examples/embedding/Makefile.upylib b/extmod/utime_mphal.c → examples/embedding/Makefile.upylib
diff --git a/examples/natmod/uheapq/uheapq.c b/examples/natmod/uheapq/uheapq.c
@@ -2,7 +2,7 @@
 
 #include "py/dynruntime.h"
 
-#include "extmod/moduheapq.c"
+#include "extmod/modheapq.c"
 
 mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
     MP_DYNRUNTIME_INIT_ENTRY

diff --git a/examples/natmod/urandom/urandom.c b/examples/natmod/urandom/urandom.c
@@ -7,7 +7,7 @@
 uint32_t yasmarang_pad, yasmarang_n, yasmarang_d;
 uint8_t yasmarang_dat;
 
-#include "extmod/modurandom.c"
+#include "extmod/modrandom.c"
 
 mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
     MP_DYNRUNTIME_INIT_ENTRY

diff --git a/examples/natmod/ure/ure.c b/examples/natmod/ure/ure.c
@@ -35,7 +35,7 @@ void *memmove(void *dest, const void *src, size_t n) {
 mp_obj_full_type_t match_type;
 mp_obj_full_type_t re_type;
 
-#include "extmod/modure.c"
+#include "extmod/modre.c"
 
 mp_map_elem_t match_locals_dict_table[5];
 STATIC MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table);

diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/uzlib/uzlib.c
@@ -10,7 +10,7 @@ void *memset(void *s, int c, size_t n) {
 
 mp_obj_full_type_t decompio_type;
 
-#include "extmod/moduzlib.c"
+#include "extmod/modzlib.c"
 
 mp_map_elem_t decompio_locals_dict_table[3];
 STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table);

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
@@ -19,30 +19,30 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modnetwork.c
     ${MICROPY_EXTMOD_DIR}/modonewire.c
     ${MICROPY_EXTMOD_DIR}/moduasyncio.c
-    ${MICROPY_EXTMOD_DIR}/modubinascii.c
-    ${MICROPY_EXTMOD_DIR}/moducryptolib.c
+    ${MICROPY_EXTMOD_DIR}/modbinascii.c
+    ${MICROPY_EXTMOD_DIR}/modcryptolib.c
     ${MICROPY_EXTMOD_DIR}/moductypes.c
-    ${MICROPY_EXTMOD_DIR}/moduhashlib.c
-    ${MICROPY_EXTMOD_DIR}/moduheapq.c
-    ${MICROPY_EXTMOD_DIR}/modujson.c
-    ${MICROPY_EXTMOD_DIR}/moduos.c
-    ${MICROPY_EXTMOD_DIR}/moduplatform.c
-    ${MICROPY_EXTMOD_DIR}/modurandom.c
-    ${MICROPY_EXTMOD_DIR}/modure.c
-    ${MICROPY_EXTMOD_DIR}/moduselect.c
-    ${MICROPY_EXTMOD_DIR}/modusocket.c
-    ${MICROPY_EXTMOD_DIR}/modussl_axtls.c
-    ${MICROPY_EXTMOD_DIR}/modussl_mbedtls.c
-    ${MICROPY_EXTMOD_DIR}/modutime.c
-    ${MICROPY_EXTMOD_DIR}/modutimeq.c
-    ${MICROPY_EXTMOD_DIR}/moduwebsocket.c
-    ${MICROPY_EXTMOD_DIR}/moduzlib.c
+    ${MICROPY_EXTMOD_DIR}/modhashlib.c
+    ${MICROPY_EXTMOD_DIR}/modheapq.c
+    ${MICROPY_EXTMOD_DIR}/modjson.c
+    ${MICROPY_EXTMOD_DIR}/modos.c
+    ${MICROPY_EXTMOD_DIR}/modplatform.c
+    ${MICROPY_EXTMOD_DIR}/modrandom.c
+    ${MICROPY_EXTMOD_DIR}/modre.c
+    ${MICROPY_EXTMOD_DIR}/modselect.c
+    ${MICROPY_EXTMOD_DIR}/modsocket.c
+    ${MICROPY_EXTMOD_DIR}/modssl_axtls.c
+    ${MICROPY_EXTMOD_DIR}/modssl_mbedtls.c
+    ${MICROPY_EXTMOD_DIR}/modtime.c
+    ${MICROPY_EXTMOD_DIR}/modtimeq.c
+    ${MICROPY_EXTMOD_DIR}/modwebsocket.c
+    ${MICROPY_EXTMOD_DIR}/modzlib.c
     ${MICROPY_EXTMOD_DIR}/modwebrepl.c
     ${MICROPY_EXTMOD_DIR}/network_cyw43.c
     ${MICROPY_EXTMOD_DIR}/network_lwip.c
     ${MICROPY_EXTMOD_DIR}/network_ninaw10.c
     ${MICROPY_EXTMOD_DIR}/network_wiznet5k.c
-    ${MICROPY_EXTMOD_DIR}/uos_dupterm.c
+    ${MICROPY_EXTMOD_DIR}/os_dupterm.c
     ${MICROPY_EXTMOD_DIR}/vfs.c
     ${MICROPY_EXTMOD_DIR}/vfs_blockdev.c
     ${MICROPY_EXTMOD_DIR}/vfs_fat.c

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
@@ -11,37 +11,37 @@ SRC_EXTMOD_C += \
 	extmod/machine_signal.c \
 	extmod/machine_spi.c \
 	extmod/machine_timer.c \
+	extmod/modbinascii.c \
 	extmod/modbluetooth.c \
 	extmod/modbtree.c \
+	extmod/modcryptolib.c \
 	extmod/modframebuf.c \
+	extmod/modhashlib.c \
+	extmod/modheapq.c \
+	extmod/modjson.c \
 	extmod/modlwip.c \
 	extmod/modnetwork.c \
 	extmod/modonewire.c \
+	extmod/modos.c \
+	extmod/modplatform.c\
+	extmod/modrandom.c \
+	extmod/modre.c \
+	extmod/modselect.c \
+	extmod/modsocket.c \
+	extmod/modssl_axtls.c \
+	extmod/modssl_mbedtls.c \
+	extmod/modtime.c \
+	extmod/modtimeq.c \
 	extmod/moduasyncio.c \
-	extmod/modubinascii.c \
-	extmod/moducryptolib.c \
 	extmod/moductypes.c \
-	extmod/moduhashlib.c \
-	extmod/moduheapq.c \
-	extmod/modujson.c \
-	extmod/moduos.c \
-	extmod/moduplatform.c\
-	extmod/modurandom.c \
-	extmod/modure.c \
-	extmod/moduselect.c \
-	extmod/modusocket.c \
-	extmod/modussl_axtls.c \
-	extmod/modussl_mbedtls.c \
-	extmod/modutime.c \
-	extmod/modutimeq.c \
-	extmod/moduwebsocket.c \
-	extmod/moduzlib.c \
 	extmod/modwebrepl.c \
+	extmod/modwebsocket.c \
+	extmod/modzlib.c \
 	extmod/network_cyw43.c \
 	extmod/network_lwip.c \
 	extmod/network_ninaw10.c \
 	extmod/network_wiznet5k.c \
-	extmod/uos_dupterm.c \
+	extmod/os_dupterm.c \
 	extmod/vfs.c \
 	extmod/vfs_blockdev.c \
 	extmod/vfs_fat.c \

diff --git a/extmod/modubinascii.c → extmod/modbinascii.c b/extmod/modubinascii.c → extmod/modbinascii.c
diff --git a/extmod/moducryptolib.c → extmod/modcryptolib.c b/extmod/moducryptolib.c → extmod/modcryptolib.c
diff --git a/extmod/moduhashlib.c → extmod/modhashlib.c b/extmod/moduhashlib.c → extmod/modhashlib.c
diff --git a/extmod/moduheapq.c → extmod/modheapq.c b/extmod/moduheapq.c → extmod/modheapq.c
diff --git a/extmod/modujson.c → extmod/modjson.c b/extmod/modujson.c → extmod/modjson.c
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
@@ -1801,7 +1801,7 @@ const mp_obj_module_t mp_module_lwip = {
 
 MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip);
 
-// On LWIP-ports, this is the socket module (replaces extmod/modusocket.c).
+// On LWIP-ports, this is the socket module (replaces extmod/modsocket.c).
 MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip);
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream);

diff --git a/extmod/moduos.c → extmod/modos.c b/extmod/moduos.c → extmod/modos.c
diff --git a/extmod/moduplatform.c → extmod/modplatform.c b/extmod/moduplatform.c → extmod/modplatform.c
diff --git a/extmod/modurandom.c → extmod/modrandom.c b/extmod/modurandom.c → extmod/modrandom.c
diff --git a/extmod/modure.c → extmod/modre.c b/extmod/modure.c → extmod/modre.c
diff --git a/extmod/moduselect.c → extmod/modselect.c b/extmod/moduselect.c → extmod/modselect.c
diff --git a/extmod/modusocket.c → extmod/modsocket.c b/extmod/modusocket.c → extmod/modsocket.c
diff --git a/extmod/modussl_axtls.c → extmod/modssl_axtls.c b/extmod/modussl_axtls.c → extmod/modssl_axtls.c
diff --git a/extmod/modussl_mbedtls.c → extmod/modssl_mbedtls.c b/extmod/modussl_mbedtls.c → extmod/modssl_mbedtls.c
diff --git a/extmod/modutime.c → extmod/modtime.c b/extmod/modutime.c → extmod/modtime.c
diff --git a/extmod/modutimeq.c → extmod/modtimeq.c b/extmod/modutimeq.c → extmod/modtimeq.c
diff --git a/extmod/moduwebsocket.c → extmod/modwebsocket.c b/extmod/moduwebsocket.c → extmod/modwebsocket.c
diff --git a/extmod/moduzlib.c → extmod/modzlib.c b/extmod/moduzlib.c → extmod/modzlib.c
diff --git a/extmod/uos_dupterm.c → extmod/os_dupterm.c b/extmod/uos_dupterm.c → extmod/os_dupterm.c
diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
@@ -78,9 +78,9 @@ APP_MISC_SRC_C = $(addprefix misc/,\
 APP_MODS_SRC_C = $(addprefix mods/,\
 	modmachine.c \
 	modnetwork.c \
-	moduos.c \
-	modusocket.c \
-	modussl.c \
+	modos.c \
+	modsocket.c \
+	modssl.c \
 	modwipy.c \
 	modwlan.c \
 	pybadc.c \

diff --git a/ports/cc3200/mods/moduhashlib.c → ports/cc3200/mods/modhashlib.c b/ports/cc3200/mods/moduhashlib.c → ports/cc3200/mods/modhashlib.c
diff --git a/ports/cc3200/mods/moduos.c → ports/cc3200/mods/modos.c b/ports/cc3200/mods/moduos.c → ports/cc3200/mods/modos.c
diff --git a/ports/cc3200/mods/modusocket.c → ports/cc3200/mods/modsocket.c b/ports/cc3200/mods/modusocket.c → ports/cc3200/mods/modsocket.c
diff --git a/ports/cc3200/mods/modussl.c → ports/cc3200/mods/modssl.c b/ports/cc3200/mods/modussl.c → ports/cc3200/mods/modssl.c
diff --git a/ports/cc3200/mods/modutime.c → ports/cc3200/mods/modtime.c b/ports/cc3200/mods/modutime.c → ports/cc3200/mods/modtime.c
diff --git a/ports/embed/embed.mk b/ports/embed/embed.mk
@@ -52,7 +52,7 @@ micropython-embed-package: $(GENHDR_OUTPUT)
 	$(ECHO) "- py"
 	$(Q)$(CP) $(TOP)/py/*.[ch] $(PACKAGE_DIR)/py
 	$(ECHO) "- extmod"
-	$(Q)$(CP) $(TOP)/extmod/moduplatform.h $(PACKAGE_DIR)/extmod
+	$(Q)$(CP) $(TOP)/extmod/modplatform.h $(PACKAGE_DIR)/extmod
 	$(ECHO) "- shared"
 	$(Q)$(CP) $(TOP)/shared/runtime/gchelper.h $(PACKAGE_DIR)/shared/runtime
 	$(Q)$(CP) $(TOP)/shared/runtime/gchelper_generic.c $(PACKAGE_DIR)/shared/runtime

diff --git a/ports/esp32/moduos.c → ports/esp32/modos.c b/ports/esp32/moduos.c → ports/esp32/modos.c
diff --git a/ports/esp32/modutime.c → ports/esp32/modtime.c b/ports/esp32/modutime.c → ports/esp32/modtime.c
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
@@ -88,7 +88,7 @@
 #define MICROPY_PY_HASHLIB_SHA256           (1)
 #define MICROPY_PY_CRYPTOLIB                (1)
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC    (esp_random())
-#define MICROPY_PY_OS_INCLUDEFILE           "ports/esp32/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE           "ports/esp32/modos.c"
 #define MICROPY_PY_OS_DUPTERM               (1)
 #define MICROPY_PY_OS_DUPTERM_NOTIFY        (1)
 #define MICROPY_PY_OS_SYNC                  (1)

diff --git a/ports/esp8266/boards/esp8266_common.ld b/ports/esp8266/boards/esp8266_common.ld
@@ -164,7 +164,7 @@ SECTIONS
         *machine_hspi.o(.literal*, .text*)
         *hspi.o(.literal*, .text*)
         *modesp.o(.literal* .text*)
-        *moduos.o(.literal* .text*)
+        *modos.o(.literal* .text*)
         *modlwip.o(.literal* .text*)
         *modsocket.o(.literal* .text*)
         *modonewire.o(.literal* .text*)

diff --git a/ports/esp8266/moduos.c → ports/esp8266/modos.c b/ports/esp8266/moduos.c → ports/esp8266/modos.c
diff --git a/ports/esp8266/modutime.c → ports/esp8266/modtime.c b/ports/esp8266/modutime.c → ports/esp8266/modtime.c
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
@@ -58,7 +58,7 @@
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (*WDEV_HWRNG)
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp8266/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp8266/modtime.c"
 #define MICROPY_PY_LWIP             (1)
 #define MICROPY_PY_LWIP_SOCK_RAW    (1)
 #define MICROPY_PY_MACHINE          (1)

diff --git a/ports/mimxrt/moduos.c → ports/mimxrt/modos.c b/ports/mimxrt/moduos.c → ports/mimxrt/modos.c
diff --git a/ports/mimxrt/modutime.c → ports/mimxrt/modtime.c b/ports/mimxrt/modutime.c → ports/mimxrt/modtime.c
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
@@ -72,8 +72,8 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_SSL_FINALISER            (MICROPY_PY_SSL)
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS        (1)
-#define MICROPY_PY_TIME_INCLUDEFILE         "ports/mimxrt/modutime.c"
-#define MICROPY_PY_OS_INCLUDEFILE           "ports/mimxrt/moduos.c"
+#define MICROPY_PY_TIME_INCLUDEFILE         "ports/mimxrt/modtime.c"
+#define MICROPY_PY_OS_INCLUDEFILE           "ports/mimxrt/modos.c"
 #define MICROPY_PY_OS_DUPTERM               (3)
 #define MICROPY_PY_OS_DUPTERM_NOTIFY        (1)
 #define MICROPY_PY_OS_SYNC                  (1)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
@@ -329,8 +329,8 @@ DRIVERS_SRC_C += $(addprefix modules/,\
 	machine/timer.c \
 	machine/rtcounter.c \
 	machine/temp.c \
-	uos/moduos.c \
-	uos/microbitfs.c \
+	os/modos.c \
+	os/microbitfs.c \
 	board/modboard.c \
 	board/led.c \
 	ubluepy/modubluepy.c \

diff --git a/ports/nrf/modules/uos/microbitfs.c → ports/nrf/modules/os/microbitfs.c b/ports/nrf/modules/uos/microbitfs.c → ports/nrf/modules/os/microbitfs.c
diff --git a/ports/nrf/modules/uos/microbitfs.h → ports/nrf/modules/os/microbitfs.h b/ports/nrf/modules/uos/microbitfs.h → ports/nrf/modules/os/microbitfs.h
diff --git a/ports/nrf/modules/uos/moduos.c → ports/nrf/modules/os/modos.c b/ports/nrf/modules/uos/moduos.c → ports/nrf/modules/os/modos.c
diff --git a/ports/renesas-ra/moduos.c → ports/renesas-ra/modos.c b/ports/renesas-ra/moduos.c → ports/renesas-ra/modos.c
diff --git a/ports/renesas-ra/modutime.c → ports/renesas-ra/modtime.c b/ports/renesas-ra/modutime.c → ports/renesas-ra/modtime.c
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
@@ -91,7 +91,7 @@
 #endif
 
 // extended modules
-#define MICROPY_PY_OS_INCLUDEFILE   "ports/renesas-ra/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE   "ports/renesas-ra/modos.c"
 #define MICROPY_PY_OS_DUPTERM       (3)
 #define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
 #define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
@@ -157,7 +157,7 @@ set(MICROPY_SOURCE_QSTR
     ${PROJECT_SOURCE_DIR}/machine_wdt.c
     ${PROJECT_SOURCE_DIR}/modmachine.c
     ${PROJECT_SOURCE_DIR}/modrp2.c
-    ${PROJECT_SOURCE_DIR}/moduos.c
+    ${PROJECT_SOURCE_DIR}/modos.c
     ${PROJECT_SOURCE_DIR}/rp2_flash.c
     ${PROJECT_SOURCE_DIR}/rp2_pio.c
     ${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c

diff --git a/ports/rp2/moduos.c → ports/rp2/modos.c b/ports/rp2/moduos.c → ports/rp2/modos.c
diff --git a/ports/rp2/modutime.c → ports/rp2/modtime.c b/ports/rp2/modutime.c → ports/rp2/modtime.c
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
@@ -95,7 +95,7 @@
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
-#define MICROPY_PY_OS_INCLUDEFILE               "ports/rp2/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE               "ports/rp2/modos.c"
 #ifndef MICROPY_PY_OS_DUPTERM
 #define MICROPY_PY_OS_DUPTERM                   (1)
 #endif
@@ -108,7 +108,7 @@
 #define MICROPY_PY_CRYPTOLIB                    (1)
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS            (1)
-#define MICROPY_PY_TIME_INCLUDEFILE             "ports/rp2/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE             "ports/rp2/modtime.c"
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC        (rosc_random_u32())
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new

diff --git a/ports/samd/moduos.c → ports/samd/modos.c b/ports/samd/moduos.c → ports/samd/modos.c
diff --git a/ports/samd/modutime.c → ports/samd/modtime.c b/ports/samd/modutime.c → ports/samd/modtime.c
diff --git a/ports/stm32/moduos.c → ports/stm32/modos.c b/ports/stm32/moduos.c → ports/stm32/modos.c
diff --git a/ports/stm32/modutime.c → ports/stm32/modtime.c b/ports/stm32/modutime.c → ports/stm32/modtime.c
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
@@ -96,7 +96,7 @@
 #define MICROPY_PY_HASHLIB_MD5      (MICROPY_PY_SSL)
 #define MICROPY_PY_HASHLIB_SHA1     (MICROPY_PY_SSL)
 #define MICROPY_PY_CRYPTOLIB        (MICROPY_PY_SSL)
-#define MICROPY_PY_OS_INCLUDEFILE   "ports/stm32/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE   "ports/stm32/modos.c"
 #define MICROPY_PY_OS_DUPTERM       (3)
 #define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
 #define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
@@ -107,7 +107,7 @@
 #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rng_get())
 #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modtime.c"
 #ifndef MICROPY_PY_TIMEQ
 #define MICROPY_PY_TIMEQ            (1)
 #endif

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
@@ -201,7 +201,7 @@ SRC_C += \
 	mpthreadport.c \
 	input.c \
 	modmachine.c \
-	moduselect.c \
+	modselect.c \
 	alloc.c \
 	fatfs_port.c \
 	mpbthciport.c \
@@ -210,7 +210,7 @@ SRC_C += \
 	mpbtstackport_usb.c \
 	mpnimbleport.c \
 	modtermios.c \
-	modusocket.c \
+	modsocket.c \
 	modffi.c \
 	modjni.c \
 	$(wildcard $(VARIANT_DIR)/*.c)

diff --git a/ports/unix/moduos.c → ports/unix/modos.c b/ports/unix/moduos.c → ports/unix/modos.c
diff --git a/ports/unix/moduselect.c → ports/unix/modselect.c b/ports/unix/moduselect.c → ports/unix/modselect.c
diff --git a/ports/unix/modusocket.c → ports/unix/modsocket.c b/ports/unix/modusocket.c → ports/unix/modsocket.c
diff --git a/ports/unix/modutime.c → ports/unix/modtime.c b/ports/unix/modutime.c → ports/unix/modtime.c
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
@@ -87,7 +87,7 @@
 #define MICROPY_PY_SYS_EXC_INFO        (1)
 
 // Configure the "os" module with extra unix features.
-#define MICROPY_PY_OS_INCLUDEFILE      "ports/unix/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE      "ports/unix/modos.c"
 #define MICROPY_PY_OS_ERRNO            (1)
 #define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
 #define MICROPY_PY_OS_SEP              (1)
@@ -98,7 +98,7 @@
 #define MICROPY_PY_TIME                (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS   (1)
 #define MICROPY_PY_TIME_CUSTOM_SLEEP   (1)
-#define MICROPY_PY_TIME_INCLUDEFILE    "ports/unix/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE    "ports/unix/modtime.c"
 
 // Enable the utimeq module used by the previous (v2) version of uasyncio.
 #define MICROPY_PY_TIMEQ               (1)

diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
@@ -131,7 +131,7 @@
 #endif
 
 #define MICROPY_PY_OS               (1)
-#define MICROPY_PY_OS_INCLUDEFILE   "ports/unix/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE   "ports/unix/modos.c"
 #define MICROPY_PY_OS_ERRNO         (1)
 #define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
 #define MICROPY_PY_OS_SEP           (1)
@@ -141,7 +141,7 @@
 #define MICROPY_PY_TIME             (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
 #define MICROPY_PY_TIME_CUSTOM_SLEEP (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modtime.c"
 #define MICROPY_PY_ERRNO            (1)
 #define MICROPY_PY_UCTYPES          (1)
 #define MICROPY_PY_ZLIB             (1)

diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
@@ -8,18 +8,18 @@
     <PyExtModSource Include="$(PyBaseDir)extmod\machine_pulse.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\machine_signal.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\moduasyncio.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\modubinascii.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modbinascii.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\moductypes.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\moduhashlib.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\moduheapq.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\modujson.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\moduos.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\modurandom.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\modure.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\moduselect.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\modutime.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\modutimeq.c" />
-    <PyExtModSource Include="$(PyBaseDir)extmod\moduzlib.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modhashlib.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modheapq.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modjson.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modos.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modrandom.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modre.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modselect.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modtime.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modtimeq.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\modzlib.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\virtpin.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\vfs.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\vfs_posix.c" />

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
@@ -43,7 +43,7 @@ set(MICROPY_SOURCE_PORT
     machine_uart.c
     modbluetooth_zephyr.c
     modmachine.c
-    modusocket.c
+    modsocket.c
     modzephyr.c
     modzsensor.c
     mphalport.c

diff --git a/ports/zephyr/modusocket.c → ports/zephyr/modsocket.c b/ports/zephyr/modusocket.c → ports/zephyr/modsocket.c
diff --git a/ports/zephyr/modutime.c → ports/zephyr/modtime.c b/ports/zephyr/modutime.c → ports/zephyr/modtime.c
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
@@ -87,7 +87,7 @@
 #define MICROPY_PY_OS               (1)
 #define MICROPY_PY_TIME             (1)
 #define MICROPY_PY_TIME_TIME_TIME_NS (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modtime.c"
 #define MICROPY_PY_ZEPHYR           (1)
 #define MICROPY_PY_ZSENSOR          (1)
 #define MICROPY_PY_SYS_MODULES      (0)

diff --git a/py/moduerrno.c → py/moderrno.c b/py/moduerrno.c → py/moderrno.c
diff --git a/py/py.cmake b/py/py.cmake
@@ -47,7 +47,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/modstruct.c
     ${MICROPY_PY_DIR}/modsys.c
     ${MICROPY_PY_DIR}/modthread.c
-    ${MICROPY_PY_DIR}/moduerrno.c
+    ${MICROPY_PY_DIR}/moderrno.c
     ${MICROPY_PY_DIR}/mpprint.c
     ${MICROPY_PY_DIR}/mpstate.c
     ${MICROPY_PY_DIR}/mpz.c

diff --git a/py/py.mk b/py/py.mk
@@ -185,7 +185,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	modmicropython.o \
 	modstruct.o \
 	modsys.o \
-	moduerrno.o \
+	moderrno.o \
 	modthread.o \
 	vm.o \
 	bc.o \