Rename uqName and fqName, remove redundant var2String, other cleanup.