Rename in preparation of caching an instance.

Change-Id: I112c957e20d4573daaa71aa218b575037585385c
3 files changed