correcting filenames and namespaces