Renamed some listeners