Fixing file references and names