Fixed inconsistent namespaces