Renamed variables

- some variables were renamed for more clarity