Renaming attributes for #243