small changes to tuple names