Edited filenames for consistency and to match xml files