Fixed attributes names