Fix language class name bugs