Refactor: Removes references to "World" prefix.