Repair Worlds namespace (and ~ 300 errors)