Renaming some of the linked data classes