Refactor naming, introduce subgenerator identifier