Confirm the Basic's board codename

Also untangle the Yoshime/Yoshime3 mess, which I managed to get wrong the first time around.
Looks clearer that way.