MDL-37085 bug fix with glued together class names