Fix mismatched class name
Restore missing method