Fix name clash with gri and nova, that caused conflicts Fix compilation warnings PR: 222968 Submitted by: bob@eager.cx (maintainer) Approved by: olivier (mentor) Differential Revision: https://reviews.freebsd.org/D12651