Changed some variables' names