FIX issues due to refactoring (updates class names)