D800 - change naming convention to match evervolv scheme.

Change-Id: Iaa47cf8277ed86fdda0ca8d0d7734bbbbf01d872