Use a less generic name to avoid namespace conflicts. Fixes #835. Change-Id: I222878742ed7d02d19ad50ff732adabfe4f0729a