Added extra newline between copyright and package-comment
Fixed the --er suffix form and regenerated files