renamed keystone services

Change-Id: Ibb0263a133c28a104563df431870a9effe584012