fixed even more variable names