Renaming/repackaging of generated file related classes