change naming

Change-Id: I2d9973a125525c72f02e0e7cfbf7486b9e45dbee
Merge "change naming" into illusion-4.4