Fix name conflict

Change-Id: I0c1c21d6447bbafc6158a244754976361a136231