Minor fixes and changed generated classes name