Refactoring of names
Attribute and Dependency Managment