Fix naming

Change-Id: Id177ea96aaeda8d34b4d58053aa56cf0be2542d6