Merge "configs: rename vendor properties"