Replaced some namespaces