Major updates to namespacing.