Renamed variables to match solution defaults