fixed some namespaces