Rename some elements for consistency