updated namespaces to new format