PTAL - it's just a trivial rename. The bot failure is because of Rietveld refusing to properly upload the binary files; I'll probably have to dcommit.
lgtm
Committed patchset #1 manually as r284036 (presubmit successful).