Fix attr name collision and localization