Updating namespaces and naming.