bunch of renames on test_world