Rename union types to use ...Upto... for clarity