Fix variable's names