adapt to generator changes

Change-Id: I2cde7e92dc1b0407bbd5c143cdd585e21f0494d7