Fix: Double class names, super methods