From f98831fce2f9e8a8ea906078e8d187316beda625 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 12 Aug 2021 13:56:13 +1000
Subject: [PATCH 1/4] docs: Rename ufoo.rst to foo.rst.

This is a simple rename of the files, no content changes
(other than updating index.rst to use the new paths)

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/{uarray.rst => array.rst}        |  0
 docs/library/{ubinascii.rst => binascii.rst}  |  0
 .../library/{ubluetooth.rst => bluetooth.rst} |  0
 .../{ucollections.rst => collections.rst}     |  0
 .../library/{ucryptolib.rst => cryptolib.rst} |  0
 docs/library/{uerrno.rst => errno.rst}        |  0
 docs/library/{uhashlib.rst => hashlib.rst}    |  0
 docs/library/{uheapq.rst => heapq.rst}        |  0
 docs/library/index.rst                        | 38 +++++++++----------
 docs/library/{uio.rst => io.rst}              |  0
 docs/library/{ujson.rst => json.rst}          |  0
 docs/library/{uos.rst => os.rst}              |  0
 docs/library/{ure.rst => re.rst}              |  0
 docs/library/{uselect.rst => select.rst}      |  0
 docs/library/{usocket.rst => socket.rst}      |  0
 docs/library/{ussl.rst => ssl.rst}            |  0
 docs/library/{ustruct.rst => struct.rst}      |  0
 docs/library/{usys.rst => sys.rst}            |  0
 docs/library/{utime.rst => time.rst}          |  0
 docs/library/{uzlib.rst => zlib.rst}          |  0
 20 files changed, 19 insertions(+), 19 deletions(-)
 rename docs/library/{uarray.rst => array.rst} (100%)
 rename docs/library/{ubinascii.rst => binascii.rst} (100%)
 rename docs/library/{ubluetooth.rst => bluetooth.rst} (100%)
 rename docs/library/{ucollections.rst => collections.rst} (100%)
 rename docs/library/{ucryptolib.rst => cryptolib.rst} (100%)
 rename docs/library/{uerrno.rst => errno.rst} (100%)
 rename docs/library/{uhashlib.rst => hashlib.rst} (100%)
 rename docs/library/{uheapq.rst => heapq.rst} (100%)
 rename docs/library/{uio.rst => io.rst} (100%)
 rename docs/library/{ujson.rst => json.rst} (100%)
 rename docs/library/{uos.rst => os.rst} (100%)
 rename docs/library/{ure.rst => re.rst} (100%)
 rename docs/library/{uselect.rst => select.rst} (100%)
 rename docs/library/{usocket.rst => socket.rst} (100%)
 rename docs/library/{ussl.rst => ssl.rst} (100%)
 rename docs/library/{ustruct.rst => struct.rst} (100%)
 rename docs/library/{usys.rst => sys.rst} (100%)
 rename docs/library/{utime.rst => time.rst} (100%)
 rename docs/library/{uzlib.rst => zlib.rst} (100%)

diff --git a/docs/library/uarray.rst b/docs/library/array.rst
similarity index 100%
rename from docs/library/uarray.rst
rename to docs/library/array.rst
diff --git a/docs/library/ubinascii.rst b/docs/library/binascii.rst
similarity index 100%
rename from docs/library/ubinascii.rst
rename to docs/library/binascii.rst
diff --git a/docs/library/ubluetooth.rst b/docs/library/bluetooth.rst
similarity index 100%
rename from docs/library/ubluetooth.rst
rename to docs/library/bluetooth.rst
diff --git a/docs/library/ucollections.rst b/docs/library/collections.rst
similarity index 100%
rename from docs/library/ucollections.rst
rename to docs/library/collections.rst
diff --git a/docs/library/ucryptolib.rst b/docs/library/cryptolib.rst
similarity index 100%
rename from docs/library/ucryptolib.rst
rename to docs/library/cryptolib.rst
diff --git a/docs/library/uerrno.rst b/docs/library/errno.rst
similarity index 100%
rename from docs/library/uerrno.rst
rename to docs/library/errno.rst
diff --git a/docs/library/uhashlib.rst b/docs/library/hashlib.rst
similarity index 100%
rename from docs/library/uhashlib.rst
rename to docs/library/hashlib.rst
diff --git a/docs/library/uheapq.rst b/docs/library/heapq.rst
similarity index 100%
rename from docs/library/uheapq.rst
rename to docs/library/heapq.rst
diff --git a/docs/library/index.rst b/docs/library/index.rst
index 2536e8dc96d04..2840688b4879a 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -73,28 +73,28 @@ it will fallback to loading the built-in ``ujson`` module.
 .. toctree::
    :maxdepth: 1
 
+   array.rst
+   binascii.rst
    builtins.rst
    cmath.rst
+   collections.rst
+   errno.rst
    gc.rst
+   hashlib.rst
+   heapq.rst
+   io.rst
+   json.rst
    math.rst
-   uarray.rst
+   os.rst
+   re.rst
+   select.rst
+   socket.rst
+   ssl.rst
+   struct.rst
+   sys.rst
+   time.rst
    uasyncio.rst
-   ubinascii.rst
-   ucollections.rst
-   uerrno.rst
-   uhashlib.rst
-   uheapq.rst
-   uio.rst
-   ujson.rst
-   uos.rst
-   ure.rst
-   uselect.rst
-   usocket.rst
-   ussl.rst
-   ustruct.rst
-   usys.rst
-   utime.rst
-   uzlib.rst
+   zlib.rst
    _thread.rst
 
 
@@ -107,13 +107,13 @@ the following libraries.
 .. toctree::
    :maxdepth: 1
 
+   bluetooth.rst
    btree.rst
+   cryptolib.rst
    framebuf.rst
    machine.rst
    micropython.rst
    network.rst
-   ubluetooth.rst
-   ucryptolib.rst
    uctypes.rst
 
 
diff --git a/docs/library/uio.rst b/docs/library/io.rst
similarity index 100%
rename from docs/library/uio.rst
rename to docs/library/io.rst
diff --git a/docs/library/ujson.rst b/docs/library/json.rst
similarity index 100%
rename from docs/library/ujson.rst
rename to docs/library/json.rst
diff --git a/docs/library/uos.rst b/docs/library/os.rst
similarity index 100%
rename from docs/library/uos.rst
rename to docs/library/os.rst
diff --git a/docs/library/ure.rst b/docs/library/re.rst
similarity index 100%
rename from docs/library/ure.rst
rename to docs/library/re.rst
diff --git a/docs/library/uselect.rst b/docs/library/select.rst
similarity index 100%
rename from docs/library/uselect.rst
rename to docs/library/select.rst
diff --git a/docs/library/usocket.rst b/docs/library/socket.rst
similarity index 100%
rename from docs/library/usocket.rst
rename to docs/library/socket.rst
diff --git a/docs/library/ussl.rst b/docs/library/ssl.rst
similarity index 100%
rename from docs/library/ussl.rst
rename to docs/library/ssl.rst
diff --git a/docs/library/ustruct.rst b/docs/library/struct.rst
similarity index 100%
rename from docs/library/ustruct.rst
rename to docs/library/struct.rst
diff --git a/docs/library/usys.rst b/docs/library/sys.rst
similarity index 100%
rename from docs/library/usys.rst
rename to docs/library/sys.rst
diff --git a/docs/library/utime.rst b/docs/library/time.rst
similarity index 100%
rename from docs/library/utime.rst
rename to docs/library/time.rst
diff --git a/docs/library/uzlib.rst b/docs/library/zlib.rst
similarity index 100%
rename from docs/library/uzlib.rst
rename to docs/library/zlib.rst

From dccc030ab4fad31199009a0ed2f445362921d409 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 12 Aug 2021 13:59:29 +1000
Subject: [PATCH 2/4] docs: Replace ufoo with foo in all docs.

Anywhere a module is mentioned, use it's "non-u" name for consistency.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/develop/library.rst        |  2 +-
 docs/develop/porting.rst        |  4 +--
 docs/esp32/quickref.rst         | 12 ++++-----
 docs/esp8266/general.rst        |  4 +--
 docs/esp8266/quickref.rst       | 12 ++++-----
 docs/library/array.rst          |  4 +--
 docs/library/binascii.rst       |  4 +--
 docs/library/bluetooth.rst      |  8 +++---
 docs/library/btree.rst          |  2 +-
 docs/library/collections.rst    |  8 +++---
 docs/library/cryptolib.rst      | 10 ++++----
 docs/library/errno.rst          | 10 ++++----
 docs/library/esp32.rst          |  2 +-
 docs/library/hashlib.rst        | 12 ++++-----
 docs/library/heapq.rst          |  4 +--
 docs/library/index.rst          |  4 +--
 docs/library/io.rst             |  4 +--
 docs/library/json.rst           |  4 +--
 docs/library/machine.SDCard.rst |  4 +--
 docs/library/network.WLAN.rst   |  2 +-
 docs/library/network.rst        | 10 ++++----
 docs/library/os.rst             | 12 ++++-----
 docs/library/pyb.Flash.rst      |  2 +-
 docs/library/pyb.rst            |  4 +--
 docs/library/re.rst             | 12 ++++-----
 docs/library/rp2.Flash.rst      |  2 +-
 docs/library/select.rst         | 16 ++++++------
 docs/library/socket.rst         | 44 ++++++++++++++++-----------------
 docs/library/ssl.rst            | 18 +++++++-------
 docs/library/struct.rst         |  4 +--
 docs/library/sys.rst            | 12 ++++-----
 docs/library/time.rst           |  8 +++---
 docs/library/uctypes.rst        |  2 +-
 docs/library/zlib.rst           |  4 +--
 docs/pyboard/quickref.rst       |  2 +-
 docs/reference/constrained.rst  |  6 ++---
 docs/reference/filesystem.rst   | 12 ++++-----
 docs/reference/glossary.rst     |  2 +-
 docs/reference/speed_python.rst |  6 ++---
 docs/rp2/quickref.rst           |  2 +-
 docs/wipy/general.rst           |  6 ++---
 41 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/docs/develop/library.rst b/docs/develop/library.rst
index bebddcc8a3605..47ea2dc8d2431 100644
--- a/docs/develop/library.rst
+++ b/docs/develop/library.rst
@@ -34,7 +34,7 @@ An example is the ``gc`` module discussed in :ref:`memorymanagement`.
    >>> gc.enable()
    >>>
 
-MicroPython has several other builtin standard/core modules like ``io``, ``uarray`` etc.
+MicroPython has several other builtin standard/core modules like ``io``, ``array`` etc.
 Adding a new core module involves several modifications.
 
 First, create the ``C`` file in the ``py/`` directory. In this example we are adding a
diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index 08f3557f1835d..549227d76267c 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -245,8 +245,8 @@ That should give a MicroPython REPL.  You can then run commands like:
 .. code-block:: bash
 
    MicroPython v1.13 on 2021-01-01; example-board with unknown-cpu
-   >>> import usys
-   >>> usys.implementation
+   >>> import sys
+   >>> sys.implementation
    ('micropython', (1, 13, 0))
    >>>
 
diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 56c3721148207..3153ebd57130f 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -98,7 +98,7 @@ A useful function for connecting to your local WiFi network is::
                 pass
         print('network config:', wlan.ifconfig())
 
-Once the network is established the :mod:`socket <usocket>` module can be used
+Once the network is established the :mod:`socket <socket>` module can be used
 to create and use TCP/UDP sockets as usual, and the ``urequests`` module for
 convenient HTTP requests.
 
@@ -113,7 +113,7 @@ to reconnect forever).
 Delay and timing
 ----------------
 
-Use the :mod:`time <utime>` module::
+Use the :mod:`time <time>` module::
 
     import time
 
@@ -459,15 +459,15 @@ SD card
 
 See :ref:`machine.SDCard <machine.SDCard>`. ::
 
-    import machine, uos
+    import machine, os
 
     # Slot 2 uses pins sck=18, cs=5, miso=19, mosi=23
     sd = machine.SDCard(slot=2)
-    uos.mount(sd, "/sd")  # mount
+    os.mount(sd, "/sd")  # mount
 
-    uos.listdir('/sd')    # list directory contents
+    os.listdir('/sd')    # list directory contents
 
-    uos.umount('/sd')     # eject
+    os.umount('/sd')     # eject
 
 RMT
 ---
diff --git a/docs/esp8266/general.rst b/docs/esp8266/general.rst
index 4999bc2e9bb1a..be0437e752eed 100644
--- a/docs/esp8266/general.rst
+++ b/docs/esp8266/general.rst
@@ -117,7 +117,7 @@ Real-time clock
 
 RTC in ESP8266 has very bad accuracy, drift may be seconds per minute. As
 a workaround, to measure short enough intervals you can use
-``utime.time()``, etc. functions, and for wall clock time, synchronize from
+``time.time()``, etc. functions, and for wall clock time, synchronize from
 the net using included ``ntptime.py`` module.
 
 Due to limitations of the ESP8266 chip the internal real-time clock (RTC)
@@ -203,7 +203,7 @@ limitation with usage of TLS on the low-memory devices:
    communication with other devices.
 
 There are also some not implemented features specifically in MicroPython's
-``ussl`` module based on axTLS:
+``ssl`` module based on axTLS:
 
 6. Certificates are not validated (this makes connections susceptible
    to man-in-the-middle attacks).
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index 72b35966978ee..9e64723b27c74 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -78,13 +78,13 @@ A useful function for connecting to your local WiFi network is::
                 pass
         print('network config:', wlan.ifconfig())
 
-Once the network is established the :mod:`socket <usocket>` module can be used
+Once the network is established the :mod:`socket <socket>` module can be used
 to create and use TCP/UDP sockets as usual.
 
 Delay and timing
 ----------------
 
-Use the :mod:`time <utime>` module::
+Use the :mod:`time <time>` module::
 
     import time
 
@@ -171,15 +171,15 @@ attaches the REPL).
 
 To detach the REPL from UART0, use::
 
-    import uos
-    uos.dupterm(None, 1)
+    import os
+    os.dupterm(None, 1)
 
 The REPL is attached by default. If you have detached it, to reattach
 it use::
 
-    import uos, machine
+    import os, machine
     uart = machine.UART(0, 115200)
-    uos.dupterm(uart, 1)
+    os.dupterm(uart, 1)
 
 PWM (pulse width modulation)
 ----------------------------
diff --git a/docs/library/array.rst b/docs/library/array.rst
index 9fa82ff31b5c9..0aed4786c36ab 100644
--- a/docs/library/array.rst
+++ b/docs/library/array.rst
@@ -1,7 +1,7 @@
-:mod:`uarray` -- arrays of numeric data
+:mod:`array` -- arrays of numeric data
 =======================================
 
-.. module:: uarray
+.. module:: array
    :synopsis: efficient arrays of numeric data
 
 |see_cpython_module| :mod:`python:array`.
diff --git a/docs/library/binascii.rst b/docs/library/binascii.rst
index 721b80508e31a..94e09d342d387 100644
--- a/docs/library/binascii.rst
+++ b/docs/library/binascii.rst
@@ -1,7 +1,7 @@
-:mod:`ubinascii` -- binary/ASCII conversions
+:mod:`binascii` -- binary/ASCII conversions
 ============================================
 
-.. module:: ubinascii
+.. module:: binascii
    :synopsis: binary/ASCII conversions
 
 |see_cpython_module| :mod:`python:binascii`.
diff --git a/docs/library/bluetooth.rst b/docs/library/bluetooth.rst
index 3d435a7beda5a..5c0bcaf7f8dbc 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -1,7 +1,7 @@
-:mod:`ubluetooth` --- low-level Bluetooth
+:mod:`bluetooth` --- low-level Bluetooth
 =========================================
 
-.. module:: ubluetooth
+.. module:: bluetooth
    :synopsis: Low-level Bluetooth radio functionality
 
 This module provides an interface to a Bluetooth controller on a board.
@@ -110,7 +110,7 @@ Event Handling
 
     **Note:** As an optimisation to prevent unnecessary allocations, the ``addr``,
     ``adv_data``, ``char_data``, ``notify_data``, and ``uuid`` entries in the
-    tuples are read-only memoryview instances pointing to ubluetooth's internal
+    tuples are read-only memoryview instances pointing to :mod:`bluetooth`'s internal
     ringbuffer, and are only valid during the invocation of the IRQ handler
     function.  If your program needs to save one of these values to access after
     the IRQ handler has returned (e.g. by saving it in a class instance or global
@@ -293,7 +293,7 @@ For the ``_IRQ_PASSKEY_ACTION`` event, the available actions are::
     _PASSKEY_ACTION_NUMERIC_COMPARISON = const(4)
 
 In order to save space in the firmware, these constants are not included on the
-:mod:`ubluetooth` module. Add the ones that you need from the list above to your
+:mod:`bluetooth` module. Add the ones that you need from the list above to your
 program.
 
 
diff --git a/docs/library/btree.rst b/docs/library/btree.rst
index ba910852102d1..c093f970fabaa 100644
--- a/docs/library/btree.rst
+++ b/docs/library/btree.rst
@@ -22,7 +22,7 @@ Example::
 
     # First, we need to open a stream which holds a database
     # This is usually a file, but can be in-memory database
-    # using uio.BytesIO, a raw flash partition, etc.
+    # using io.BytesIO, a raw flash partition, etc.
     # Oftentimes, you want to create a database file if it doesn't
     # exist and open if it exists. Idiom below takes care of this.
     # DO NOT open database with "a+b" access mode.
diff --git a/docs/library/collections.rst b/docs/library/collections.rst
index b833842c1321d..ccdbc46b1554b 100644
--- a/docs/library/collections.rst
+++ b/docs/library/collections.rst
@@ -1,7 +1,7 @@
-:mod:`ucollections` -- collection and container types
+:mod:`collections` -- collection and container types
 =====================================================
 
-.. module:: ucollections
+.. module:: collections
    :synopsis: collection and container types
 
 |see_cpython_module| :mod:`python:collections`.
@@ -49,7 +49,7 @@ Classes
     a string with space-separated field named (but this is less efficient).
     Example of use::
 
-        from ucollections import namedtuple
+        from collections import namedtuple
 
         MyTuple = namedtuple("MyTuple", ("id", "name"))
         t1 = MyTuple(1, "foo")
@@ -63,7 +63,7 @@ Classes
     added. When ordered dict is iterated over, keys/items are returned in
     the order they were added::
 
-        from ucollections import OrderedDict
+        from collections import OrderedDict
 
         # To make benefit of ordered keys, OrderedDict should be initialized
         # from sequence of (key, value) pairs.
diff --git a/docs/library/cryptolib.rst b/docs/library/cryptolib.rst
index 79471c2e90ccc..95faf90bd18d1 100644
--- a/docs/library/cryptolib.rst
+++ b/docs/library/cryptolib.rst
@@ -1,7 +1,7 @@
-:mod:`ucryptolib` -- cryptographic ciphers
+:mod:`cryptolib` -- cryptographic ciphers
 ==========================================
 
-.. module:: ucryptolib
+.. module:: cryptolib
    :synopsis: cryptographic ciphers
 
 Classes
@@ -21,9 +21,9 @@ Classes
             * *key* is an encryption/decryption key (bytes-like).
             * *mode* is:
 
-                * ``1`` (or ``ucryptolib.MODE_ECB`` if it exists) for Electronic Code Book (ECB).
-                * ``2`` (or ``ucryptolib.MODE_CBC`` if it exists) for Cipher Block Chaining (CBC).
-                * ``6`` (or ``ucryptolib.MODE_CTR`` if it exists) for Counter mode (CTR).
+                * ``1`` (or ``cryptolib.MODE_ECB`` if it exists) for Electronic Code Book (ECB).
+                * ``2`` (or ``cryptolib.MODE_CBC`` if it exists) for Cipher Block Chaining (CBC).
+                * ``6`` (or ``cryptolib.MODE_CTR`` if it exists) for Counter mode (CTR).
 
             * *IV* is an initialization vector for CBC mode.
             * For Counter mode, *IV* is the initial value for the counter.
diff --git a/docs/library/errno.rst b/docs/library/errno.rst
index 1d60c80e11c27..566c3ef1108a8 100644
--- a/docs/library/errno.rst
+++ b/docs/library/errno.rst
@@ -1,7 +1,7 @@
-:mod:`uerrno` -- system error codes
+:mod:`errno` -- system error codes
 ===================================
 
-.. module:: uerrno
+.. module:: errno
    :synopsis: system error codes
 
 |see_cpython_module| :mod:`python:errno`.
@@ -20,9 +20,9 @@ Constants
     where ``exc`` is an instance of `OSError`. Usage example::
 
         try:
-            uos.mkdir("my_dir")
+            os.mkdir("my_dir")
         except OSError as exc:
-            if exc.errno == uerrno.EEXIST:
+            if exc.errno == errno.EEXIST:
                 print("Directory already exists")
 
 .. data:: errorcode
@@ -30,5 +30,5 @@ Constants
     Dictionary mapping numeric error codes to strings with symbolic error
     code (see above)::
 
-        >>> print(uerrno.errorcode[uerrno.EEXIST])
+        >>> print(errno.errorcode[errno.EEXIST])
         EEXIST
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index fc90968037bc4..e3c25d2653db1 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -91,7 +91,7 @@ methods to enable over-the-air (OTA) updates.
 
     These methods implement the simple and :ref:`extended
     <block-device-interface>` block protocol defined by
-    :class:`uos.AbstractBlockDev`.
+    :class:`os.AbstractBlockDev`.
 
 .. method:: Partition.set_boot()
 
diff --git a/docs/library/hashlib.rst b/docs/library/hashlib.rst
index e1eddd2b7131f..1e271edfda444 100644
--- a/docs/library/hashlib.rst
+++ b/docs/library/hashlib.rst
@@ -1,7 +1,7 @@
-:mod:`uhashlib` -- hashing algorithms
+:mod:`hashlib` -- hashing algorithms
 =====================================
 
-.. module:: uhashlib
+.. module:: hashlib
    :synopsis: hashing algorithms
 
 |see_cpython_module| :mod:`python:hashlib`.
@@ -27,15 +27,15 @@ be implemented:
 Constructors
 ------------
 
-.. class:: uhashlib.sha256([data])
+.. class:: hashlib.sha256([data])
 
     Create an SHA256 hasher object and optionally feed ``data`` into it.
 
-.. class:: uhashlib.sha1([data])
+.. class:: hashlib.sha1([data])
 
     Create an SHA1 hasher object and optionally feed ``data`` into it.
 
-.. class:: uhashlib.md5([data])
+.. class:: hashlib.md5([data])
 
     Create an MD5 hasher object and optionally feed ``data`` into it.
 
@@ -53,5 +53,5 @@ Methods
 
 .. method:: hash.hexdigest()
 
-   This method is NOT implemented. Use ``ubinascii.hexlify(hash.digest())``
+   This method is NOT implemented. Use ``binascii.hexlify(hash.digest())``
    to achieve a similar effect.
diff --git a/docs/library/heapq.rst b/docs/library/heapq.rst
index 9ae1f61a173dd..a30f32efdb2a4 100644
--- a/docs/library/heapq.rst
+++ b/docs/library/heapq.rst
@@ -1,7 +1,7 @@
-:mod:`uheapq` -- heap queue algorithm
+:mod:`heapq` -- heap queue algorithm
 =====================================
 
-.. module:: uheapq
+.. module:: heapq
    :synopsis: heap queue algorithm
 
 |see_cpython_module| :mod:`python:heapq`.
diff --git a/docs/library/index.rst b/docs/library/index.rst
index 2840688b4879a..f373da426a1c8 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -56,7 +56,7 @@ The following standard Python libraries have been "micro-ified" to fit in with
 the philosophy of MicroPython.  They provide the core functionality of that
 module and are intended to be a drop-in replacement for the standard Python
 library.  Some modules below use a standard Python name, but prefixed with "u",
-e.g. ``ujson`` instead of ``json``. This is to signify that such a module is
+e.g. ``json`` instead of ``json``. This is to signify that such a module is
 micro-library, i.e. implements only a subset of CPython module functionality.
 By naming them differently, a user has a choice to write a Python-level module
 to extend functionality for better compatibility with CPython (indeed, this is
@@ -68,7 +68,7 @@ are available both by their u-name, and also by their non-u-name.  The
 non-u-name can be overridden by a file of that name in your library path (``sys.path``).
 For example, ``import json`` will first search for a file ``json.py`` (or package
 directory ``json``) and load that module if it is found.  If nothing is found,
-it will fallback to loading the built-in ``ujson`` module.
+it will fallback to loading the built-in ``json`` module.
 
 .. toctree::
    :maxdepth: 1
diff --git a/docs/library/io.rst b/docs/library/io.rst
index adbeef08b7b49..e998a5a70307d 100644
--- a/docs/library/io.rst
+++ b/docs/library/io.rst
@@ -1,7 +1,7 @@
-:mod:`uio` -- input/output streams
+:mod:`io` -- input/output streams
 ==================================
 
-.. module:: uio
+.. module:: io
    :synopsis: input/output streams
 
 |see_cpython_module| :mod:`python:io`.
diff --git a/docs/library/json.rst b/docs/library/json.rst
index 65ed1867e6e87..adf6a2f844131 100644
--- a/docs/library/json.rst
+++ b/docs/library/json.rst
@@ -1,7 +1,7 @@
-:mod:`ujson` -- JSON encoding and decoding
+:mod:`json` -- JSON encoding and decoding
 ==========================================
 
-.. module:: ujson
+.. module:: json
    :synopsis: JSON encoding and decoding
 
 |see_cpython_module| :mod:`python:json`.
diff --git a/docs/library/machine.SDCard.rst b/docs/library/machine.SDCard.rst
index b1cf42ec0285b..96fb5b01c8a81 100644
--- a/docs/library/machine.SDCard.rst
+++ b/docs/library/machine.SDCard.rst
@@ -27,10 +27,10 @@ vary from platform to platform.
 
     This class provides access to SD or MMC storage cards using either
     a dedicated SD/MMC interface hardware or through an SPI channel.
-    The class implements the block protocol defined by :class:`uos.AbstractBlockDev`.
+    The class implements the block protocol defined by :class:`os.AbstractBlockDev`.
     This allows the mounting of an SD card to be as simple as::
 
-      uos.mount(machine.SDCard(), "/sd")
+      os.mount(machine.SDCard(), "/sd")
 
     The constructor takes the following parameters:
 
diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index 35e4b798ae0b6..72091d0ea5a0f 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -55,7 +55,7 @@ Methods
         (ssid, bssid, channel, RSSI, authmode, hidden)
 
     *bssid* is hardware address of an access point, in binary form, returned as
-    bytes object. You can use `ubinascii.hexlify()` to convert it to ASCII form.
+    bytes object. You can use `binascii.hexlify()` to convert it to ASCII form.
 
     There are five values for authmode:
 
diff --git a/docs/library/network.rst b/docs/library/network.rst
index a20eb2ebf5e0a..c188bb31351a3 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -9,7 +9,7 @@ This module provides network drivers and routing configuration. To use this
 module, a MicroPython variant/build with network capabilities must be installed.
 Network drivers for specific hardware are available within this module and are
 used to configure hardware network interface(s). Network services provided
-by configured interfaces are then available for use via the :mod:`usocket`
+by configured interfaces are then available for use via the :mod:`socket`
 module.
 
 For example::
@@ -17,17 +17,17 @@ For example::
     # connect/ show IP config a specific network interface
     # see below for examples of specific drivers
     import network
-    import utime
+    import time
     nic = network.Driver(...)
     if not nic.isconnected():
         nic.connect()
         print("Waiting for connection...")
         while not nic.isconnected():
-            utime.sleep(1)
+            time.sleep(1)
     print(nic.ifconfig())
 
-    # now use usocket as usual
-    import usocket as socket
+    # now use socket as usual
+    import socket as socket
     addr = socket.getaddrinfo('micropython.org', 80)[0][-1]
     s = socket.socket()
     s.connect(addr)
diff --git a/docs/library/os.rst b/docs/library/os.rst
index edc94556b1722..45c4c69f2e602 100644
--- a/docs/library/os.rst
+++ b/docs/library/os.rst
@@ -1,12 +1,12 @@
-:mod:`uos` -- basic "operating system" services
+:mod:`os` -- basic "operating system" services
 ===============================================
 
-.. module:: uos
+.. module:: os
    :synopsis: basic "operating system" services
 
 |see_cpython_module| :mod:`python:os`.
 
-The ``uos`` module contains functions for filesystem access and mounting,
+The ``os`` module contains functions for filesystem access and mounting,
 terminal redirection and duplication, and the ``uname`` and ``urandom``
 functions.
 
@@ -116,7 +116,7 @@ Terminal redirection and duplication
 
    Duplicate or switch the MicroPython terminal (the REPL) on the given `stream`-like
    object. The *stream_object* argument must be a native stream object, or derive
-   from ``uio.IOBase`` and implement the ``readinto()`` and
+   from ``io.IOBase`` and implement the ``readinto()`` and
    ``write()`` methods.  The stream should be in non-blocking mode and
    ``readinto()`` should return ``None`` if there is no data available for reading.
 
@@ -207,7 +207,7 @@ represented by VFS classes.
     otherwise the timestamps will remain untouched.  Littlefs v2 filesystems without
     timestamps will work without reformatting and timestamps will be added
     transparently to existing files once they are opened for writing.  When *mtime*
-    is enabled `uos.stat` on files without timestamps will return 0 for the timestamp.
+    is enabled `os.stat` on files without timestamps will return 0 for the timestamp.
 
     See :ref:`filesystem` for more information.
 
@@ -234,7 +234,7 @@ but an actual block device class must implement the methods described below.
 
 A concrete implementation of this class will usually allow access to the
 memory-like functionality of a piece of hardware (like flash memory). A block
-device can be formatted to any supported filesystem and mounted using ``uos``
+device can be formatted to any supported filesystem and mounted using ``os``
 methods.
 
 See :ref:`filesystem` for example implementations of block devices using the
diff --git a/docs/library/pyb.Flash.rst b/docs/library/pyb.Flash.rst
index 4b0c2ce2aaa2f..01b3a0ac9e0a3 100644
--- a/docs/library/pyb.Flash.rst
+++ b/docs/library/pyb.Flash.rst
@@ -43,7 +43,7 @@ Methods
 
     These methods implement the simple and :ref:`extended
     <block-device-interface>` block protocol defined by
-    :class:`uos.AbstractBlockDev`.
+    :class:`os.AbstractBlockDev`.
 
 Hardware Note
 -------------
diff --git a/docs/library/pyb.rst b/docs/library/pyb.rst
index 321be3c52f2fe..880d68c531f88 100644
--- a/docs/library/pyb.rst
+++ b/docs/library/pyb.rst
@@ -213,11 +213,11 @@ Miscellaneous functions
 .. function:: mount(device, mountpoint, *, readonly=False, mkfs=False)
 
    .. note:: This function is deprecated. Mounting and unmounting devices should
-      be performed by :meth:`uos.mount` and :meth:`uos.umount` instead.
+      be performed by :meth:`os.mount` and :meth:`os.umount` instead.
 
    Mount a block device and make it available as part of the filesystem.
    ``device`` must be an object that provides the block protocol. (The
-   following is also deprecated. See :class:`uos.AbstractBlockDev` for the
+   following is also deprecated. See :class:`os.AbstractBlockDev` for the
    correct way to create a block device.)
 
     - ``readblocks(self, blocknum, buf)``
diff --git a/docs/library/re.rst b/docs/library/re.rst
index e94d286175cef..a6cf3fbcf2e75 100644
--- a/docs/library/re.rst
+++ b/docs/library/re.rst
@@ -1,7 +1,7 @@
-:mod:`ure` -- simple regular expressions
+:mod:`re` -- simple regular expressions
 ========================================
 
-.. module:: ure
+.. module:: re
    :synopsis: regular expressions
 
 |see_cpython_module| :mod:`python:re`.
@@ -95,11 +95,11 @@ Supported operators and special sequences are:
 
 Example::
 
-    import ure
+    import re
 
-    # As ure doesn't support escapes itself, use of r"" strings is not
+    # As re doesn't support escapes itself, use of r"" strings is not
     # recommended.
-    regex = ure.compile("[\r\n]")
+    regex = re.compile("[\r\n]")
 
     regex.split("line1\rline2\nline3\r\n")
 
@@ -152,7 +152,7 @@ Regex objects
 -------------
 
 Compiled regular expression. Instances of this class are created using
-`ure.compile()`.
+`re.compile()`.
 
 .. method:: regex.match(string)
             regex.search(string)
diff --git a/docs/library/rp2.Flash.rst b/docs/library/rp2.Flash.rst
index 3b423adfdd894..1e94cf519c844 100644
--- a/docs/library/rp2.Flash.rst
+++ b/docs/library/rp2.Flash.rst
@@ -32,5 +32,5 @@ Methods
 
     These methods implement the simple and extended
     :ref:`block protocol <block-device-interface>` defined by
-    :class:`uos.AbstractBlockDev`.
+    :class:`os.AbstractBlockDev`.
 
diff --git a/docs/library/select.rst b/docs/library/select.rst
index 76202739c87e9..87bb4ccaf72f1 100644
--- a/docs/library/select.rst
+++ b/docs/library/select.rst
@@ -1,7 +1,7 @@
-:mod:`uselect` -- wait for events on a set of streams
+:mod:`select` -- wait for events on a set of streams
 ========================================================================
 
-.. module:: uselect
+.. module:: select
    :synopsis: wait for events on a set of streams
 
 |see_cpython_module| :mod:`python:select`.
@@ -35,15 +35,15 @@ Methods
 
    Register `stream` *obj* for polling. *eventmask* is logical OR of:
 
-   * ``uselect.POLLIN``  - data available for reading
-   * ``uselect.POLLOUT`` - more data can be written
+   * ``select.POLLIN``  - data available for reading
+   * ``select.POLLOUT`` - more data can be written
 
-   Note that flags like ``uselect.POLLHUP`` and ``uselect.POLLERR`` are
+   Note that flags like ``select.POLLHUP`` and ``select.POLLERR`` are
    *not* valid as input eventmask (these are unsolicited events which
    will be returned from `poll()` regardless of whether they are asked
    for). This semantics is per POSIX.
 
-   *eventmask* defaults to ``uselect.POLLIN | uselect.POLLOUT``.
+   *eventmask* defaults to ``select.POLLIN | select.POLLOUT``.
 
    It is OK to call this function multiple times for the same *obj*.
    Successive calls will update *obj*'s eventmask to the value of
@@ -67,8 +67,8 @@ Methods
    Returns list of (``obj``, ``event``, ...) tuples. There may be other elements in
    tuple, depending on a platform and version, so don't assume that its size is 2.
    The ``event`` element specifies which events happened with a stream and
-   is a combination of ``uselect.POLL*`` constants described above. Note that
-   flags ``uselect.POLLHUP`` and ``uselect.POLLERR`` can be returned at any time
+   is a combination of ``select.POLL*`` constants described above. Note that
+   flags ``select.POLLHUP`` and ``select.POLLERR`` can be returned at any time
    (even if were not asked for), and must be acted on accordingly (the
    corresponding stream unregistered from poll and likely closed), because
    otherwise all further invocations of `poll()` may return immediately with
diff --git a/docs/library/socket.rst b/docs/library/socket.rst
index 39b848e593d75..80685711f891d 100644
--- a/docs/library/socket.rst
+++ b/docs/library/socket.rst
@@ -1,8 +1,8 @@
 *******************************
-:mod:`usocket` -- socket module
+:mod:`socket` -- socket module
 *******************************
 
-.. module:: usocket
+.. module:: socket
    :synopsis: socket module
 
 |see_cpython_module| :mod:`python:socket`.
@@ -21,13 +21,13 @@ This module provides access to the BSD socket interface.
 Socket address format(s)
 ------------------------
 
-The native socket address format of the ``usocket`` module is an opaque data type
+The native socket address format of the ``socket`` module is an opaque data type
 returned by `getaddrinfo` function, which must be used to resolve textual address
 (including numeric addresses)::
 
-    sockaddr = usocket.getaddrinfo('www.micropython.org', 80)[0][-1]
+    sockaddr = socket.getaddrinfo('www.micropython.org', 80)[0][-1]
     # You must use getaddrinfo() even for numeric addresses
-    sockaddr = usocket.getaddrinfo('127.0.0.1', 80)[0][-1]
+    sockaddr = socket.getaddrinfo('127.0.0.1', 80)[0][-1]
     # Now you can use that address
     sock.connect(addr)
 
@@ -35,7 +35,7 @@ Using `getaddrinfo` is the most efficient (both in terms of memory and processin
 power) and portable way to work with addresses.
 
 However, ``socket`` module (note the difference with native MicroPython
-``usocket`` module described here) provides CPython-compatible way to specify
+``socket`` module described here) provides CPython-compatible way to specify
 addresses using tuples, as described below. Note that depending on a
 :term:`MicroPython port`, ``socket`` module can be builtin or need to be
 installed from `micropython-lib` (as in the case of :term:`MicroPython Unix port`),
@@ -54,13 +54,13 @@ Tuple address format for ``socket`` module:
   dot-notation numeric IPv4 address, e.g. ``"8.8.8.8"``, and *port* is and
   integer port number in the range 1-65535. Note the domain names are not
   accepted as *ipv4_address*, they should be resolved first using
-  `usocket.getaddrinfo()`.
+  `socket.getaddrinfo()`.
 * IPv6: *(ipv6_address, port, flowinfo, scopeid)*, where *ipv6_address*
   is a string with colon-notation numeric IPv6 address, e.g. ``"2001:db8::1"``,
   and *port* is an integer port number in the range 1-65535. *flowinfo*
   must be 0. *scopeid* is the interface scope identifier for link-local
   addresses. Note the domain names are not accepted as *ipv6_address*,
-  they should be resolved first using `usocket.getaddrinfo()`. Availability
+  they should be resolved first using `socket.getaddrinfo()`. Availability
   of IPv6 support depends on a :term:`MicroPython port`.
 
 Functions
@@ -94,17 +94,17 @@ Functions
 
    The following example shows how to connect to a given url::
 
-      s = usocket.socket()
+      s = socket.socket()
       # This assumes that if "type" is not specified, an address for
       # SOCK_STREAM will be returned, which may be not true
-      s.connect(usocket.getaddrinfo('www.micropython.org', 80)[0][-1])
+      s.connect(socket.getaddrinfo('www.micropython.org', 80)[0][-1])
 
    Recommended use of filtering params::
 
-      s = usocket.socket()
+      s = socket.socket()
       # Guaranteed to return an address which can be connect'ed to for
       # stream operation.
-      s.connect(usocket.getaddrinfo('www.micropython.org', 80, 0, SOCK_STREAM)[0][-1])
+      s.connect(socket.getaddrinfo('www.micropython.org', 80, 0, SOCK_STREAM)[0][-1])
 
    .. admonition:: Difference to CPython
       :class: attention
@@ -113,7 +113,7 @@ Functions
       of error in this function. MicroPython doesn't have ``socket.gaierror``
       and raises OSError directly. Note that error numbers of `getaddrinfo()`
       form a separate namespace and may not match error numbers from
-      the :mod:`uerrno` module. To distinguish `getaddrinfo()` errors, they are
+      the :mod:`errno` module. To distinguish `getaddrinfo()` errors, they are
       represented by negative numbers, whereas standard system errors are
       positive numbers (error numbers are accessible using ``e.args[0]`` property
       from an exception object). The use of negative values is a provisional
@@ -124,7 +124,7 @@ Functions
    Convert a binary network address *bin_addr* of the given address family *af*
    to a textual representation::
 
-        >>> usocket.inet_ntop(usocket.AF_INET, b"\x7f\0\0\1")
+        >>> socket.inet_ntop(socket.AF_INET, b"\x7f\0\0\1")
         '127.0.0.1'
 
 .. function:: inet_pton(af, txt_addr)
@@ -132,7 +132,7 @@ Functions
    Convert a textual network address *txt_addr* of the given address family *af*
    to a binary representation::
 
-        >>> usocket.inet_pton(usocket.AF_INET, "1.2.3.4")
+        >>> socket.inet_pton(socket.AF_INET, "1.2.3.4")
         b'\x01\x02\x03\x04'
 
 Constants
@@ -152,17 +152,17 @@ Constants
           IPPROTO_TCP
 
    IP protocol numbers. Availability depends on a particular :term:`MicroPython port`.
-   Note that you don't need to specify these in a call to `usocket.socket()`,
+   Note that you don't need to specify these in a call to `socket.socket()`,
    because `SOCK_STREAM` socket type automatically selects `IPPROTO_TCP`, and
    `SOCK_DGRAM` - `IPPROTO_UDP`. Thus, the only real use of these constants
    is as an argument to `setsockopt()`.
 
-.. data:: usocket.SOL_*
+.. data:: socket.SOL_*
 
    Socket option levels (an argument to `setsockopt()`). The exact
    inventory depends on a :term:`MicroPython port`.
 
-.. data:: usocket.SO_*
+.. data:: socket.SO_*
 
    Socket options (an argument to `setsockopt()`). The exact
    inventory depends on a :term:`MicroPython port`.
@@ -260,7 +260,7 @@ Methods
    is put in blocking mode.
 
    Not every :term:`MicroPython port` supports this method. A more portable and
-   generic solution is to use `uselect.poll` object. This allows to wait on
+   generic solution is to use `select.poll` object. This allows to wait on
    multiple objects at the same time (and not just on sockets, but on generic
    `stream` objects which support polling). Example::
 
@@ -269,8 +269,8 @@ Methods
         s.read(10)  # may timeout
 
         # Use:
-        poller = uselect.poll()
-        poller.register(s, uselect.POLLIN)
+        poller = select.poll()
+        poller.register(s, select.POLLIN)
         res = poller.poll(1000)  # time in milliseconds
         if not res:
             # s is still not ready for input, i.e. operation timed out
@@ -342,7 +342,7 @@ Methods
 
    Return value: number of bytes written.
 
-.. exception:: usocket.error
+.. exception:: socket.error
 
    MicroPython does NOT have this exception.
 
diff --git a/docs/library/ssl.rst b/docs/library/ssl.rst
index 77d278d41df52..feaf3825c410d 100644
--- a/docs/library/ssl.rst
+++ b/docs/library/ssl.rst
@@ -1,7 +1,7 @@
-:mod:`ussl` -- SSL/TLS module
+:mod:`ssl` -- SSL/TLS module
 =============================
 
-.. module:: ussl
+.. module:: ssl
    :synopsis: TLS/SSL wrapper for socket objects
 
 |see_cpython_module| :mod:`python:ssl`.
@@ -13,14 +13,14 @@ facilities for network sockets, both client-side and server-side.
 Functions
 ---------
 
-.. function:: ussl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None, do_handshake=True)
+.. function:: ssl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None, do_handshake=True)
 
-   Takes a `stream` *sock* (usually usocket.socket instance of ``SOCK_STREAM`` type),
+   Takes a `stream` *sock* (usually socket.socket instance of ``SOCK_STREAM`` type),
    and returns an instance of ssl.SSLSocket, which wraps the underlying stream in
    an SSL context. Returned object has the usual `stream` interface methods like
    ``read()``, ``write()``, etc.
    A server-side SSL socket should be created from a normal socket returned from
-   :meth:`~usocket.socket.accept()` on a non-SSL listening server socket.
+   :meth:`~socket.socket.accept()` on a non-SSL listening server socket.
 
    - *do_handshake* determines whether the handshake is done as part of the ``wrap_socket``
      or whether it is deferred to be done as part of the initial reads or writes
@@ -36,7 +36,7 @@ Functions
 
 .. warning::
 
-   Some implementations of ``ussl`` module do NOT validate server certificates,
+   Some implementations of ``ssl`` module do NOT validate server certificates,
    which makes an SSL connection established prone to man-in-the-middle attacks.
 
    CPython's ``wrap_socket`` returns an ``SSLSocket`` object which has methods typical
@@ -54,8 +54,8 @@ Exceptions
 Constants
 ---------
 
-.. data:: ussl.CERT_NONE
-          ussl.CERT_OPTIONAL
-          ussl.CERT_REQUIRED
+.. data:: ssl.CERT_NONE
+          ssl.CERT_OPTIONAL
+          ssl.CERT_REQUIRED
 
     Supported values for *cert_reqs* parameter.
diff --git a/docs/library/struct.rst b/docs/library/struct.rst
index bfcd84e2d8efe..b788cb977dbac 100644
--- a/docs/library/struct.rst
+++ b/docs/library/struct.rst
@@ -1,7 +1,7 @@
-:mod:`ustruct` -- pack and unpack primitive data types
+:mod:`struct` -- pack and unpack primitive data types
 ======================================================
 
-.. module:: ustruct
+.. module:: struct
    :synopsis: pack and unpack primitive data types
 
 |see_cpython_module| :mod:`python:struct`.
diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index 96016438507cf..b6c73a6b8f015 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -1,7 +1,7 @@
-:mod:`usys` -- system specific functions
+:mod:`sys` -- system specific functions
 ========================================
 
-.. module:: usys
+.. module:: sys
    :synopsis: system specific functions
 
 |see_cpython_module| :mod:`python:sys`.
@@ -28,10 +28,10 @@ Functions
       This function is a MicroPython extension intended to provide similar
       functionality to the :mod:`atexit` module in CPython.
 
-.. function:: print_exception(exc, file=usys.stdout, /)
+.. function:: print_exception(exc, file=sys.stdout, /)
 
    Print exception with a traceback to a file-like object *file* (or
-   `usys.stdout` by default).
+   `sys.stdout` by default).
 
    .. admonition:: Difference to CPython
       :class: attention
@@ -84,7 +84,7 @@ Constants
    value directly, but instead count number of bits in it::
 
     bits = 0
-    v = usys.maxsize
+    v = sys.maxsize
     while v:
         bits += 1
         v >>= 1
@@ -113,7 +113,7 @@ Constants
    is an identifier of a board, e.g. ``"pyboard"`` for the original MicroPython
    reference board. It thus can be used to distinguish one board from another.
    If you need to check whether your program runs on MicroPython (vs other
-   Python implementation), use `usys.implementation` instead.
+   Python implementation), use `sys.implementation` instead.
 
 .. data:: stderr
 
diff --git a/docs/library/time.rst b/docs/library/time.rst
index ef2a572aa4f22..10e5add29e880 100644
--- a/docs/library/time.rst
+++ b/docs/library/time.rst
@@ -1,12 +1,12 @@
-:mod:`utime` -- time related functions
+:mod:`time` -- time related functions
 ======================================
 
-.. module:: utime
+.. module:: time
    :synopsis: time related functions
 
 |see_cpython_module| :mod:`python:time`.
 
-The ``utime`` module provides functions for getting the current time and date,
+The ``time`` module provides functions for getting the current time and date,
 measuring time intervals, and for delays.
 
 **Time Epoch**: Unix port uses standard for POSIX systems epoch of
@@ -119,7 +119,7 @@ Functions
    in the system. This is usually CPU clocks, and that's why the function is named that
    way. But it doesn't have to be a CPU clock, some other timing source available in a
    system (e.g. high-resolution timer) can be used instead. The exact timing unit
-   (resolution) of this function is not specified on ``utime`` module level, but
+   (resolution) of this function is not specified on ``time`` module level, but
    documentation for a specific port may provide more specific information. This
    function is intended for very fine benchmarking or very tight real-time loops.
    Avoid using it in portable code.
diff --git a/docs/library/uctypes.rst b/docs/library/uctypes.rst
index b3343beb7e4a8..803ddacdcef5e 100644
--- a/docs/library/uctypes.rst
+++ b/docs/library/uctypes.rst
@@ -19,7 +19,7 @@ sub-fields.
 
 .. seealso::
 
-    Module :mod:`ustruct`
+    Module :mod:`struct`
         Standard Python way to access binary data structures (doesn't scale
         well to large and complex structures).
 
diff --git a/docs/library/zlib.rst b/docs/library/zlib.rst
index d40c46145ace9..2738b42eea12d 100644
--- a/docs/library/zlib.rst
+++ b/docs/library/zlib.rst
@@ -1,7 +1,7 @@
-:mod:`uzlib` -- zlib decompression
+:mod:`zlib` -- zlib decompression
 ==================================
 
-.. module:: uzlib
+.. module:: zlib
    :synopsis: zlib decompression
 
 |see_cpython_module| :mod:`python:zlib`.
diff --git a/docs/pyboard/quickref.rst b/docs/pyboard/quickref.rst
index 49b67eee425a6..ed56811ddb462 100644
--- a/docs/pyboard/quickref.rst
+++ b/docs/pyboard/quickref.rst
@@ -45,7 +45,7 @@ See :mod:`pyb`. ::
 Delay and timing
 ----------------
 
-Use the :mod:`time <utime>` module::
+Use the :mod:`time <time>` module::
 
     import time
 
diff --git a/docs/reference/constrained.rst b/docs/reference/constrained.rst
index 9c68bab9a13e0..2a5f9d7fdb5a9 100644
--- a/docs/reference/constrained.rst
+++ b/docs/reference/constrained.rst
@@ -122,7 +122,7 @@ execution from Flash, RAM may be saved as follows. The data should be located in
 Python modules and frozen as bytecode. The data must be defined as `bytes`
 objects. The compiler 'knows' that `bytes` objects are immutable and ensures
 that the objects remain in flash memory rather than being copied to RAM. The
-`ustruct` module can assist in converting between `bytes` types and other
+`struct` module can assist in converting between `bytes` types and other
 Python built-in types.
 
 When considering the implications of frozen bytecode, note that in Python
@@ -261,7 +261,7 @@ were a string.
 The Python funcitons `eval` and `exec` invoke the compiler at runtime, which
 requires significant amounts of RAM. Note that the ``pickle`` library from
 `micropython-lib` employs `exec`. It may be more RAM efficient to use the
-`ujson` library for object serialisation.
+`json` library for object serialisation.
 
 **Storing strings in flash**
 
@@ -444,7 +444,7 @@ RAM usage and speed.
 
 Where variables are required whose size is neither a byte nor a machine word
 there are standard libraries which can assist in storing these efficiently and
-in performing conversions. See the `array`, `ustruct` and `uctypes`
+in performing conversions. See the `array`, `struct` and `uctypes`
 modules.
 
 Footnote: gc.collect() return value
diff --git a/docs/reference/filesystem.rst b/docs/reference/filesystem.rst
index 9e7e6212dc679..114e5973503f2 100644
--- a/docs/reference/filesystem.rst
+++ b/docs/reference/filesystem.rst
@@ -40,7 +40,7 @@ Block devices
 -------------
 
 A block device is an instance of a class that implements the
-:class:`uos.AbstractBlockDev` protocol.
+:class:`os.AbstractBlockDev` protocol.
 
 Built-in block devices
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -116,8 +116,8 @@ It can be used as follows::
 
 An example of a block device that supports both the simple and extended
 interface (i.e. both signatures and behaviours of the
-:meth:`uos.AbstractBlockDev.readblocks` and
-:meth:`uos.AbstractBlockDev.writeblocks` methods) is::
+:meth:`os.AbstractBlockDev.readblocks` and
+:meth:`os.AbstractBlockDev.writeblocks` methods) is::
 
     class RAMBlockDev:
         def __init__(self, block_size, num_blocks):
@@ -148,7 +148,7 @@ interface (i.e. both signatures and behaviours of the
                 return 0
 
 As it supports the extended interface, it can be used with :class:`littlefs
-<uos.VfsLfs2>`::
+<os.VfsLfs2>`::
 
     import os
 
@@ -166,8 +166,8 @@ normally would be used from Python code, for example::
 Filesystems
 -----------
 
-MicroPython ports can provide implementations of :class:`FAT <uos.VfsFat>`,
-:class:`littlefs v1 <uos.VfsLfs1>` and :class:`littlefs v2 <uos.VfsLfs2>`.
+MicroPython ports can provide implementations of :class:`FAT <os.VfsFat>`,
+:class:`littlefs v1 <os.VfsLfs1>` and :class:`littlefs v2 <os.VfsLfs2>`.
 
 The following table shows which filesystems are included in the firmware by
 default for given port/board combinations, however they can be optionally
diff --git a/docs/reference/glossary.rst b/docs/reference/glossary.rst
index 27a66aa76c075..da951189e2045 100644
--- a/docs/reference/glossary.rst
+++ b/docs/reference/glossary.rst
@@ -184,7 +184,7 @@ Glossary
         ``close()``, etc. A stream is an important concept in MicroPython;
         many I/O objects implement the stream interface, and thus can be used
         consistently and interchangeably in different contexts. For more
-        information on streams in MicroPython, see the `uio` module.
+        information on streams in MicroPython, see the `io` module.
 
     UART
         Acronym for "Universal Asynchronous Receiver/Transmitter". This is a
diff --git a/docs/reference/speed_python.rst b/docs/reference/speed_python.rst
index aa9777859242f..a563b2d36c821 100644
--- a/docs/reference/speed_python.rst
+++ b/docs/reference/speed_python.rst
@@ -123,7 +123,7 @@ This is a process known as profiling and is covered in textbooks and
 (for standard Python) supported by various software tools. For the type of
 smaller embedded application likely to be running on MicroPython platforms
 the slowest function or method can usually be established by judicious use
-of the timing ``ticks`` group of functions documented in `utime`.
+of the timing ``ticks`` group of functions documented in `time`.
 Code execution time can be measured in ms, us, or CPU cycles.
 
 The following enables any function or method to be timed by adding an
@@ -134,9 +134,9 @@ The following enables any function or method to be timed by adding an
     def timed_function(f, *args, **kwargs):
         myname = str(f).split(' ')[1]
         def new_func(*args, **kwargs):
-            t = utime.ticks_us()
+            t = time.ticks_us()
             result = f(*args, **kwargs)
-            delta = utime.ticks_diff(utime.ticks_us(), t)
+            delta = time.ticks_diff(time.ticks_us(), t)
             print('Function {} Time = {:6.3f}ms'.format(myname, delta/1000))
             return result
         return new_func
diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index 65e98d700b1fa..ac9cdb86cb74d 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -45,7 +45,7 @@ The :mod:`rp2` module::
 Delay and timing
 ----------------
 
-Use the :mod:`time <utime>` module::
+Use the :mod:`time <time>` module::
 
     import time
 
diff --git a/docs/wipy/general.rst b/docs/wipy/general.rst
index b1109c495ad17..fb5d90de590a7 100644
--- a/docs/wipy/general.rst
+++ b/docs/wipy/general.rst
@@ -296,7 +296,7 @@ and put it in '/flash/cert/'. Then do::
   ss = ssl.wrap_socket(s, cert_reqs=ssl.CERT_REQUIRED, ca_certs='/flash/cert/ca.pem')
   ss.connect(socket.getaddrinfo('cloud.blynk.cc', 8441)[0][-1])
 
-Incompatibilities in uhashlib module
+Incompatibilities in hashlib module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Due to hardware implementation details of the WiPy, data must be buffered before being
@@ -310,7 +310,7 @@ initial one) is a multiple of 4 bytes.** The last chunk may be of any length.
 
 Example::
 
-   hash = uhashlib.sha1('abcd1234', 1001)    # length of the initial piece is multiple of 4 bytes
+   hash = hashlib.sha1('abcd1234', 1001)    # length of the initial piece is multiple of 4 bytes
    hash.update('1234')                       # also multiple of 4 bytes
    ...
    hash.update('12345')                      # last chunk may be of any length
@@ -366,7 +366,7 @@ Adhoc VFS-like support
 ~~~~~~~~~~~~~~~~~~~~~~
 
 WiPy doesn't implement full MicroPython VFS support, instead following
-functions are defined in ``uos`` module:
+functions are defined in ``os`` module:
 
 .. function:: mount(block_device, mount_point, \*, readonly=False)
 

From cd7787650b553be80c8231e5ad39e0c497eb891e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 12 Aug 2021 15:28:12 +1000
Subject: [PATCH 3/4] tools/gen-cpydiff.py: Don't rename foo to ufoo in diff
 output.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/gen-cpydiff.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index c9f58ec505d3a..1d458d3dcd279 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -50,7 +50,6 @@
 INDEX = "index.rst"
 
 HEADER = ".. This document was generated by tools/gen-cpydiff.py\n\n"
-UIMPORTLIST = {"struct", "collections", "json"}
 CLASSMAP = {"Core": "Core language", "Types": "Builtin types"}
 INDEXPRIORITY = ["syntax", "core_language", "builtin_types", "modules"]
 RSTCHARS = ["=", "-", "~", "`", ":"]
@@ -94,21 +93,12 @@ def readfiles():
     return files
 
 
-def uimports(code):
-    """converts CPython module names into MicroPython equivalents"""
-    for uimport in UIMPORTLIST:
-        uimport = bytes(uimport, "utf8")
-        code = code.replace(uimport, b"u" + uimport)
-    return code
-
-
 def run_tests(tests):
     """executes all tests"""
     results = []
     for test in tests:
         with open(TESTPATH + test.name, "rb") as f:
-            input_cpy = f.read()
-        input_upy = uimports(input_cpy)
+            input_py = f.read()
 
         process = subprocess.Popen(
             CPYTHON3,
@@ -117,7 +107,7 @@ def run_tests(tests):
             stdin=subprocess.PIPE,
             stderr=subprocess.PIPE,
         )
-        output_cpy = [com.decode("utf8") for com in process.communicate(input_cpy)]
+        output_cpy = [com.decode("utf8") for com in process.communicate(input_py)]
 
         process = subprocess.Popen(
             MICROPYTHON,
@@ -126,7 +116,7 @@ def run_tests(tests):
             stdin=subprocess.PIPE,
             stderr=subprocess.PIPE,
         )
-        output_upy = [com.decode("utf8") for com in process.communicate(input_upy)]
+        output_upy = [com.decode("utf8") for com in process.communicate(input_py)]
 
         if output_cpy[0] == output_upy[0] and output_cpy[1] == output_upy[1]:
             status = "Supported"

From f69cc41a706660d889656fbb0c8db34f7547fc57 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 12 Aug 2021 15:15:03 +1000
Subject: [PATCH 4/4] docs/library/index.rst: Clarify module naming and
 purpose.

Adds section about extending built-in modules from Python.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/index.rst      | 101 ++++++++++++++++++------------------
 docs/reference/packages.rst |   2 +
 2 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/docs/library/index.rst b/docs/library/index.rst
index f373da426a1c8..70939d02bd103 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -7,47 +7,39 @@ MicroPython libraries
 
    Important summary of this section
 
-   * MicroPython implements a subset of Python functionality for each module.
-   * To ease extensibility, MicroPython versions of standard Python modules
-     usually have ``u`` ("micro") prefix.
-   * Any particular MicroPython variant or port may miss any feature/function
-     described in this general documentation (due to resource constraints or
-     other limitations).
-
+   * MicroPython provides built-in modules that mirror the functionality of the
+     Python standard library (e.g. :mod:`os`, :mod:`time`), as well as
+     MicroPython-specific modules (e.g. :mod:`bluetooth`, :mod:`machine`).
+   * Most standard library modules implement a subset of the functionality of
+     the equivalent Python module, and in a few cases provide some
+     MicroPython-specific extensions (e.g. :mod:`array`, :mod:`os`)
+   * Due to resource constraints or other limitations, some ports or firmware
+     versions may not include all the functionality documented here.
+   * To allow for extensibility, the built-in modules can be extended from
+     Python code loaded onto the device.
 
 This chapter describes modules (function and class libraries) which are built
-into MicroPython. There are a few categories of such modules:
-
-* Modules which implement a subset of standard Python functionality and are not
-  intended to be extended by the user.
-* Modules which implement a subset of Python functionality, with a provision
-  for extension by the user (via Python code).
-* Modules which implement MicroPython extensions to the Python standard libraries.
-* Modules specific to a particular :term:`MicroPython port` and thus not portable.
-
-Note about the availability of the modules and their contents: This documentation
-in general aspires to describe all modules and functions/classes which are
-implemented in MicroPython project. However, MicroPython is highly configurable, and
-each port to a particular board/embedded system makes available only a subset
-of MicroPython libraries. For officially supported ports, there is an effort
-to either filter out non-applicable items, or mark individual descriptions
-with "Availability:" clauses describing which ports provide a given feature.
-
-With that in mind, please still be warned that some functions/classes
-in a module (or even the entire module) described in this documentation **may be
-unavailable** in a particular build of MicroPython on a particular system. The
-best place to find general information of the availability/non-availability
-of a particular feature is the "General Information" section which contains
-information pertaining to a specific :term:`MicroPython port`.
+into MicroPython. This documentation in general aspires to describe all modules
+and functions/classes which are implemented in the MicroPython project.
+However, MicroPython is highly configurable, and each port to a particular
+board/embedded system may include only a subset of the available MicroPython
+libraries.
+
+With that in mind, please be warned that some functions/classes in a module (or
+even the entire module) described in this documentation **may be unavailable**
+in a particular build of MicroPython on a particular system. The best place to
+find general information of the availability/non-availability of a particular
+feature is the "General Information" section which contains information
+pertaining to a specific :term:`MicroPython port`.
 
 On some ports you are able to discover the available, built-in libraries that
-can be imported by entering the following at the REPL::
+can be imported by entering the following at the :term:`REPL`::
 
     help('modules')
 
 Beyond the built-in libraries described in this documentation, many more
 modules from the Python standard library, as well as further MicroPython
-extensions to it, can be found in `micropython-lib`.
+extensions to it, can be found in :term:`micropython-lib`.
 
 Python standard libraries and micro-libraries
 ---------------------------------------------
@@ -55,20 +47,7 @@ Python standard libraries and micro-libraries
 The following standard Python libraries have been "micro-ified" to fit in with
 the philosophy of MicroPython.  They provide the core functionality of that
 module and are intended to be a drop-in replacement for the standard Python
-library.  Some modules below use a standard Python name, but prefixed with "u",
-e.g. ``json`` instead of ``json``. This is to signify that such a module is
-micro-library, i.e. implements only a subset of CPython module functionality.
-By naming them differently, a user has a choice to write a Python-level module
-to extend functionality for better compatibility with CPython (indeed, this is
-what done by the `micropython-lib` project mentioned above).
-
-On some embedded platforms, where it may be cumbersome to add Python-level
-wrapper modules to achieve naming compatibility with CPython, micro-modules
-are available both by their u-name, and also by their non-u-name.  The
-non-u-name can be overridden by a file of that name in your library path (``sys.path``).
-For example, ``import json`` will first search for a file ``json.py`` (or package
-directory ``json``) and load that module if it is found.  If nothing is found,
-it will fallback to loading the built-in ``json`` module.
+library.
 
 .. toctree::
    :maxdepth: 1
@@ -131,7 +110,7 @@ To access platform-specific hardware use the appropriate library, e.g.
 
 
 Libraries specific to the pyboard
----------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following libraries are specific to the pyboard.
 
@@ -143,7 +122,7 @@ The following libraries are specific to the pyboard.
 
 
 Libraries specific to the WiPy
-------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following libraries and classes are specific to the WiPy.
 
@@ -156,7 +135,7 @@ The following libraries and classes are specific to the WiPy.
 
 
 Libraries specific to the ESP8266 and ESP32
--------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following libraries are specific to the ESP8266 and ESP32.
 
@@ -168,7 +147,7 @@ The following libraries are specific to the ESP8266 and ESP32.
 
 
 Libraries specific to the RP2040
---------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following libraries are specific to the RP2040, as used in the Raspberry Pi Pico.
 
@@ -176,3 +155,25 @@ The following libraries are specific to the RP2040, as used in the Raspberry Pi
   :maxdepth: 2
 
   rp2.rst
+
+
+Extending built-in libraries from Python
+----------------------------------------
+
+In most cases, the above modules are actually named ``umodule`` rather than
+``module``, but MicroPython will alias any module prefixed with a ``u`` to the
+non-``u`` version. However a file (or :term:``frozen module``) named
+``module.py`` will take precedence over this alias.
+
+This allows the user to provide an extended implementation of a built-in library
+(perhaps to provide additional CPython compatibility). The user-provided module
+(in ``module.py``) can still use the built-in functionality by importing
+``umodule`` directly. This is used extensively in :term:`micropython-lib`. See
+:ref:`packages` for more information.
+
+This applies to both the Python standard libraries (e.g. ``os``, ``time``, etc),
+but also the MicroPython libraries too (e.g. ``machine``, ``bluetooth``, etc).
+The main exception is the port-specific libraries (``pyb``, ``esp``, etc).
+
+*Other than when you specifically want to force the use of the built-in module,
+we recommend always using ``import module`` rather than ``import umodule``.*
diff --git a/docs/reference/packages.rst b/docs/reference/packages.rst
index e9adfc176ea73..eb44992ed6324 100644
--- a/docs/reference/packages.rst
+++ b/docs/reference/packages.rst
@@ -1,3 +1,5 @@
+.. _packages:
+
 Distribution packages, package management, and deploying applications
 =====================================================================