keyTab contains controls, fix a few naming mixups.