Update wiring to match new classes
Fix typo in class name