Tweaking and renaming

Renamed:
TPASwapValues => TPASwap
TPAXValues => TPAXs
TPAYValues => TPAYs

Tweaked TPAControlBoxes and TPAControlContacts