Fix names

Change-Id: Ia2752bdadeefed8f29f7ae26d0fb1253454617d0