Fixes https://gitlab.com/kicad/code/kicad/issues/6686
The old names were really hard to keep straight (even for me, who named many of them).