Tidied up image filenames