Rename attributes to be more clear