Make the names of the generated files more meaningful