diff --git a/chips/rp1.json b/chips/rp1.json
index 37c2b0e..4e9e9ef 100644
--- a/chips/rp1.json
+++ b/chips/rp1.json
@@ -4,8 +4,8 @@
         "0": {"name": "GPIO 0", "alt_modes": [
             {"name": "SPI0_SIO3", "type": "SPI"},
             {"name": "DPI_PCLK", "type": "DPI"},
-            {"name": "TXD1", "type": "UART"},
-            {"name": "SDA0", "type": "I2C"},
+            {"name": "UART1_TXD", "type": "UART"},
+            {"name": "I2C0_SDA", "type": "I2C"},
             {"name": "", "type": "UNUSED"},
             {"name": "SYS_RIO00", "type": "???"},
             {"name": "PROC_RIO00", "type": "???"},
@@ -15,8 +15,8 @@
         "1": {"name": "GPIO 1", "alt_modes": [
             {"name": "SPI0_SIO2", "type": "SPI"},
             {"name": "DPI_DE", "type": "DPI"},
-            {"name": "RXD1", "type": "UART"},
-            {"name": "SCL0", "type": "I2C"},
+            {"name": "UART1_RXD", "type": "UART"},
+            {"name": "I2C0_SCL", "type": "I2C"},
             {"name": "", "type": "UNUSED"},
             {"name": "SYS_RIO01", "type": "???"},
             {"name": "PROC_RIO01", "type": "???"},
@@ -26,8 +26,8 @@
         "2": {"name": "GPIO 2", "alt_modes": [
             {"name": "SPI0_CE3", "type": "SPI"},
             {"name": "DPI_VSYNC", "type": "DPI"},
-            {"name": "CTS1", "type": "UART"},
-            {"name": "SDA1", "type": "I2C"},
+            {"name": "UART1_CTS", "type": "UART"},
+            {"name": "I2C1_SDA", "type": "I2C"},
             {"name": "IR_RX0", "type": "???"},
             {"name": "SYS_RIO02", "type": "???"},
             {"name": "PROC_RIO02", "type": "???"},
@@ -37,8 +37,8 @@
         "3": {"name": "GPIO 3", "alt_modes": [
             {"name": "SPI0_CE2", "type": "SPI"},
             {"name": "DPI_HSYNC", "type": "DPI"},
-            {"name": "RTS1", "type": "UART"},
-            {"name": "SCL1", "type": "I2C"},
+            {"name": "UART1_RTS", "type": "UART"},
+            {"name": "I2C1_SCL", "type": "I2C"},
             {"name": "IR_TX0", "type": "???"},
             {"name": "SYS_RIO03", "type": "???"},
             {"name": "PROC_RIO03", "type": "???"},
@@ -48,8 +48,8 @@
         "4": {"name": "GPIO 4", "alt_modes": [
             {"name": "GPCLK0", "type": "GPCLK"},
             {"name": "DPI_D0", "type": "DPI"},
-            {"name": "TXD2", "type": "UART"},
-            {"name": "SDA2", "type": "I2C"},
+            {"name": "UART2_TXD", "type": "UART"},
+            {"name": "I2C2_SDA", "type": "I2C"},
             {"name": "RI0", "type": "???"},
             {"name": "SYS_RIO04", "type": "???"},
             {"name": "PROC_RIO04", "type": "???"},
@@ -59,9 +59,9 @@
         "5": {"name": "GPIO 5", "alt_modes": [
             {"name": "GPCLK1", "type": "GPCLK"},
             {"name": "DPI_D1", "type": "DPI"},
-            {"name": "RXD2", "type": "UART"},
-            {"name": "SCL2", "type": "I2C"},
-            {"name": "DTR0", "type": "UART"},
+            {"name": "UART2_RXD", "type": "UART"},
+            {"name": "I2C2_SCL", "type": "I2C"},
+            {"name": "UART0_DTR", "type": "UART"},
             {"name": "SYS_RIO05", "type": "???"},
             {"name": "PROC_RIO05", "type": "???"},
             {"name": "PIO5", "type": "PIO"},
@@ -70,8 +70,8 @@
         "6": {"name": "GPIO 6", "alt_modes": [
             {"name": "GPCLK2", "type": "GPCLK"},
             {"name": "DPI_D2", "type": "DPI"},
-            {"name": "CTS2", "type": "UART"},
-            {"name": "SDA3", "type": "I2C"},
+            {"name": "UART2_CTS", "type": "UART"},
+            {"name": "I2C3_SDA", "type": "I2C"},
             {"name": "DCD0", "type": "???"},
             {"name": "SYS_RIO06", "type": "???"},
             {"name": "PROC_RIO06", "type": "???"},
@@ -81,8 +81,8 @@
         "7": {"name": "GPIO 7", "alt_modes": [
             {"name": "SPI0_CE1", "type": "SPI"},
             {"name": "DPI_D3", "type": "DPI"},
-            {"name": "RTS2", "type": "UART"},
-            {"name": "SCL3", "type": "I2C"},
+            {"name": "UART2_RTS", "type": "UART"},
+            {"name": "I2C3_SCL", "type": "I2C"},
             {"name": "DSR0", "type": "???"},
             {"name": "SYS_RIO07", "type": "???"},
             {"name": "PROC_RIO07", "type": "???"},
@@ -92,8 +92,8 @@
         "8": {"name": "GPIO 8", "alt_modes": [
             {"name": "SPI0_CE0", "type": "SPI"},
             {"name": "DPI_D4", "type": "DPI"},
-            {"name": "TXD3", "type": "UART"},
-            {"name": "SDA0", "type": "I2C"},
+            {"name": "UART3_TXD", "type": "UART"},
+            {"name": "I2C0_SDA", "type": "I2C"},
             {"name": "", "type": "UNUSED"},
             {"name": "SYS_RIO08", "type": "???"},
             {"name": "PROC_RIO08", "type": "???"},
@@ -103,8 +103,8 @@
         "9": {"name": "GPIO 9", "alt_modes": [
             {"name": "SPI0_MISO", "type": "SPI"},
             {"name": "DPI_D5", "type": "DPI"},
-            {"name": "RXD3", "type": "UART"},
-            {"name": "SCL0", "type": "I2C"},
+            {"name": "UART3_RXD", "type": "UART"},
+            {"name": "I2C0_SCL", "type": "I2C"},
             {"name": "", "type": "UNUSED"},
             {"name": "SYS_RIO09", "type": "???"},
             {"name": "PROC_RIO09", "type": "???"},
@@ -114,8 +114,8 @@
         "10": {"name": "GPIO 10", "alt_modes": [
             {"name": "SPI0_MOSI", "type": "SPI"},
             {"name": "DPI_D6", "type": "DPI"},
-            {"name": "CTS3", "type": "UART"},
-            {"name": "SDA1", "type": "I2C"},
+            {"name": "UART3_CTS", "type": "UART"},
+            {"name": "I2C1_SDA", "type": "I2C"},
             {"name": "", "type": "UNUSED"},
             {"name": "SYS_RIO010", "type": "???"},
             {"name": "PROC_RIO010", "type": "???"},
@@ -125,8 +125,8 @@
         "11": {"name": "GPIO 11", "alt_modes": [
             {"name": "SPI0_SCLK", "type": "SPI"},
             {"name": "DPI_D7", "type": "DPI"},
-            {"name": "RTS3", "type": "UART"},
-            {"name": "SCL1", "type": "I2C"},
+            {"name": "UART3_RTS", "type": "UART"},
+            {"name": "I2C1_SCL", "type": "I2C"},
             {"name": "", "type": "UNUSED"},
             {"name": "SYS_RIO011", "type": "???"},
             {"name": "PROC_RIO011", "type": "???"},
@@ -136,8 +136,8 @@
         "12": {"name": "GPIO 12", "alt_modes": [
             {"name": "PWM0_CHAN0", "type": "PWM"},
             {"name": "DPI_D8", "type": "DPI"},
-            {"name": "TXD4", "type": "UART"},
-            {"name": "SDA2", "type": "I2C"},
+            {"name": "UART4_TXD", "type": "UART"},
+            {"name": "I2C2_SDA", "type": "I2C"},
             {"name": "AAUD_LEFT", "type": "???"},
             {"name": "SYS_RIO012", "type": "???"},
             {"name": "PROC_RIO012", "type": "???"},
@@ -147,8 +147,8 @@
         "13": {"name": "GPIO 13", "alt_modes": [
             {"name": "PWM0_CHAN1", "type": "PWM"},
             {"name": "DPI_D9", "type": "DPI"},
-            {"name": "RXD4", "type": "UART"},
-            {"name": "SCL2", "type": "I2C"},
+            {"name": "UART4_RXD", "type": "UART"},
+            {"name": "I2C2_SCL", "type": "I2C"},
             {"name": "AAUD_RIGHT", "type": "???"},
             {"name": "SYS_RIO013", "type": "???"},
             {"name": "PROC_RIO013", "type": "???"},
@@ -158,9 +158,9 @@
         "14": {"name": "GPIO 14", "alt_modes": [
             {"name": "PWM0_CHAN2", "type": "PWM"},
             {"name": "DPI_D10", "type": "DPI"},
-            {"name": "CTS4", "type": "UART"},
-            {"name": "SDA3", "type": "I2C"},
-            {"name": "TXD0", "type": "UART"},
+            {"name": "UART4_CTS", "type": "UART"},
+            {"name": "I2C3_SDA", "type": "I2C"},
+            {"name": "UART0_TXD", "type": "UART"},
             {"name": "SYS_RIO014", "type": "???"},
             {"name": "PROC_RIO014", "type": "???"},
             {"name": "PIO14", "type": "PIO"}
@@ -168,9 +168,9 @@
         "15": {"name": "GPIO 15", "alt_modes": [
             {"name": "PWM0_CHAN3", "type": "PWM"},
             {"name": "DPI_D11", "type": "DPI"},
-            {"name": "RTS4", "type": "UART"},
-            {"name": "SCL3", "type": "I2C"},
-            {"name": "RXD0", "type": "UART"},
+            {"name": "UART4_RTS", "type": "UART"},
+            {"name": "I2C3_SCL", "type": "I2C"},
+            {"name": "UART0_RXD", "type": "UART"},
             {"name": "SYS_RIO015", "type": "???"},
             {"name": "PROC_RIO015", "type": "???"},
             {"name": "PIO15", "type": "PIO"},
@@ -181,7 +181,7 @@
             {"name": "DPI_D12", "type": "DPI"},
             {"name": "DSI0_TE_EXT", "type": "DSI"},
             {"name": "", "type": "UNUSED"},
-            {"name": "CTS0", "type": "UART"},
+            {"name": "UART0_CTS", "type": "UART"},
             {"name": "SYS_RIO016", "type": "???"},
             {"name": "PROC_RIO016", "type": "???"},
             {"name": "PIO16", "type": "PIO"},
@@ -192,7 +192,7 @@
             {"name": "DPI_D13", "type": "DPI"},
             {"name": "DSI1_TE_EXT", "type": "DSI"},
             {"name": "", "type": "UNUSED"},
-            {"name": "RTS0", "type": "UART"},
+            {"name": "UART0_RTS", "type": "UART"},
             {"name": "SYS_RIO017", "type": "???"},
             {"name": "PROC_RIO017", "type": "???"},
             {"name": "PIO17", "type": "PIO"},
@@ -257,7 +257,7 @@
             {"name": "SD0_CMD", "type": "SDIO"},
             {"name": "DPI_D19", "type": "DPI"},
             {"name": "I2S0_SDO1", "type": "I2S"},
-            {"name": "SCL3", "type": "I2C"},
+            {"name": "I2C3_SCL", "type": "I2C"},
             {"name": "I2S1_SDO1", "type": "I2S"},
             {"name": "SYS_RIO023", "type": "???"},
             {"name": "PROC_RIO023", "type": "???"},