Renaming and small refactoring of PermissionEvaluator.