Fixed variable names after refactoring