Missed these renames in last commit.

Test: builds
Change-Id: I6c2d03accc55aef8381f38f9b182f2367e25a915
1 file changed