Rename attributes to be more specific