updated variables' names