Avoid ODR-violating name clash

Change-Id: I4911dcb5d902a5b92d4c175054acd220e449459d