Renaming ambiguous support type