A function `give-better-name` was added that can be added as a `find-file-hook`.
Some small refactoring also.