Update build and namespaces