Rename classes mentioning that we had xml as persistence