Handle RS reflection name changes.

Change-Id: I0f3f9805a0f0bf44ce9e9944a3eaa5a80dd0cdde
7 files changed