Renamed spans and inputs