Fix conflicting names

Change-Id: I6fa3ebf21a131ed95b61620817ac25645ae3d3b3
1 file changed