Minor changes to attr names