Refactoring names and specs