Finished renaming everything for consistency (I hope)