diff --git a/pinout b/pinout
index 93693a9..b15f8d4 100755
--- a/pinout
+++ b/pinout
@@ -34,34 +34,34 @@
     Kind.GND:   (Style.DARK_GRAY, 'GND',   'Ground'),
     Kind.POWER: (Style.RED,       'POWER', 'Power: +5V or +3.3V'),
     Kind.I2C:   (Style.GREEN,     'I2C',   'Inter-Integrated Circuit [/dev/i2c-N]'),
-    Kind.UART:  (Style.MAGENTA,   'UART',  'Serial Port'),
+    Kind.UART:  (Style.MAGENTA,   'UART',  'Serial Port [/dev/ttymxcN]'),
     Kind.GPIO:  (Style.DEFAULT,   'GPIO',  'General Purpose Input Output [/sys/class/gpio/gpioN]'),
-    Kind.SAI:   (Style.CYAN,      'SAI',   'Serial Audio Interface'),
-    Kind.SPI:   (Style.BLUE,      'SPI',   'Serial Peripheral Interface'),
+    Kind.SAI:   (Style.CYAN,      'SAI',   'Synchronous Audio Interface'),
+    Kind.SPI:   (Style.BLUE,      'SPI',   'Serial Peripheral Interface [/dev/spidevN.N]'),
     Kind.PWM:   (Style.YELLOW,    'PWM',   'Pulse Width Modulation [/sys/class/pwm/pwmchipN/pwm0]'),
 }
 
 PINS = {
-    1:  ('3.3.V',             Kind.POWER), 2:  ('5V',                 Kind.POWER),
-    3:  ('I2C2_SDA (i2c-1)',  Kind.I2C),   4:  ('5V',                 Kind.POWER),
-    5:  ('I2C2_SCL (i2c-1)',  Kind.I2C),   6:  ('GND',                Kind.GND),
-    7:  ('UART3_TXD',         Kind.UART),  8:  ('UART1_TX',           Kind.UART),
-    9:  ('GND',               Kind.GND),   10: ('UART1_RX',           Kind.UART),
-    11: ('UART3_RXD',         Kind.UART),  12: ('SAI1_TXC',           Kind.SAI),
-    13: ('GPIO_P13 (gpio6)',  Kind.GPIO),  14: ('GND',                Kind.GND),
-    15: ('PWM3 (pwmchip2)',   Kind.PWM),   16: ('GPIO_P16 (gpio73)',  Kind.GPIO),
-    17: ('3.3V',              Kind.POWER), 18: ('GPIO_P18 (gpio138)', Kind.GPIO),
-    19: ('SPI1_MOSI',         Kind.SPI),   20: ('GND',                Kind.GND),
-    21: ('SPI1_MISO',         Kind.SPI),   22: ('GPIO_P22 (gpio140)', Kind.GPIO),
-    23: ('SPI1_SCLK',         Kind.SPI),   24: ('SPI1_SS0',           Kind.SPI),
-    25: ('GND',               Kind.GND),   26: ('SPI1_SS1',           Kind.SPI),
-    27: ('I2C3_SDA (i2c-2)',  Kind.I2C),   28: ('I2C3_SCL (i2c-2)',   Kind.I2C),
-    29: ('GPIO_P29 (gpio7)',  Kind.GPIO),  30: ('GND',                Kind.GND),
-    31: ('GPIO_P31 (gpio8)',  Kind.GPIO),  32: ('PWM1 (pwmchip0)',    Kind.PWM),
-    33: ('PWM2 (pwmchip1)',   Kind.PWM),   34: ('GND',                Kind.GND),
-    35: ('SAI1_TXFS',         Kind.SAI),   36: ('GPIO_P36 (gpio141)', Kind.GPIO),
-    37: ('GPIO_P37 (gpio77)', Kind.GPIO),  38: ('SAI1_RXD0',          Kind.SAI),
-    39: ('GND',               Kind.GND),   40: ('SAI1_TXD0',          Kind.SAI)
+    1:  ('3.3.V',                   Kind.POWER), 2:  ('5V',                       Kind.POWER),
+    3:  ('I2C2_SDA (i2c-1)',        Kind.I2C),   4:  ('5V',                       Kind.POWER),
+    5:  ('I2C2_SCL (i2c-1)',        Kind.I2C),   6:  ('GND',                      Kind.GND),
+    7:  ('UART3_TXD (ttymxc2)',     Kind.UART),  8:  ('UART1_TX (ttymxc0)',       Kind.UART),
+    9:  ('GND',                     Kind.GND),   10: ('UART1_RX (ttymxc0)',       Kind.UART),
+    11: ('UART3_RXD (ttymxc2)',     Kind.UART),  12: ('SAI1_TXC',                 Kind.SAI),
+    13: ('GPIO6 (gpio6)',           Kind.GPIO),  14: ('GND',                      Kind.GND),
+    15: ('PWM3 (pwmchip2)',         Kind.PWM),   16: ('GPIO73 (gpio73)',          Kind.GPIO),
+    17: ('3.3V',                    Kind.POWER), 18: ('GPIO138 (gpio138)',        Kind.GPIO),
+    19: ('SPI1_MOSI (spidev32766)', Kind.SPI),   20: ('GND',                      Kind.GND),
+    21: ('SPI1_MISO (spidev32766)', Kind.SPI),   22: ('GPIO140 (gpio140)',        Kind.GPIO),
+    23: ('SPI1_SCLK (spidev32766)', Kind.SPI),   24: ('SPI1_SS0 (spidev32766.0)', Kind.SPI),
+    25: ('GND',                     Kind.GND),   26: ('SPI1_SS1 (spidev32766.1)', Kind.SPI),
+    27: ('I2C3_SDA (i2c-2)',        Kind.I2C),   28: ('I2C3_SCL (i2c-2)',         Kind.I2C),
+    29: ('GPIO7 (gpio7)',           Kind.GPIO),  30: ('GND',                      Kind.GND),
+    31: ('GPIO8 (gpio8)',           Kind.GPIO),  32: ('PWM1 (pwmchip0)',          Kind.PWM),
+    33: ('PWM2 (pwmchip1)',         Kind.PWM),   34: ('GND',                      Kind.GND),
+    35: ('SAI1_TXFS',               Kind.SAI),   36: ('GPIO141 (gpio141)',        Kind.GPIO),
+    37: ('GPIO77 (gpio77)',         Kind.GPIO),  38: ('SAI1_RXD0',                Kind.SAI),
+    39: ('GND',                     Kind.GND),   40: ('SAI1_TXD0',                Kind.SAI)
 }
 
 assert(len(PINS) % 2 == 0)