Cleanup of generated files
change of names and update