One more andrew/werdna renaming bit

Change-Id: I2da05bf9692a87e3a2b734207e03cdbeb4651452
Merge "One more andrew/werdna renaming bit" into production