Name config file diffs consistently2

Extracted from #414