fixed a couple class references due to dependency refactoring
Merge pull request #25 from EricWittmann/refactoring-1

fixed a couple class references due to dependency refactoring
Fix for column name clash in ORACLE db