Renaming some factory files for consistency.