I did call the consulate and they said the new visas look like what I described.
So all looks good.
Thanks for the posts.