Fixup folding naming issues and upcoming commit history.

Change-Id: Ibaad8cfe1d04d5053d404901310ef1283bc9f57f
Reviewed-on: http://review.couchbase.org/39681
Tested-by: Brett Lawson <brett19@gmail.com>
Reviewed-by: Jeffry Morris <jeffrymorris@gmail.com>