Some changes trying to fix the names of the generated files. refs #418