Fix namespaces in the add step