resource name changes

Change-Id: I74945e4459f73d5af3685bba93e3b7f0c307f33f