Variable adjust

Renamed some variables.