Follow up on naming schemes for overlap changes

Follow up to !4195 (comment 8934674) to decide appropriate naming schemes for the lines, TES locations and and DecReports

as described nicely by @graven

So is the underlying problem actually the consistency between line name (in both Hlt2 and Sprucing), TES location of the output of the line, and entry in the DecReport for the line?

Also decide how to handle these changes in DaVinci

cc @sstahl, @graven