adding file renaming and changes to xml gen