Variable name fix (ToDo added)