code clean-up, ensuring filenames are consistent.