Renamed singletons to plurals, including corresponding spis.