Replaced escaped double __ with a single _ for types