Vendor: It will be renamed asa possible

Change-Id: Ica9b7819c558e99bbec09135e66571520507cbdd