Renamed variables to have a prefix