Some renaming and disabled xml test.