Classification labels are now available for Gmail in addition to Drive.

docs/Addresses.md

@@ -1,4 +1,4 @@
-!# Addresses
+# Addresses
 - [API documentation](#api-documentation)
 - [Display addresses](#display-addresses)
 

docs/Administrators.md

@@ -1,4 +1,4 @@
-!# Administrators
+# Administrators
 - [Administrator roles documentation](#administrator-roles-documentation)
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)

docs/Alert-Center.md

@@ -1,4 +1,4 @@
-!# Alert Center
+# Alert Center
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Introduction](#introduction)

docs/Authorization.md

@@ -973,8 +973,8 @@ gam user user@domain.com update serviceaccount
 [*] 18)  Drive API (supports readonly)
 [*] 19)  Drive API - todrive
 [*] 20)  Drive Activity API v2 - must pair with Drive API
-[*] 21)  Drive Labels API v2beta - Admin (supports readonly)
+[*] 21)  Drive Labels API - Admin (supports readonly)
-[*] 22)  Drive Labels API v2beta - User (supports readonly)
+[*] 22)  Drive Labels API - User (supports readonly)
 [*] 23)  Forms API
 [*] 24)  Gmail API - Basic Settings (Filters,IMAP, Language, POP, Vacation) - read/write, Sharing Settings (Delegates, Forwarding, SendAs) - read
 [*] 25)  Gmail API - Full Access (Labels, Messages)

docs/BNF-Syntax.md

@@ -1,4 +1,4 @@
-!# Syntax
+# Syntax
 
 ## BNF Syntax
 This Wiki describes the GAM7 command line syntax in modified BNF.

docs/Basic-Items.md

@@ -283,6 +283,11 @@
 <GIGroupItem> ::= <EmailAddress>|<UniqueID>|groups/<String>
 <CIGroupType> ::= customer|group|other|serviceaccount|user
 <CIPolicyName> ::= policies/<String>|settings/<String>|<String>
+<ClassificationLabelID> ::= <String>
+<ClassificationLabelFieldID> ::= <String>
+<ClassificationLabelSelectionID> ::= <String>
+<ClassificationLabelName> ::= labels/<ClassificationLabelID>[@latest|@published|@<Number>]
+<ClassificationLabelPermissionName> ::= labels/<ClassificationLabelID>[@latest|@published|@<Number>]/permissions/(audiences|groups|people)/<String>
 <ClassroomInvitationID> ::= <String>
 <ClientID> ::= <String>
 <CommandID> ::= <String>
@@ -352,11 +357,6 @@
 <DriveFilePermissionID> ::= anyone|anyonewithlink|id:<String>
 <DriveFilePermissionIDorEmail> ::= <DriveFilePermissionID>|<EmailAddress>
 <DriveFileRevisionID> ::= <String>
-<DriveLabelID> ::= <String>
-<DriveLabelFieldID> ::= <String>
-<DriveLabelSelectionID> ::= <String>
-<DriveLabelName> ::= labels/<DriveLabelID>[@latest|@published|@<Number>]
-<DriveLabelPermissionName> ::= labels/<DriveLabelID>[@latest|@published|@<Number>]/permissions/(audiences|groups|people)/<String>
 <EmailAddress> ::= <String>@<DomainName>
 <EmailItem> ::= <EmailAddress>|<UniqueID>|<String>
 <EmailReplacement> ::= <String>

docs/Bulk-Processing.md

@@ -1,4 +1,4 @@
-!# Bulk Processing
+# Bulk Processing
 - [Introduction](#introduction)
 - [Python Regular Expressions](Python-Regular-Expressions)
 - [GAM Configuration](gam.cfg)

docs/CSV-Special-Characters.md

@@ -1,4 +1,4 @@
-!# CSV Special Characters
+# CSV Special Characters
 - [Python CSV documentation](https://docs.python.org/3/library/csv.html#dialects-and-formatting-parameters)
 
 ## Python variables that control CSV file reading/writing:

docs/Chat-Bot.md

@@ -1,4 +1,4 @@
-!# Chat Bot
+# Chat Bot
 
 - [Notes](#notes)
 - [API documentation](#api-documentation)

docs/Chrome-AUE-Counts.md

@@ -1,4 +1,4 @@
-!# Chrome Auto Update Expiration Counts
+# Chrome Auto Update Expiration Counts
 
 - [Chrome Auto Update Expiration Counts](#chrome-auto-update-expiration-counts)
   - [API documentation](#api-documentation)

docs/Chrome-Installed-Apps.md

@@ -1,4 +1,4 @@
-!# Chrome Installed Apps Counts
+# Chrome Installed Apps Counts
 
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)

docs/Chrome-Needs-Attention-Counts.md

@@ -1,4 +1,4 @@
-!# Chrome Device Needs Attention Counts
+# Chrome Device Needs Attention Counts
 
 - [Chrome Device Needs Attention Counts](#chrome-device-needs-attention-counts)
   - [API documentation](#api-documentation)

docs/Chrome-Policies.md

@@ -1,4 +1,4 @@
-!# Chrome Policies
+# Chrome Policies
 
 - [Chrome Policies](#chrome-policies)
   - [Chrome Version History](Chrome-Version-History)

docs/Chrome-Printers.md

@@ -1,4 +1,4 @@
-!# Chrome Printers
+# Chrome Printers
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)

docs/Chrome-Version-Counts.md

@@ -1,4 +1,4 @@
-!# Chrome Version Counts
+# Chrome Version Counts
 
 - [Chrome Version Counts](#chrome-version-counts)
   - [API documentation](#api-documentation)

docs/Chrome-Version-History.md

@@ -1,4 +1,4 @@
-!# Chrome Version History
+# Chrome Version History
 
 - [Chrome Version History](#chrome-version-history)
   - [API documentation](#api-documentation)

docs/Cloud-Channel.md

@@ -1,4 +1,4 @@
-!# Cloud Channel
+# Cloud Channel
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)

docs/Cloud-Identity-Devices.md

@@ -1,4 +1,4 @@
-!# Cloud Identity Devices
+# Cloud Identity Devices
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)
 - [Definitions](#definitions)

docs/Cloud-Storage.md

@@ -1,4 +1,4 @@
-!# Cloud Storage
+# Cloud Storage
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)

docs/Collections-of-ChromeOS-Devices.md

@@ -1,4 +1,4 @@
-!# Collections of ChromeOS Devices
+# Collections of ChromeOS Devices
 - [Python Regular Expressions](Python-Regular-Expressions) Match function
 - [Definitions](#definitions)
 - [Organization Unit Quoting](#organization-unit-quoting)

docs/Collections-of-Items.md

@@ -146,6 +146,10 @@ Data fields identified in a `csvkmd` argument.
         <CalendarList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
 <CIPolicyNameEntity> ::=
         <CIPolicyNameList> | <FileSelector> | <CSVFileSelector>
+<ClassificationLabelNameEntity> ::=
+        <ClassificationLabelNameList> | <FileSelector> | <CSVFileSelector> | <CSVDataSelector>
+<ClassificationLabelPermissionNameEntity> ::=
+        <ClassificationLabelPermissionNameList> | <FileSelector> | <CSVFileSelector> | <CSVDataSelector>
 <ClassroomInvitationIDEntity> ::=
         <ClassroomInvitationIDList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
 <ContactEntity> ::=
@@ -267,10 +271,6 @@ Data fields identified in a `csvkmd` argument.
         (first|last|allexceptfirst|allexceptlast <Number>)|
         (before|after <Time>) | (range <Time> <Time>)|
         <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
-<DriveLabelNameEntity> ::=
-        <DriveLabelNameList> | <FileSelector> | <CSVFileSelector> | <CSVDataSelector>
-<DriveLabelPermissionNameEntity> ::=
-        <DriveLabelPermissionNameList> | <FileSelector> | <CSVFileSelector> | <CSVDataSelector>
 <EmailAddressEntity> ::=
         <EmailAddressList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
 <FilterIDEntity> ::=

docs/Collections-of-Users.md

@@ -1,4 +1,4 @@
-!# Collections of Users
+# Collections of Users
 - [Python Regular Expressions](Python-Regular-Expressions) Match function
 - [Definitions](#definitions)
 - [List quoting rules](#list-quoting-rules)

docs/Command-Data-From-Google-Docs-Sheets-Storage.md

@@ -1,4 +1,4 @@
-!# Command data from Google Docs, Sheets and Cloud Storage
+# Command data from Google Docs, Sheets and Cloud Storage
 - [Introduction](#introduction)
 - [Definitions](#definitions)
 - [Read data from a Google Doc or Drive File](#read-data-from-a-google-doc-or-drive-file)

docs/Command-Line-Parsing.md

@@ -1,4 +1,4 @@
-!# Command Line Parsing
+# Command Line Parsing
 - [Linux and MacOS](#linux-and-macos)
 - [Windows Command Prompt](#windows-command-prompt)
 - [Windows PowerShell](#windows-powershell)

docs/Command-Logging-Progress.md

@@ -1,4 +1,4 @@
-!# Command Logging and Progress
+# Command Logging and Progress
 - [Introduction](#introduction)
 - [GAM Configuration](gam.cfg)
 - [Command Logging](#command-logging)

docs/Customer.md

@@ -1,4 +1,4 @@
-!# Customer
+# Customer
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Update customer](#update-customer)

docs/Domains-Verification.md

@@ -1,4 +1,4 @@
-!# Domains - Verification
+# Domains - Verification
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Introduction](#introduction)

docs/Domains.md

@@ -1,4 +1,4 @@
-!# Domains
+# Domains
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Create a domain](#create-a-domain)

docs/Downloads-Installs.md

@@ -1,4 +1,4 @@
-!# Downloads-Installs-GAM7
+# Downloads-Installs-GAM7
 You can download and install the current GAM7 release from the [GitHub Releases](https://github.com/GAM-team/GAM/releases/latest) page.
 Choose one of the following:
 

docs/Drive-Items.md

@@ -1,4 +1,4 @@
-!# Drive Items
+# Drive Items
 - [Basic Items](Basic-Items)
 - [List Items](List-Items)
 ```

docs/Email-Audit-Monitor.md

@@ -1,4 +1,4 @@
-!# Email Audit Monitor
+# Email Audit Monitor
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)

docs/Find-File-Owner.md

@@ -1,4 +1,4 @@
-!# Find File Owner
+# Find File Owner
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Display File Ownership](#display-file-ownership)

docs/GAM-Return-Codes.md

@@ -1,4 +1,4 @@
-!# GAM Return Codes
+# GAM Return Codes
 
 These are the return codes used by GAM7.
 

docs/GAM-with-minimal-GCP-rights.md

@@ -1,4 +1,4 @@
-!# GAM setup with minimal GCP permissions.
+# GAM setup with minimal GCP permissions.
 
 - GCP Admin can create a project for the Workspace / GAM admin.
 

docs/GAM7-on-Android-Devices.md

@@ -1,4 +1,4 @@
-!# GAM7 on Android Devices
+# GAM7 on Android Devices
 GAM7 now runs on 64-bit Android devices such as Google's Pixel phones. The installation requires an app that adds the Linux environment to Android such as [UserLAnd](https://play.google.com/store/apps/details?id=tech.ula&hl=en_US).
 
 _Note: Chromebooks / Chrome OS devices should install GAM7 using [these instructions](GAM7-on-Chrome-OS-Devices)._

docs/GAM7-on-Chrome-OS-Devices.md

@@ -1,4 +1,4 @@
-!# GAM7 on Chrome OS Devices
+# GAM7 on Chrome OS Devices
 Chrome OS devices that [support Linux apps](https://support.google.com/chromebook/answer/9145439?hl=en) can run GAM7. This includes Intel/AMD x86_64 Chromebooks as well as ARM-based Chromebooks with Mediatek or Rockchip 64-bit CPUs.
 
 1. [Set up Linux on your Chromebook](https://support.google.com/chromebook/answer/9145439?hl=en).

docs/GamUpdates.md

@@ -10,6 +10,24 @@ Add the `-s` option to the end of the above commands to suppress creating the `g
 
 See [Downloads-Installs-GAM7](https://github.com/GAM-team/GAM/wiki/Downloads-Installs) for Windows or other options, including manual installation
 
+### 7.00.35
+
+Classification labels are now available for Gmail in addition to Drive.
+
+* See: https://workspaceupdates.googleblog.com/2024/11/open-beta-data-classification-labels-gmail.html
+
+The following command synonyms are available, there is no change in functionality:
+```
+gam [<UserTypeEntity>] info classificationlabels|drivelabels
+gam [<UserTypeEntity>] print classificationlabels|drivelabels
+gam [<UserTypeEntity>] show classificationlabels|drivelabels
+gam [<UserTypeEntity>] create classificationlabelpermission|drivelabelpermission
+gam [<UserTypeEntity>] delete classificationlabelpermission|drivelabelpermission
+gam [<UserTypeEntity>] remove classificationlabelpermission|drivelabelpermission
+gam [<UserTypeEntity>] print classificationlabelpermissions|drivelabelpermission
+gam [<UserTypeEntity>] show classificationlabelpermissions|drivelabelpermission
+```
+
 ### 7.00.34
 
 Fixed bug introduced in 7.00.33 in `gam print group-members` that caused a trap.

docs/Google-Data-Transfers.md

@@ -1,4 +1,4 @@
-!# Google Data Transfers
+# Google Data Transfers
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Display transfer apps](#display-transfer-apps)

docs/Google-Network-Addresses.md

@@ -1,4 +1,4 @@
-!# Google Network Addresses
+# Google Network Addresses
 
 All GAM calls are made on port 443 (HTTPS) to the following addresses:
 ```

docs/HTTPS-Proxy.md

@@ -1,4 +1,4 @@
-!# HTTPS Proxy
+# HTTPS Proxy
 
 GAM should be run on a server with direct access to talk to Google servers via the Internet.
 However, if you must push GAM traffic through an HTTPS proxy this can be done by setting the HTTPS_PROXY environment variable.

docs/How-to-Install-GAM7.md

@@ -1,4 +1,4 @@
-!# Installing GAM7
+# Installing GAM7
 Use these steps if you have never used any version of GAM in your domain. They will create your GAM project
 and all necessary authentications.
 

docs/How-to-Uninstall-GAM7.md

@@ -1,4 +1,4 @@
-!# Uninstalling GAM7
+# Uninstalling GAM7
 
 - [Get Project Info](#get-project-info)
 - [Remove Client API access](#remove-client-api-access)

docs/How-to-Update-GAM7.md

@@ -1,4 +1,4 @@
-!# Updating GAM7
+# Updating GAM7
 Use these steps to update your version of GAM7.
 
 - [Downloads-Installs](Downloads-Installs)

docs/How-to-Upgrade-Legacy-GAM-to-GAM7.md

@@ -251,7 +251,7 @@ writes the credentials into the file oauth2.txt.
 admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt
 admin@server:/Users/admin$ gam version
 WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found
-GAM 7.00.34 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.00.35 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.0 64-bit final
 MacOS Sonoma 14.5 x86_64
@@ -923,7 +923,7 @@ writes the credentials into the file oauth2.txt.
 C:\>del C:\GAMConfig\oauth2.txt
 C:\>gam version
 WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found
-GAM7 7.00.34 - https://github.com/GAM-team/GAM - pythonsource
+GAM7 7.00.35 - https://github.com/GAM-team/GAM - pythonsource
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.0 64-bit final
 Windows-10-10.0.17134 AMD64

docs/Inbound-SSO.md

@@ -1,4 +1,4 @@
-!# Inbound SSO
+# Inbound SSO
 - [Admin Console](#admin-console)
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)

docs/Licenses.md

@@ -1,4 +1,4 @@
-!# Licenses
+# Licenses
 - [API documentation](#api-documentation)
 - [License Products and SKUs](#license-products-and-skus)
 - [Definitions](#definitions)

docs/List-Items.md

@@ -14,6 +14,11 @@
 <CIGroupAliasList> ::= "<CIGroupAlias>(,<CIGroupAlias>)*"
 <CIGroupTypeList> ::= "<CIGroupType>(,<CIGroupType>)*"
 <CIPolicyNameList> ::= "<CIPolicyName>(,<CIPolicyName>)*"
+<ClassificationLabelIDList> ::= "<ClassificationLabelID>(,<ClassificationLabelID>)*"
+<ClassificationLabelNameList> ::= "<ClassificationLabelName>(,<ClassificationLabelName>)*"
+<ClassificationLabelPermissionNameList> ::= "<ClassificationLabelPermissionName>(,<ClassificationLabelPermissionName>)*"
+<ClassificationLabelFieldIDList> ::= "<ClassificationLabelFieldID>(,<ClassificationLabelFieldID>)*"
+<ClassificationLabelSelectionIDList> ::= "<ClassificationLabelSelectionID>(,<ClassificationLabelSelectionID>)*"
 <ClassroomInvitationIDList> ::= "<ClassroomInvitationID>(,<ClassroomInvitationID>)*"
 <ContactGroupList> ::= "<ContactGroupItem>(,<ContactGroupItem>)*"
 <ContactIDList> ::= "<ContactID>(,<ContactID>)*"
@@ -42,11 +47,6 @@
 <DriveFileRevisionIDList> ::= "<DriveFileRevisionID>(,<DriveFileRevisionID>)*"
 <DriveFolderIDList> ::= "<DriveFolderID>(,<DriveFolderID>)*"
 <DriveFolderNameList> ::= "<DriveFolderName>(,<DriveFolderName>)*"
-<DriveLabelIDList> ::= "<DriveLabelID>(,<DriveLabelID>)*"
-<DriveLabelNameList> ::= "<DriveLabelName>(,<DriveLabelName>)*"
-<DriveLabelPermissionNameList> ::= "<DriveLabelPermissionName>(,<DriveLabelPermissionName>)*"
-<DriveLabelFieldIDList> ::= "<DriveLabelFieldID>(,<DriveLabelFieldID>)*"
-<DriveLabelSelectionIDList> ::= "<DriveLabelSelectionID>(,<DriveLabelSelectionID>)*"
 <EmailAddressList> ::= "<EmailAddress>(,<EmailAddress>)*"
 <EmailItemList> ::= "<EmailItem>(,<EmailItem>)*"
 <EventIDList> ::= "<EventID>(,<EventID>)*"

docs/List.md

@@ -1,4 +1,4 @@
-!# List
+# List
 
 The list command is used to verify collections of objects.
 

docs/Meta-Commands-and-File-Redirection.md

@@ -1,4 +1,4 @@
-!# Meta Commands and File Redirection
+# Meta Commands and File Redirection
 
 - [GAM Configuration](gam.cfg)
 - [Todrive](Todrive)

docs/Mobile-Devices.md

@@ -1,4 +1,4 @@
-!# Mobile Devices
+# Mobile Devices
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)
 - [Definitions](#definitions)

docs/Organizational-Units.md

@@ -1,4 +1,4 @@
-!# Organizational Units
+# Organizational Units
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Special quoting](#special-quoting)

docs/Other-Resources.md

@@ -1,4 +1,4 @@
-!# Other Resources
+# Other Resources
 
 The following are links to contributions of others in support of GAM7.
 

docs/Permission-Matches.md

@@ -1,4 +1,4 @@
-!# Permission Matches
+# Permission Matches
 - [Python Regular Expressions](Python-Regular-Expressions) Match function
 - [Definitions](#definitions)
 - [File Selection](#file-selection)

docs/Python-Regular-Expressions.md

@@ -1,4 +1,4 @@
-!# Python Regular Expressions
+# Python Regular Expressions
 - [Documentation](#documentation)
 - [Match function](#match-function)
 - [Sub function](#sub-function)

docs/Rclone.md

@@ -1,4 +1,4 @@
-!# Rclone
+# Rclone
 
 GAM7 has the capability to upload and download single files between your local computer and Google Drive;
 it has no capability for uploading and dowloading folders. For this you can use Rclone: https://rclone.org/

docs/Reseller.md

@@ -1,4 +1,4 @@
-!# Reseller
+# Reseller
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Manage Multiple Domains](#manage-multiple-domains)

docs/SSL-Root-CA-Certificates.md

@@ -1,4 +1,4 @@
-!# SSL Root CA Certificates
+# SSL Root CA Certificates
 
 For an overall discussion of SSL, see: https://sites.google.com/site/x509certificateusage/
 

docs/Scripts.md

@@ -1,4 +1,4 @@
-!# Scripts
+# Scripts
 
 These scripts can be used to enhance GAM's capabilities; all are supported with Advanced GAM,
 many are supported with Legacy GAM. They require that Python 3 be installed on you computer.

docs/Tag-Replace.md

@@ -1,4 +1,4 @@
-!# Tag Replace
+# Tag Replace
 - [Python Regular Expressions](Python-Regular-Expressions) Sub function
 - [Definitions](#definitions)
 - [Introduction](#introduction)

docs/Todrive.md

@@ -1,4 +1,4 @@
-!# Todrive
+# Todrive
 - [Introduction](#introduction)
 - [Definitions](#definitions)
 - [Config file options](#config-file-options)

docs/Unmanaged-Accounts.md

@@ -1,4 +1,4 @@
-!# Unmanaged Accounts
+# Unmanaged Accounts
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Collections of Users](Collections-of-Users)

docs/Upgrade-Benefits.md

@@ -1,4 +1,4 @@
-!# Upgrade Benefits
+# Upgrade Benefits
 - [Configuration](#Configuration)
 - [Syntax Checking](#syntax-checking)
 - [API error checking](#api-error-checking)

docs/Users-Analytics-Admin.md

@@ -1,4 +1,4 @@
-!# Users - Analytics Admin
+# Users - Analytics Admin
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)

docs/Users-Application-Specific-Passwords.md

@@ -1,4 +1,4 @@
-!# Users - Application Specific Passwords
+# Users - Application Specific Passwords
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Manage application specific passwords](#manage-application-specific-passwords)

docs/Users-Backup-Verification-Codes.md

@@ -1,4 +1,4 @@
-!# Users - Backup Verification Codes
+# Users - Backup Verification Codes
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Manage backup verification codes](#manage-backup-verification-codes)

docs/Users-Calendars-Access.md

@@ -1,4 +1,4 @@
-!# Users - Calendars - Access
+# Users - Calendars - Access
 - [Notes](#Notes)
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)

docs/Users-Chat.md

@@ -1,4 +1,4 @@
-!# Users - Chat
+# Users - Chat
 - [API documentation](#api-documentation)
 - [Introduction](#introduction)
 - [Set up a Chat Bot](#set-up-a-chat-bot)

docs/Users-Classification-Labels.md

@@ -1,4 +1,4 @@
-!# Users - Drive - Labels
+# Users - Classification Labels
 - [API documentation](#api-documentation)
 - [Query documentation](Users-Drive-Query)
 - [Notes](#notes)
@@ -13,8 +13,8 @@
 * https://support.google.com/a/answer/9292382
 * https://developers.google.com/drive/labels/guides/overview
 * https://developers.google.com/drive/labels/guides/authorize
-* https://developers.google.com/drive/labels/reference/rest/v2beta/labels
+* https://developers.google.com/drive/labels/reference/rest/v2/labels
-* https://developers.google.com/drive/labels/reference/rest/v2beta/labels.permissions
+* https://developers.google.com/drive/labels/reference/rest/v2/labels.permissions
 * https://developers.google.com/drive/api/guides/about-labels
 * https://developers.google.com/drive/api/v3/reference/files
 

docs/Users-Classroom-Profile.md

@@ -1,4 +1,4 @@
-!# Users - Classroom - Profile
+# Users - Classroom - Profile
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Display Classroom profile](#display-classroom-profile)

docs/Users-Contacts.md

@@ -1,4 +1,4 @@
-!# User Contacts
+# User Contacts
 - [Notes](#notes)
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)

docs/Users-Deprovision.md

@@ -1,4 +1,4 @@
-!# Users - Deprovision
+# Users - Deprovision
 - [Introduction](#introduction)
 - [Definitions](#definitions)
 - [Deprovision a user](#deprovision-a-user)

docs/Users-Drive-Activity-Settings.md

@@ -1,4 +1,4 @@
-!# Users - Drive - Activity/Settings
+# Users - Drive - Activity/Settings
 - [API documentation](#api-documentation)
 - [Query documentation](Users-Drive-Query)
 - [Definitions](#definitions)

docs/Users-Drive-Cleanup.md

@@ -1,4 +1,4 @@
-!# Users - Drive - Cleanup
+# Users - Drive - Cleanup
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Display empty folders](#display-empty-folders)

docs/Users-Drive-Comments.md

@@ -1,4 +1,4 @@
-!# Users - Drive - Comments
+# Users - Drive - Comments
 - [API documentation](#api-documentation)
 - [Query documentation](Users-Drive-Query)
 - [Definitions](#definitions)

docs/Users-Drive-Files-Display.md

@@ -416,7 +416,7 @@ gam <UserTypeEntity> show fileinfo <DriveFileEntity>
         [allfields|<DriveFieldName>*|(fields <DriveFieldNameList>)]
         (orderby <DriveFileOrderByFieldName> [ascending|descending])*
         [showdrivename] [showshareddrivepermissions]
-        [(showlabels details|ids)|(includelabels <DriveLabelIDList>)]
+        [(showlabels details|ids)|(includelabels <ClassificationLabelIDList>)]
         [showparentsidsaslist] [followshortcuts [<Boolean>]]
         [stripcrsfromname]
         [formatjson]
@@ -426,7 +426,7 @@ gam <UserTypeEntity> info drivefile <DriveFileEntity>
         [allfields|<DriveFieldName>*|(fields <DriveFieldNameList>)]
         (orderby <DriveFileOrderByFieldName> [ascending|descending])*
         [showdrivename] [showshareddrivepermissions]
-        [(showlabels details|ids)|(includelabels <DriveLabelIDList>)]
+        [(showlabels details|ids)|(includelabels <ClassificationLabelIDList>)]
         [showparentsidsaslist] [followshortcuts [<Boolean>]]
         [stripcrsfromname]
         [formatjson]
@@ -471,18 +471,18 @@ an API call per file is required to get the information.
 * `showlabels details`
 ```
   labels:
-    id: <DriveLabelID>
+    id: <ClassificationLabelID>
       revisionId: <Number>
-    id: <DriveLabelID>
+    id: <ClassificationLabelID>
       revisionId: <Number>
 ```
 * `showlabels ids`
 ```
-  labelsIds: <DriveLabelID> <DriveLabelID> ...
+  labelsIds: <ClassificationLabelID> <ClassificationLabelID> ...
 ```
 
 Starting in version 6.27.02, you can get Drive label information without an extra API call
-if you know the `<DriveLabelID>`s. Add `labelinfo` to your `fields` list and use `includelabels <DriveLabelIDList>`
+if you know the `<ClassificationLabelID>`s. Add `labelinfo` to your `fields` list and use `includelabels <ClassificationLabelIDList>`
 to specify the Drive labels.
 ```
 gam user user@domain.com show fileinfo <DriveFileEntity> fields id,name,mimetype,labelinfo includelabels "mRoha85IbwCRl490E00xGLvBsSbkwIiuZ6PRNNEbbFcb"
@@ -1079,7 +1079,7 @@ gam <UserTypeEntity> print|show filelist [todrive <ToDriveAttribute>*]
         [filepath|fullpath [folderpathonly [<Boolean>]] [pathdelimiter <Character>] [addpathstojson] [showdepth]] [buildtree]
         [allfields|<DriveFieldName>*|(fields <DriveFieldNameList>)]
         [showdrivename] [showshareddrivepermissions]
-        [(showlabels details|ids)|(includelabels <DriveLabelIDList>)]
+        [(showlabels details|ids)|(includelabels <ClassificationLabelIDList>)]
         [showparentsidsaslist] [showpermissionslast]
         (orderby <DriveFileOrderByFieldName> [ascending|descending])* [delimiter <Character>]
         [stripcrsfromname]

docs/Users-Drive-Files-Manage.md

@@ -18,7 +18,7 @@
 - [Purge files](#purge-files)
 - [Copy/Move Files](Users-Drive-Copy-Move)
 - [Shortcuts](Users-Drive-Shortcuts)
-- [Drive Labels](Users-Drive-Labels)
+- [Classification Labels](Users-Classification-Labels)
 - [Download Google Documents as JSON](#download-google-documents-as-json)
 - [Upload changes to Google Documents](#upload-changes-to-google-documents)
 

docs/Users-Drive-Orphans.md

@@ -1,4 +1,4 @@
-!# Users - Drive - Orphans
+# Users - Drive - Orphans
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Collect orphaned files](#collect-orphaned-files)

docs/Users-Drive-Ownership.md

@@ -1,4 +1,4 @@
-!# Users - Drive - Ownership
+# Users - Drive - Ownership
 - [API documentation](#api-documentation)
 - [Query documentation](Users-Drive-Query)
 - [Definitions](#definitions)

docs/Users-Drive-Query.md

@@ -1,4 +1,4 @@
-!# Users - Drive - Query
+# Users - Drive - Query
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)
 

docs/Users-Drive-Revisions.md

@@ -1,4 +1,4 @@
-!# Users - Drive - Revisions
+# Users - Drive - Revisions
 - [API documentation](#api-documentation)
 - [Query documentation](Users-Drive-Query)
 - [Definitions](#definitions)

docs/Users-Drive-Shortcuts.md

@@ -1,4 +1,4 @@
-!# Users - Drive Shortcuts
+# Users - Drive Shortcuts
 - [API documentation](#api-documentation)
 - [Query documentation](Users-Drive-Query)
 - [Python Regular Expressions](Python-Regular-Expressions) Sub function

docs/Users-Drive-Transfer.md

@@ -1,4 +1,4 @@
-!# Users - Drive - Transfer
+# Users - Drive - Transfer
 - [API documentation](#api-documentation)
 - [Query documentation](Users-Drive-Query)
 - [Definitions](#definitions)

docs/Users-Forms.md

@@ -1,4 +1,4 @@
-!# Users - Forms
+# Users - Forms
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Create a Form](#create-a-form)

docs/Users-Gmail-CSE.md

@@ -1,4 +1,4 @@
-!# Users - Gmail - Client Side Encryption
+# Users - Gmail - Client Side Encryption
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)

docs/Users-Gmail-Profile.md

@@ -1,4 +1,4 @@
-!# Users - Gmail - Profile
+# Users - Gmail - Profile
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Display Gmail profile](#display-gmail-profile)

docs/Users-Gmail-S-MIME.md

@@ -1,4 +1,4 @@
-!# Users - Gmail - S/MIME
+# Users - Gmail - S/MIME
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Create Gmail S/MIME configuration](#create-gmail-smime-configuration)

docs/Users-Gmail-Settings.md

@@ -1,4 +1,4 @@
-!# Users - Gmail - Settings
+# Users - Gmail - Settings
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Manage IMAP/POP](#manage-imappop)

docs/Users-Meet.md

@@ -1,4 +1,4 @@
-!# Users - Meet
+# Users - Meet
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)
 - [Introduction](#introduction)

docs/Users-Photo.md

@@ -1,4 +1,4 @@
-!# Users - Photo
+# Users - Photo
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Upload a user's photo from a default file](#upload-a-users-photo-from-a-default-file)

docs/Users-Profile-Sharing.md

@@ -1,4 +1,4 @@
-!# Users - Profile Sharing
+# Users - Profile Sharing
 - [Definitions](#definitions)
 - [Manage user's profile sharing](#manage-users-profile-sharing)
 - [Display user's profile sharing](#display-users-profile-sharing)

docs/Users-Shared-Drives.md

@@ -1,4 +1,4 @@
-!# Users - Shared Drives
+# Users - Shared Drives
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)
 - [Definitions](#definitions)

docs/Users-Signout-Turnoff2SV.md

@@ -1,4 +1,4 @@
-!# Users - Signout and Turn off 2-Step Verification
+# Users - Signout and Turn off 2-Step Verification
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Signout Users](#signout-users)

docs/Users-Spreadsheets.md

@@ -1,4 +1,4 @@
-!# Users - Spreadsheets
+# Users - Spreadsheets
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)
 - [Definitions](#definitions)

docs/Users-Tasks.md

@@ -1,4 +1,4 @@
-!# Users - Tasks
+# Users - Tasks
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)

docs/Users-Tokens.md

@@ -1,4 +1,4 @@
-!# Users - Tokens
+# Users - Tokens
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Delete a user's token](#delete-a-users-token)

docs/Users-YouTube.md

@@ -1,4 +1,4 @@
-!!# Users - YouTube
+# Users - YouTube
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)

docs/Using-GAM7-with-a-delegated-admin-service-account.md

@@ -1,4 +1,4 @@
-!# Using GAM7 with a delegated admin service account
+# Using GAM7 with a delegated admin service account
 - [Thanks](#thanks)
 - [Introduction](#introduction)
 - [Advantages](#advantages)

docs/Version-and-Help.md

@@ -3,7 +3,7 @@
 Print the current version of Gam with details
 ```
 gam version
-GAM 7.00.34 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.00.35 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.0 64-bit final
 MacOS Sonoma 14.5 x86_64
@@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00
 Print the current version of Gam with details and time offset information
 ```
 gam version timeoffset
-GAM 7.00.34 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.00.35 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.0 64-bit final
 MacOS Sonoma 14.5 x86_64
@@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second
 Print the current version of Gam with extended details and SSL information
 ```
 gam version extended
-GAM 7.00.34 - https://github.com/GAM-team/GAM - pyinstaller
+GAM 7.00.35 - https://github.com/GAM-team/GAM - pyinstaller
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.0 64-bit final
 MacOS Sonoma 14.5 x86_64
@@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64
 Path: /Users/Admin/bin/gam7
 Version Check:
   Current: 5.35.08
-   Latest: 7.00.34
+   Latest: 7.00.35
 echo $?
 1
 ```
@@ -72,7 +72,7 @@ echo $?
 Print the current version number without details
 ```
 gam version simple
-7.00.34
+7.00.35
 ```
 In Linux/MacOS you can do:
 ```
@@ -82,7 +82,7 @@ echo $VER
 Print the current version of Gam and address of this Wiki
 ```
 gam help
-GAM 7.00.34 - https://github.com/GAM-team/GAM
+GAM 7.00.35 - https://github.com/GAM-team/GAM
 GAM Team <google-apps-manager@googlegroups.com>
 Python 3.13.0 64-bit final
 MacOS Sonoma 14.5 x86_64

docs/_Sidebar.md

@@ -123,6 +123,7 @@ Service Account Access
 * [Users - Calendars - Access](Users-Calendars-Access)
 * [Users - Calendars - Events](Users-Calendars-Events)
 * [Users - Chat](Users-Chat)
+* [Users - Classification Labels](Users-Classification-Labels)
 * [Users - Classroom - Profile](Users-Classroom-Profile)
 * [Users - Deprovision](Users-Deprovision)
 * [Users - Contacts](Users-People-Contacts-Profiles)
@@ -134,7 +135,6 @@ Service Account Access
 * [Users - Drive - Copy/Move](Users-Drive-Copy-Move)
 * [Users - Drive - Files-Display](Users-Drive-Files-Display)
 * [Users - Drive - Files-Manage](Users-Drive-Files-Manage)
-* [Users - Drive - Labels](Users-Drive-Labels)
 * [Users - Drive - Orphans](Users-Drive-Orphans)
 * [Users - Drive - Ownership](Users-Drive-Ownership)
 * [Users - Drive - Permissions](Users-Drive-Permissions)

src/GamCommands.txt

@@ -379,6 +379,11 @@ If an item contains spaces, it should be surrounded by ".
 <GIGroupItem> ::= <EmailAddress>|<UniqueID>|groups/<String>
 <CIGroupType> ::= customer|group|other|serviceaccount|user
 <CIPolicyName> ::= policies/<String>|settings/<String>|<String>
+<ClassificationLabelID> ::= <String>
+<ClassificationLabelFieldID> ::= <String>
+<ClassificationLabelSelectionID> ::= <String>
+<ClassificationLabelName> ::= labels/<ClassificationLabelID>[@latest|@published|@<Number>]
+<ClassificationLabelPermissionName> ::= labels/<ClassificationLabelID>[@latest|@published|@<Number>]/permissions/(audiences|groups|people)/<String>
 <ClassroomInvitationID> ::= <String>
 <ClientID> ::= <String>
 <CommandID> ::= <String>
@@ -448,11 +453,6 @@ If an item contains spaces, it should be surrounded by ".
 <DriveFilePermissionID> ::= anyone|anyonewithlink|id:<String>
 <DriveFilePermissionIDorEmail> ::= <DriveFilePermissionID>|<EmailAddress>
 <DriveFileRevisionID> ::= <String>
-<DriveLabelID> ::= <String>
-<DriveLabelFieldID> ::= <String>
-<DriveLabelSelectionID> ::= <String>
-<DriveLabelName> ::= labels/<DriveLabelID>[@latest|@published|@<Number>]
-<DriveLabelPermissionName> ::= labels/<DriveLabelID>[@latest|@published|@<Number>]/permissions/(audiences|groups|people)/<String>
 <EmailAddress> ::= <String>@<DomainName>
 <EmailItem> ::= <EmailAddress>|<UniqueID>|<String>
 <EmailReplacement> ::= <String>
@@ -694,11 +694,6 @@ If an item contains spaces, it should be surrounded by ".
 <DriveFileRevisionIDList> ::= "<DriveFileRevisionID>(,<DriveFileRevisionID>)*"
 <DriveFolderIDList> ::= "<DriveFolderID>(,<DriveFolderID>)*"
 <DriveFolderNameList> ::= "<DriveFolderName>(,<DriveFolderName>)*"
-<DriveLabelIDList> ::= "<DriveLabelID>(,<DriveLabelID>)*"
-<DriveLabelNameList> ::= "<DriveLabelName>(,<DriveLabelName>)*"
-<DriveLabelPermissionNameList> ::= "<DriveLabelPermissionName>(,<DriveLabelPermissionName>)*"
-<DriveLabelFieldIDList> ::= "<DriveLabelFieldID>(,<DriveLabelFieldID>)*"
-<DriveLabelSelectionIDList> ::= "<DriveLabelSelectionID>(,<DriveLabelSelectionID>)*"
 <EmailAddressList> ::= "<EmailAddress>(,<EmailAddress>)*"
 <EmailItemList> ::= "<EmailItem>(,<EmailItem>)*"
 <EventIDList> ::= "<EventID>(,<EventID>)*"
@@ -1004,6 +999,10 @@ Specify a collection of items by directly specifying them; the item type is dete
         <CalendarList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
 <CIPolicyNameEntity> ::=
         <CIPolicyNameList> | <FileSelector> | <CSVFileSelector>
+<ClassificationLabelNameEntity> ::=
+        <ClassificationLabelNameList> | <FileSelector> | <CSVFileSelector> | <CSVDataSelector>
+<ClassificationLabelPermissionNameEntity> ::=
+        <ClassificationLabelPermissionNameList> | <FileSelector> | <CSVFileSelector> | <CSVDataSelector>
 <ClassroomInvitationIDEntity> ::=
         <ClassroomInvitationIDList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
 <ContactEntity> ::=
@@ -1127,10 +1126,6 @@ Specify a collection of items by directly specifying them; the item type is dete
         (first|last|allexceptfirst|allexceptlast <Number>)|
         (before|after <Time>) | (range <Time> <Time>)|
         <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
-<DriveLabelNameEntity> ::=
-        <DriveLabelNameList> | <FileSelector> | <CSVFileSelector> | <CSVDataSelector>
-<DriveLabelPermissionNameEntity> ::=
-        <DriveLabelPermissionNameList> | <FileSelector> | <CSVFileSelector> | <CSVDataSelector>
 <EmailAddressEntity> ::=
         <EmailAddressList> | <FileSelector> | <CSVFileSelector> | <CSVkmdSelector> | <CSVDataSelector>
 <FilterIDEntity> ::=
@@ -2707,6 +2702,35 @@ gam print chromesnvalidity [todrive <ToDriveAttribute>*]
         cros_sn <SerialNumberEntity> [listlimit <Number>]
         [delimiter <Character>]
 
+# Classification Labels
+
+gam [<UserTypeEntity>] info classificationlabels <ClassificationLabelNameEntity>
+        [[basic|full] [languagecode <LanguageCode>]
+        [formatjson] [adminaccess|asadmin]
+gam [<UserTypeEntity>] print classificationlabels [todrive <ToDriveAttribute>*]
+        [basic|full] [languagecode <LanguageCode>]
+        [publishedonly [<Boolean>]] [minimumrole applier|editor|organizer|reader]
+        [formatjson [quotechar <Character>]] [adminaccess|asadmin]
+gam [<UserTypeEntity>] show classificationlabels
+        [basic|full] [languagecode <LanguageCode>]
+        [publishedonly [<Boolean>]] [minimumrole applier|editor|organizer|reader]
+        [formatjson] [adminaccess|asadmin]
+`
+gam [<UserTypeEntity>] create classificationlabelpermission <ClassificationLabelNameEntity>
+        (user <UserItem>) | (group <GroupItem>) | (audience <String>)
+        role applier|editor|organizer|reader
+        [formatjson] [adminaccess|asadmin]
+gam [<UserTypeEntity>] delete classificationlabelpermission <ClassificationLabelNameEntity>
+        (user <UserItem>) | (group <GroupItem>) | (audience <String>)
+        [adminaccess|asadmin]
+gam [<UserTypeEntity>] remove classificationlabelpermission <ClassificationLabelPermissionNameEntity>
+        [adminaccess|asadmin]
+
+gam [<UserTypeEntity>] print classificationlabelpermissions <ClassificationLabelNameEntity> [todrive <ToDriveAttribute>*]
+        [formatjson [quotechar <Character>]] [adminaccess|asadmin]
+gam [<UserTypeEntity>] show classificationlabelpermissions <ClassificationLabelNameEntity>
+        [formatjson] [adminaccess|asadmin]
+
 # Context Aware Access
 
 <QueryCEL> ::= <String>
@@ -3534,35 +3558,6 @@ gam show people|peopleprofile
         [allfields|(fields <PeopleFieldNameList>)] [showmetadata]
         [formatjson]
 
-# Drive Labels
-
-gam [<UserTypeEntity>] info drivelabels <DriveLabelNameEntity>
-        [[basic|full] [languagecode <LanguageCode>]
-        [formatjson] [adminaccess|asadmin]
-gam [<UserTypeEntity>] print drivelabels [todrive <ToDriveAttribute>*]
-        [basic|full] [languagecode <LanguageCode>]
-        [publishedonly [<Boolean>]] [minimumrole applier|editor|organizer|reader]
-        [formatjson [quotechar <Character>]] [adminaccess|asadmin]
-gam [<UserTypeEntity>] show drivelabels
-        [basic|full] [languagecode <LanguageCode>]
-        [publishedonly [<Boolean>]] [minimumrole applier|editor|organizer|reader]
-        [formatjson] [adminaccess|asadmin]
-`
-gam [<UserTypeEntity>] create drivelabelpermission <DriveLabelNameEntity>
-        (user <UserItem>) | (group <GroupItem>) | (audience <String>)
-        role applier|editor|organizer|reader
-        [formatjson] [adminaccess|asadmin]
-gam [<UserTypeEntity>] delete drivelabelpermission <DriveLabelNameEntity>
-        (user <UserItem>) | (group <GroupItem>) | (audience <String>)
-        [adminaccess|asadmin]
-gam [<UserTypeEntity>] remove drivelabelpermission <DriveLabelPermissionNameEntity>
-        [adminaccess|asadmin]
-
-gam [<UserTypeEntity>] print drivelabelpermissions <DriveLabelNameEntity> [todrive <ToDriveAttribute>*]
-        [formatjson [quotechar <Character>]] [adminaccess|asadmin]
-gam [<UserTypeEntity>] show drivelabelpermissions <DriveLabelNameEntity>
-        [formatjson] [adminaccess|asadmin]
-
 # Email Audit Monitor
 
 gam audit monitor create <EmailAddress> <DestEmailAddress> [begin <DateTime>] [end <DateTime>]
@@ -6564,7 +6559,7 @@ gam <UserTypeEntity> info drivefile <DriveFileEntity>
         [allfields|<DriveFieldName>*|(fields <DriveFieldNameList>)]
         (orderby <DriveFileOrderByFieldName> [ascending|descending])*
         [showdrivename] [showshareddrivepermissions]
-        [(showlabels details|ids)|(includelabels <DriveLabelIDList>)]
+        [(showlabels details|ids)|(includelabels <ClassificationLabelIDList>)]
         [showparentsidsaslist] [followshortcuts [<Boolean>]]
         [stripcrsfromname]
         [formatjson]
@@ -6668,26 +6663,13 @@ gam <UserTypeEntity> create|add permissions <DriveFileEntity> <DriveFilePermissi
 gam <UserTypeEntity> delete permissions <DriveFileEntity> <DriveFilePermissionIDEntity>
         <PermissionMatch>* [<PermissionMatchAction>]
 
-gam [<UserTypeEntity>] info drivelabels <DriveLabelNameEntity>
-        [[basic|full] [languagecode <BCP47LanguageCode>]
-        [formatjson] [adminaccess|asadmin]
-
-gam [<UserTypeEntity>] print <drivelabels> [todrive <ToDriveAttribute>*]
-        [basic|full] [languagecode <BCP47LanguageCode>]
-        [publishedonly [<Boolean>]] [minimumrole applier|editor|organizer|reader]
-        [formatjson [quotechar <Character>]] [adminaccess|asadmin]
-gam [<UserTypeEntity>] show drivelabels
-        [basic|full] [languagecode <BCP47LanguageCode>]
-        [publishedonly [<Boolean>]] [minimumrole applier|editor|organizer|reader]
-        [formatjson] [adminaccess|asadmin]
-
 gam <UserTypeEntity> process filedrivelabels <DriveFileEntity>
-        (addlabel <DriveLabelIDList>)*
+        (addlabel <ClassificationLabelIDList>)*
-        (deletelabel <DriveLabelIDList>)*
+        (deletelabel <ClassificationLabelIDList>)*
-        (addlabelfield <DriveLabelID> <DriveLabelFieldID>
+        (addlabelfield <ClassificationLabelID> <ClassificationLabelFieldID>
-            (text <String>)|selection <DriveLabelSelectionIDList>)|
+            (text <String>)|selection <ClassificationLabelSelectionIDList>)|
             (integer <Number>)|(date <Date>)|(user <EmailAddressList>))*
-        (deletelabelfield <DriveLabelID> <DriveLabelFieldID>)*
+        (deletelabelfield <ClassificationLabelID> <ClassificationLabelFieldID>)*
         [nodetails]
 
 gam show ownership <DriveFileID>|(drivefilename <DriveFileName>)
@@ -6873,12 +6855,12 @@ gam <UserTypeEntity> collect orphans
         contentrestrictions.restrictiontime|
         contentrestrictions.type
 
-<DriveLabelInfoSubfieldName> ::=
+<ClassificationLabelInfoSubfieldName> ::=
         labels.id|              # modifiedByMe
         labels.revisionid|      # copyRequiresWriterPermission
         labels.fields           # viewedByMe
 
-<DriveLabelsSubfieldName> ::=
+<ClassificationLabelsSubfieldName> ::=
         labels.modified|        # modifiedByMe
         labels.restricted|      # copyRequiresWriterPermission
         labels.starred|         # starred
@@ -6984,9 +6966,9 @@ gam <UserTypeEntity> collect orphans
         inheritedpermissionsdisabled|
         isappauthorized|
         labelinfo|
-        <DriveLabelInfoSubfieldName>|
+        <ClassificationLabelInfoSubfieldName>|
         labels|
-        <DriveLabelsSubfieldName>|
+        <ClassificationLabelsSubfieldName>|
         lastmodifyinguser|
         <DriveLastModifyingUserSubfieldName>|
         lastmodifyingusername|
@@ -7050,7 +7032,7 @@ gam <UserTypeEntity> show fileinfo <DriveFileEntity>
         [allfields|<DriveFieldName>*|(fields <DriveFieldNameList>)]
         (orderby <DriveFileOrderByFieldName> [ascending|descending])*
         [showdrivename] [showshareddrivepermissions]
-        [(showlabels details|ids)|(includelabels <DriveLabelIDList>)]
+        [(showlabels details|ids)|(includelabels <ClassificationLabelIDList>)]
         [showparentsidsaslist] [followshortcuts [<Boolean>]]
         [stripcrsfromname]
         [formatjson]
@@ -7166,7 +7148,7 @@ gam <UserTypeEntity> print filelist [todrive <ToDriveAttribute>*]
         [filepath|fullpath [folderpathonly [<Boolean>]] [pathdelimiter <Character>] [addpathstojson] [showdepth]] [buildtree]
         [allfields|<DriveFieldName>*|(fields <DriveFieldNameList>)]
         [showdrivename] [showshareddrivepermissions]
-        [(showlabels details|ids)|(includelabels <DriveLabelIDList>)]
+        [(showlabels details|ids)|(includelabels <ClassificationLabelIDList>)]
         [showparentsidsaslist] [showpermissionslast]
         (orderby <DriveFileOrderByFieldName> [ascending|descending])* [delimiter <Character>]
         [stripcrsfromname]