Correct bad namespaces in several files