MDL-48688 inbound: Fix incorrect class names