Hopefully fixed all file renaming issues