fixed some names

Change-Id: I5d0efb8f6e599f817c079edc0dbc6f01b6dc5b0d