Fix re-namespacing error