rename ambiguous type, fix order of arguments for consistency