Updates to accommodate the API namespaces changes.