diff --git a/pio/spi/spi_flash.c b/pio/spi/spi_flash.c
index 1f2fdec..fd97f17 100644
--- a/pio/spi/spi_flash.c
+++ b/pio/spi/spi_flash.c
@@ -114,8 +114,6 @@ int main() {
     gpio_init(PICO_DEFAULT_SPI_CSN_PIN);
     gpio_put(PICO_DEFAULT_SPI_CSN_PIN, 1);
     gpio_set_dir(PICO_DEFAULT_SPI_CSN_PIN, GPIO_OUT);
-    // Make the CS pin available to picotool
-    bi_decl(bi_1pin_with_name(PICO_DEFAULT_SPI_CSN_PIN, "CS"));
 
     uint offset = pio_add_program(spi.pio, &spi_cpha0_program);
     printf("Loaded program at %d\n", offset);
@@ -129,8 +127,8 @@ int main() {
                  PICO_DEFAULT_SPI_TX_PIN,
                  PICO_DEFAULT_SPI_RX_PIN
     );
-    // Make the SPI pins available to picotool
-    bi_decl(bi_3pins_with_func(PICO_DEFAULT_SPI_RX_PIN, PICO_DEFAULT_SPI_TX_PIN, PICO_DEFAULT_SPI_SCK_PIN, GPIO_FUNC_PIO0));
+    // Make the 'SPI' pins available to picotool
+    bi_decl(bi_4pins_with_names(PICO_DEFAULT_SPI_RX_PIN, "SPI RX", PICO_DEFAULT_SPI_TX_PIN, "SPI TX", PICO_DEFAULT_SPI_SCK_PIN, "SPI SCK", PICO_DEFAULT_SPI_CSN_PIN, "SPI CS"));
 
     uint8_t page_buf[FLASH_PAGE_SIZE];
 
diff --git a/spi/bme280_spi/bme280_spi.c b/spi/bme280_spi/bme280_spi.c
index 488ed91..bee24c2 100644
--- a/spi/bme280_spi/bme280_spi.c
+++ b/spi/bme280_spi/bme280_spi.c
@@ -206,7 +206,7 @@ int main() {
     gpio_set_dir(PICO_DEFAULT_SPI_CSN_PIN, GPIO_OUT);
     gpio_put(PICO_DEFAULT_SPI_CSN_PIN, 1);
     // Make the CS pin available to picotool
-    bi_decl(bi_1pin_with_name(PICO_DEFAULT_SPI_CSN_PIN, "CS"));
+    bi_decl(bi_1pin_with_name(PICO_DEFAULT_SPI_CSN_PIN, "SPI CS"));
 
     // See if SPI is working - interrograte the device for its I2C ID number, should be 0x60
     uint8_t id;
diff --git a/spi/mpu9250_spi/mpu9250_spi.c b/spi/mpu9250_spi/mpu9250_spi.c
index 5714cb7..aab48ca 100644
--- a/spi/mpu9250_spi/mpu9250_spi.c
+++ b/spi/mpu9250_spi/mpu9250_spi.c
@@ -126,7 +126,7 @@ int main() {
     gpio_set_dir(PIN_CS, GPIO_OUT);
     gpio_put(PIN_CS, 1);
     // Make the CS pin available to picotool
-    bi_decl(bi_1pin_with_name(PIN_CS, "CS"));
+    bi_decl(bi_1pin_with_name(PIN_CS, "SPI CS"));
 
     mpu9250_reset();
 
diff --git a/spi/spi_dma/spi_dma.c b/spi/spi_dma/spi_dma.c
index 1354b34..9a9b8b3 100644
--- a/spi/spi_dma/spi_dma.c
+++ b/spi/spi_dma/spi_dma.c
@@ -34,7 +34,7 @@ int main() {
     // Make the SPI pins available to picotool
     bi_decl(bi_3pins_with_func(PICO_DEFAULT_SPI_RX_PIN, PICO_DEFAULT_SPI_TX_PIN, PICO_DEFAULT_SPI_SCK_PIN, GPIO_FUNC_SPI));
     // Make the CS pin available to picotool
-    bi_decl(bi_1pin_with_name(PICO_DEFAULT_SPI_CSN_PIN, "CS"));
+    bi_decl(bi_1pin_with_name(PICO_DEFAULT_SPI_CSN_PIN, "SPI CS"));
 
     // Grab some unused dma channels
     const uint dma_tx = dma_claim_unused_channel(true);
diff --git a/spi/spi_flash/spi_flash.c b/spi/spi_flash/spi_flash.c
index 4e214f5..156a992 100644
--- a/spi/spi_flash/spi_flash.c
+++ b/spi/spi_flash/spi_flash.c
@@ -126,7 +126,7 @@ int main() {
     gpio_put(PICO_DEFAULT_SPI_CSN_PIN, 1);
     gpio_set_dir(PICO_DEFAULT_SPI_CSN_PIN, GPIO_OUT);
     // Make the CS pin available to picotool
-    bi_decl(bi_1pin_with_name(PICO_DEFAULT_SPI_CSN_PIN, "CS"));
+    bi_decl(bi_1pin_with_name(PICO_DEFAULT_SPI_CSN_PIN, "SPI CS"));
 
     printf("SPI initialised, let's goooooo\n");