Also, use variable names consistent with catz for rpz configuration functions (cherry picked from commit 975afc508d)
975afc508d