SetNameValue instead of AddNameValue.

For #145.