fix class names and dependencies