sprint-25-rc3 - Pass class name to ID mapper
Minor fix.