Fixing merged files and names