adjusted some namespaces