Merge "Fix the naming of variables for permission checks." into main