Fix credential naming

Change-Id: Ica935f22ed30792033c6c36742abead20de66363
23 files changed