Avoid ODR-violating name clash

Change-Id: I69c3b11b01d520a485b07c8e5397a7f971210af2