Refactoring: Unified vocabulary used