refactor project
names of variables changed