Renaming attributes

This material is in progress. Please check again later.