squash to rename couchdb -> couch commit