Adding better support for trellis name mapping.