Fixing file naming