Add -object suffix to all abstract classes.
Update class names.