Restructure and rename back to AddrTransTable.