Refactor feature names to adhere to domain model