more refactoring for naming consistency (with the paper)