Changed the namespaces to new names