makeBuiltinDefinition: Use getDefName rather than withParamName
Separate NameGen for dependent and indepedent names