Rename functions.
Fixup.
Support centos/federo better.