Fix a couple incorrect namespace/class names following rename