Fixed some class references that were changed during the refactor