Renamed SPI to Spi, including service registrations in RI.