Follow up to rename the actual privilege names to match the constant names - TRUNK-4400