Lots of Renaming for clarity and whatnow

*sighs* this better work....