Renamed variables to fit naming convention