rename Tuple classes