Rename variables for clarification of intend

COUCHDB-2526