Use consistent names for generated files

See issue #110