Renamed some custom vars.