Renamed bad namings.