migrate back to ConstructorName.type from ConstructorName.type2 (#1673)

4 files changed