Merge "Rename vid-simulator packages"