updated namespaces to new convention