Fix for class names in factory calls