Changed old namespace references
Changed old namespace references