Reverting name changes.

Easier to bring in mods from BigSplitter and Main if package is Apollo.