Villagers end up working at the wrong type of workstation in a 1.13->1.14 world

1) I generated a new world in 1.13, and found a village.

It's a plains village, but the key is that it doesn't have beds or workstations, just empty buildings (many missing doors)

2) I upgraded the world to 1.14 pre-release 2

Afterward, to convert the village into a functional village that can grow, and the villagers to restock for trades, I started added beds and workstations.

However, the villages appear to have claimed a bed, and a workstation, with no regard to the occupation of the workstation.  Further, when restocking, it makes the appropriate sound for their occupation, not the workstation (or at least I think that's why a cleric at a lectern is making brew-stand sounds after I do a bunch of trades with them).