Fix variables' names