Changed orientation tweak names, restore tweaked orientation rather than
primary one.  Closes #2310.