difftool: rename variables for consistency