Renaming/reformatting... making things a little more consistent.