Support renaming groups.

Change-Id: I1a360deb17a2a16e9e2b0ef43d0588f971c84844