Renamed some hook vars