finish renaming and generalize to n-arity tuples