Fix attr names