Fix class name assignment