updated namespaces to the latest