Some attributes names refactoring.