fix variables' names