Renaming to be consistent namespace

- Originally this targetted the main instance, but after discussion it
  was decided that keeping this consistent with the old but proper name-
  space was the best course of action.