Rename paths and update xml test.