update namespaces for consistancy