Renamed badly named items