Refactor attribute names