Changed class names for data objects.