CMS-1379 Rename Content Data classes
More refactoring.