More descriptive filenames and stripped version for production.