Rename file & methods by struct name: ElementFactory