Fixed namespaces to make them deref