Rename various trellis variables for assistance with debugging.