BUGFIX: Use name as reference point, not after deVar.

This is not a real bug but only in the sense that the heuristic didn't always work as intended for choosing names.