Removing old world
Renaming for consistency and adding documentation