small renames and fixed in RHEL/Suse packaging