More renaming attributes for #243