regen after fixing handling of java reserved words and component name conflicts in generator