(refactor) Changed variable names