do you want to add aliases for the types renamed? Otherwise, internal upgrade is going to be a pain.