Rename symbol to shape
Fix goog.require alphabetization