Issue #9 - Factory generator
Issue #9 - Fixed naming