Fixing naming issue in 74927

Change-Id: I9a921674375dcd4f6dce31c6302fa47890e2b65f
9 files changed