update to match new class names