Some cleaning in the generated method naming for more clearity