change attribute names for clarity