Fix class name matching