Clarified object naming and simplified generator calling process