Rename tshvdp to tshvdp2