CBLT-283:  fix up name mapping for ios and android

Change-Id: Iedf2bb48b6b277e11aecc0f6c5014b365a9c4b4f
Reviewed-on: http://review.couchbase.org/36823
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>