#4137 Tidy some namespaces