Fix factory class name for data models