Update method names to avoid confusion and bump to 2.0

Change-Id: Iaaf28c8eb6e63efbb8248c498bdbcdc22ab6af50