Update naming as server requirement. Bug: 128887306 Test: build Change-Id: Iae46b1e41a66b1ad7d0c166ac52d5442b0c4070d