Added filename mapping to create filenames that are more command line friendly.