Differ - names refactoring 2