Refactor naming, introduce subgenerator identifier
Merge pull request #44 from Cinamonas/bugfix-naming-refactor

Refactor naming, introduce subgenerator identifier