Clean up naming to match  new conventions

Identity Service -> Identity

Change-Id: I3cd9d1d643e4a34da0ec607747e7efa31e537ef9
author: diane fleming
Merge "Clean up naming to match  new conventions"