Renamed variables fix