Refactor TWS out of connection names. tweak to order command