Renaming and rearranging things.  No changes to logic or API.