Merge "Use consistent naming for allocating SPI."