Changed variables' names