fix a few names and ids