Fixed file naming issue before moving files