Fixed object factory class to adjust class names for factory classes.