updates to constants, namespaces