rename spi to consistent name format