Fix inconsistencies in namespaces (closes #337)