More renaming (I think I'm done now)
Minor: set authority for organization and fixed typo in comment