Fixed crashes on Staunton

Wrong names for parts of the gate threads, but only the ones on
Staunton...