Refactored factory name for consistency