253-rc1

Let's match upstream's filenames and keep backward-compatibility symlinks for older tools. The content of the files match anyway.