Updated filenames for consistency and cleaned xml to match