Changed names to increase readability

Changed some variable names to increase readability