Conform to style guide.
Renames and deletes