Renamed variables

For easier modification