#923: Refactoring and renaming