fixed a couple class references due to dependency refactoring