Fixing some namespaces.