updated namespace usages