Revert "Differ - names refactoring"

This reverts commit 116030398066f03c2ca88b7baf8de768ef6ef3f2.