Corrected namespace issues

After adding stuff from an older version