Fix inconsistencies in namespaces