Fixed variable's names