Updates to teamocil for uspto layout and some aliases