Fixing file naming issue