Fixes for file names - all tests passing