-refactored factory classes to match casing