Updating variables' names. Minor refactor