Rename the SPI added in r207292 due to post-landing review comments