adapted to the changes in scala code generator
renaming bug fixed