NAMESPACE tweak

(re-alphabetization due to re-roxygenization)