Dont use 'gen' to refer to the generator factory

Also use pagegenerators instead of alias pg

Change-Id: I31aa4d113ce6ca021c559c0b489d1a6b1904c86e