LGTM Please also update the UPGRADING file and explain the rename since we might break anyone that derive from the class.
Paul, is there a reason we should not rename it at this point of time? if not I will submit. http://codereview.appspot.com/1864043/show
