General file name and namespace cleanup.