Rename things now that I have a new easier plan for key-chords.