Change some node names and clean up the menu.