changing some variable/method names