refactoring attr names