add wildcard type name and rename variable type name