Rework of filenames to be most consistent with my style.