From 31e8ac11a24fcaf187ef466118d6aa382e854e2f Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Sat, 2 Nov 2024 12:41:22 -0700
Subject: [PATCH] Classification labels are now available for Gmail in addition
 to Drive.

---
 docs/Addresses.md                             |   2 +-
 docs/Administrators.md                        |   2 +-
 docs/Alert-Center.md                          |   2 +-
 docs/Authorization.md                         |   4 +-
 docs/BNF-Syntax.md                            |   2 +-
 docs/Basic-Items.md                           |  10 +-
 docs/Bulk-Processing.md                       |   2 +-
 docs/CSV-Special-Characters.md                |   2 +-
 docs/Chat-Bot.md                              |   2 +-
 docs/Chrome-AUE-Counts.md                     |   2 +-
 docs/Chrome-Installed-Apps.md                 |   2 +-
 docs/Chrome-Needs-Attention-Counts.md         |   2 +-
 docs/Chrome-Policies.md                       |   2 +-
 docs/Chrome-Printers.md                       |   2 +-
 docs/Chrome-Version-Counts.md                 |   2 +-
 docs/Chrome-Version-History.md                |   2 +-
 docs/Cloud-Channel.md                         |   2 +-
 docs/Cloud-Identity-Devices.md                |   2 +-
 docs/Cloud-Storage.md                         |   2 +-
 docs/Collections-of-ChromeOS-Devices.md       |   2 +-
 docs/Collections-of-Items.md                  |   8 +-
 docs/Collections-of-Users.md                  |   2 +-
 ...nd-Data-From-Google-Docs-Sheets-Storage.md |   2 +-
 docs/Command-Line-Parsing.md                  |   2 +-
 docs/Command-Logging-Progress.md              |   2 +-
 docs/Customer.md                              |   2 +-
 docs/Domains-Verification.md                  |   2 +-
 docs/Domains.md                               |   2 +-
 docs/Downloads-Installs.md                    |   2 +-
 docs/Drive-Items.md                           |   2 +-
 docs/Email-Audit-Monitor.md                   |   2 +-
 docs/Find-File-Owner.md                       |   2 +-
 docs/GAM-Return-Codes.md                      |   2 +-
 docs/GAM-with-minimal-GCP-rights.md           |   2 +-
 docs/GAM7-on-Android-Devices.md               |   2 +-
 docs/GAM7-on-Chrome-OS-Devices.md             |   2 +-
 docs/GamUpdates.md                            |  18 +++
 docs/Google-Data-Transfers.md                 |   2 +-
 docs/Google-Network-Addresses.md              |   2 +-
 docs/HTTPS-Proxy.md                           |   2 +-
 docs/How-to-Install-GAM7.md                   |   2 +-
 docs/How-to-Uninstall-GAM7.md                 |   2 +-
 docs/How-to-Update-GAM7.md                    |   2 +-
 docs/How-to-Upgrade-Legacy-GAM-to-GAM7.md     |   4 +-
 docs/Inbound-SSO.md                           |   2 +-
 docs/Licenses.md                              |   2 +-
 docs/List-Items.md                            |  10 +-
 docs/List.md                                  |   2 +-
 docs/Meta-Commands-and-File-Redirection.md    |   2 +-
 docs/Mobile-Devices.md                        |   2 +-
 docs/Organizational-Units.md                  |   2 +-
 docs/Other-Resources.md                       |   2 +-
 docs/Permission-Matches.md                    |   2 +-
 docs/Python-Regular-Expressions.md            |   2 +-
 docs/Rclone.md                                |   2 +-
 docs/Reseller.md                              |   2 +-
 docs/SSL-Root-CA-Certificates.md              |   2 +-
 docs/Scripts.md                               |   2 +-
 docs/Tag-Replace.md                           |   2 +-
 docs/Todrive.md                               |   2 +-
 docs/Unmanaged-Accounts.md                    |   2 +-
 docs/Upgrade-Benefits.md                      |   2 +-
 docs/Users-Analytics-Admin.md                 |   2 +-
 docs/Users-Application-Specific-Passwords.md  |   2 +-
 docs/Users-Backup-Verification-Codes.md       |   2 +-
 docs/Users-Calendars-Access.md                |   2 +-
 docs/Users-Chat.md                            |   2 +-
 ...bels.md => Users-Classification-Labels.md} |   6 +-
 docs/Users-Classroom-Profile.md               |   2 +-
 docs/Users-Contacts.md                        |   2 +-
 docs/Users-Deprovision.md                     |   2 +-
 docs/Users-Drive-Activity-Settings.md         |   2 +-
 docs/Users-Drive-Cleanup.md                   |   2 +-
 docs/Users-Drive-Comments.md                  |   2 +-
 docs/Users-Drive-Files-Display.md             |  14 +--
 docs/Users-Drive-Files-Manage.md              |   2 +-
 docs/Users-Drive-Orphans.md                   |   2 +-
 docs/Users-Drive-Ownership.md                 |   2 +-
 docs/Users-Drive-Query.md                     |   2 +-
 docs/Users-Drive-Revisions.md                 |   2 +-
 docs/Users-Drive-Shortcuts.md                 |   2 +-
 docs/Users-Drive-Transfer.md                  |   2 +-
 docs/Users-Forms.md                           |   2 +-
 docs/Users-Gmail-CSE.md                       |   2 +-
 docs/Users-Gmail-Profile.md                   |   2 +-
 docs/Users-Gmail-S-MIME.md                    |   2 +-
 docs/Users-Gmail-Settings.md                  |   2 +-
 docs/Users-Meet.md                            |   2 +-
 docs/Users-Photo.md                           |   2 +-
 docs/Users-Profile-Sharing.md                 |   2 +-
 docs/Users-Shared-Drives.md                   |   2 +-
 docs/Users-Signout-Turnoff2SV.md              |   2 +-
 docs/Users-Spreadsheets.md                    |   2 +-
 docs/Users-Tasks.md                           |   2 +-
 docs/Users-Tokens.md                          |   2 +-
 docs/Users-YouTube.md                         |   2 +-
 ...-with-a-delegated-admin-service-account.md |   2 +-
 docs/Version-and-Help.md                      |  12 +-
 docs/_Sidebar.md                              |   2 +-
 src/GamCommands.txt                           | 118 ++++++++----------
 src/GamUpdate.txt                             |  18 +++
 src/gam/__init__.py                           | 102 ++++++++-------
 src/gam/gamlib/glapi.py                       |   8 +-
 src/gam/gamlib/glclargs.py                    |  14 ++-
 src/gam/gamlib/glentity.py                    |  24 ++--
 105 files changed, 290 insertions(+), 260 deletions(-)
 rename docs/{Users-Drive-Labels.md => Users-Classification-Labels.md} (98%)

diff --git a/docs/Addresses.md b/docs/Addresses.md
index a9badf46..aaf9dbe0 100644
--- a/docs/Addresses.md
+++ b/docs/Addresses.md
@@ -1,4 +1,4 @@
-!# Addresses
+# Addresses
 - [API documentation](#api-documentation)
 - [Display addresses](#display-addresses)
 
diff --git a/docs/Administrators.md b/docs/Administrators.md
index 57ca302e..3b2d96d6 100644
--- a/docs/Administrators.md
+++ b/docs/Administrators.md
@@ -1,4 +1,4 @@
-!# Administrators
+# Administrators
 - [Administrator roles documentation](#administrator-roles-documentation)
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
diff --git a/docs/Alert-Center.md b/docs/Alert-Center.md
index 06136968..1469dd68 100644
--- a/docs/Alert-Center.md
+++ b/docs/Alert-Center.md
@@ -1,4 +1,4 @@
-!# Alert Center
+# Alert Center
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Introduction](#introduction)
diff --git a/docs/Authorization.md b/docs/Authorization.md
index ab1874c4..831c694d 100644
--- a/docs/Authorization.md
+++ b/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)
-[*] 22)  Drive Labels API v2beta - User (supports readonly)
+[*] 21)  Drive Labels API - Admin (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)
diff --git a/docs/BNF-Syntax.md b/docs/BNF-Syntax.md
index 8c2bcf9b..cfd47768 100644
--- a/docs/BNF-Syntax.md
+++ b/docs/BNF-Syntax.md
@@ -1,4 +1,4 @@
-!# Syntax
+# Syntax
 
 ## BNF Syntax
 This Wiki describes the GAM7 command line syntax in modified BNF.
diff --git a/docs/Basic-Items.md b/docs/Basic-Items.md
index ceccc91f..60c847e0 100644
--- a/docs/Basic-Items.md
+++ b/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>
diff --git a/docs/Bulk-Processing.md b/docs/Bulk-Processing.md
index c8ca553a..edadd4c5 100644
--- a/docs/Bulk-Processing.md
+++ b/docs/Bulk-Processing.md
@@ -1,4 +1,4 @@
-!# Bulk Processing
+# Bulk Processing
 - [Introduction](#introduction)
 - [Python Regular Expressions](Python-Regular-Expressions)
 - [GAM Configuration](gam.cfg)
diff --git a/docs/CSV-Special-Characters.md b/docs/CSV-Special-Characters.md
index e46a225e..72dc9c08 100644
--- a/docs/CSV-Special-Characters.md
+++ b/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:
diff --git a/docs/Chat-Bot.md b/docs/Chat-Bot.md
index a5ec1baa..e6fbb94e 100644
--- a/docs/Chat-Bot.md
+++ b/docs/Chat-Bot.md
@@ -1,4 +1,4 @@
-!# Chat Bot
+# Chat Bot
 
 - [Notes](#notes)
 - [API documentation](#api-documentation)
diff --git a/docs/Chrome-AUE-Counts.md b/docs/Chrome-AUE-Counts.md
index d11e96cb..216b3375 100644
--- a/docs/Chrome-AUE-Counts.md
+++ b/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)
diff --git a/docs/Chrome-Installed-Apps.md b/docs/Chrome-Installed-Apps.md
index f991ffb1..dfd9f1a8 100644
--- a/docs/Chrome-Installed-Apps.md
+++ b/docs/Chrome-Installed-Apps.md
@@ -1,4 +1,4 @@
-!# Chrome Installed Apps Counts
+# Chrome Installed Apps Counts
 
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
diff --git a/docs/Chrome-Needs-Attention-Counts.md b/docs/Chrome-Needs-Attention-Counts.md
index 9a70fa1b..86eb76d7 100644
--- a/docs/Chrome-Needs-Attention-Counts.md
+++ b/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)
diff --git a/docs/Chrome-Policies.md b/docs/Chrome-Policies.md
index 8dcca755..b62511c7 100644
--- a/docs/Chrome-Policies.md
+++ b/docs/Chrome-Policies.md
@@ -1,4 +1,4 @@
-!# Chrome Policies
+# Chrome Policies
 
 - [Chrome Policies](#chrome-policies)
   - [Chrome Version History](Chrome-Version-History)
diff --git a/docs/Chrome-Printers.md b/docs/Chrome-Printers.md
index ae650c4d..16da2eba 100644
--- a/docs/Chrome-Printers.md
+++ b/docs/Chrome-Printers.md
@@ -1,4 +1,4 @@
-!# Chrome Printers
+# Chrome Printers
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)
diff --git a/docs/Chrome-Version-Counts.md b/docs/Chrome-Version-Counts.md
index 4cbaac93..3564ef9a 100644
--- a/docs/Chrome-Version-Counts.md
+++ b/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)
diff --git a/docs/Chrome-Version-History.md b/docs/Chrome-Version-History.md
index 6865bdc2..1afe4509 100644
--- a/docs/Chrome-Version-History.md
+++ b/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)
diff --git a/docs/Cloud-Channel.md b/docs/Cloud-Channel.md
index 73b10e44..3988fb0c 100644
--- a/docs/Cloud-Channel.md
+++ b/docs/Cloud-Channel.md
@@ -1,4 +1,4 @@
-!# Cloud Channel
+# Cloud Channel
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)
diff --git a/docs/Cloud-Identity-Devices.md b/docs/Cloud-Identity-Devices.md
index fc312f08..e68da9ed 100644
--- a/docs/Cloud-Identity-Devices.md
+++ b/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)
diff --git a/docs/Cloud-Storage.md b/docs/Cloud-Storage.md
index 84172b44..57cc5a3e 100644
--- a/docs/Cloud-Storage.md
+++ b/docs/Cloud-Storage.md
@@ -1,4 +1,4 @@
-!# Cloud Storage
+# Cloud Storage
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)
diff --git a/docs/Collections-of-ChromeOS-Devices.md b/docs/Collections-of-ChromeOS-Devices.md
index 48aeb87a..7cfad1b4 100644
--- a/docs/Collections-of-ChromeOS-Devices.md
+++ b/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)
diff --git a/docs/Collections-of-Items.md b/docs/Collections-of-Items.md
index f35562fd..c2669a26 100644
--- a/docs/Collections-of-Items.md
+++ b/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> ::=
diff --git a/docs/Collections-of-Users.md b/docs/Collections-of-Users.md
index 2d9eb7f0..3963fd23 100644
--- a/docs/Collections-of-Users.md
+++ b/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)
diff --git a/docs/Command-Data-From-Google-Docs-Sheets-Storage.md b/docs/Command-Data-From-Google-Docs-Sheets-Storage.md
index 7f76f00d..d82cee7f 100644
--- a/docs/Command-Data-From-Google-Docs-Sheets-Storage.md
+++ b/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)
diff --git a/docs/Command-Line-Parsing.md b/docs/Command-Line-Parsing.md
index 65ed58eb..335a6a71 100644
--- a/docs/Command-Line-Parsing.md
+++ b/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)
diff --git a/docs/Command-Logging-Progress.md b/docs/Command-Logging-Progress.md
index edafa93c..c7b2314f 100644
--- a/docs/Command-Logging-Progress.md
+++ b/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)
diff --git a/docs/Customer.md b/docs/Customer.md
index 7938e585..20283fa9 100644
--- a/docs/Customer.md
+++ b/docs/Customer.md
@@ -1,4 +1,4 @@
-!# Customer
+# Customer
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Update customer](#update-customer)
diff --git a/docs/Domains-Verification.md b/docs/Domains-Verification.md
index 443a653e..4989b4d8 100644
--- a/docs/Domains-Verification.md
+++ b/docs/Domains-Verification.md
@@ -1,4 +1,4 @@
-!# Domains - Verification
+# Domains - Verification
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Introduction](#introduction)
diff --git a/docs/Domains.md b/docs/Domains.md
index 4b81151d..a0e42d08 100644
--- a/docs/Domains.md
+++ b/docs/Domains.md
@@ -1,4 +1,4 @@
-!# Domains
+# Domains
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Create a domain](#create-a-domain)
diff --git a/docs/Downloads-Installs.md b/docs/Downloads-Installs.md
index fab77379..7c75f9ae 100644
--- a/docs/Downloads-Installs.md
+++ b/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:
 
diff --git a/docs/Drive-Items.md b/docs/Drive-Items.md
index bf48b103..03aaca41 100644
--- a/docs/Drive-Items.md
+++ b/docs/Drive-Items.md
@@ -1,4 +1,4 @@
-!# Drive Items
+# Drive Items
 - [Basic Items](Basic-Items)
 - [List Items](List-Items)
 ```
diff --git a/docs/Email-Audit-Monitor.md b/docs/Email-Audit-Monitor.md
index a55d29dd..709d3da3 100644
--- a/docs/Email-Audit-Monitor.md
+++ b/docs/Email-Audit-Monitor.md
@@ -1,4 +1,4 @@
-!# Email Audit Monitor
+# Email Audit Monitor
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)
diff --git a/docs/Find-File-Owner.md b/docs/Find-File-Owner.md
index 8ab595d5..cd43b707 100644
--- a/docs/Find-File-Owner.md
+++ b/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)
diff --git a/docs/GAM-Return-Codes.md b/docs/GAM-Return-Codes.md
index 5dcfbfb7..6bd2575d 100644
--- a/docs/GAM-Return-Codes.md
+++ b/docs/GAM-Return-Codes.md
@@ -1,4 +1,4 @@
-!# GAM Return Codes
+# GAM Return Codes
 
 These are the return codes used by GAM7.
 
diff --git a/docs/GAM-with-minimal-GCP-rights.md b/docs/GAM-with-minimal-GCP-rights.md
index 76d7113f..5be9e4c1 100644
--- a/docs/GAM-with-minimal-GCP-rights.md
+++ b/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.
 
diff --git a/docs/GAM7-on-Android-Devices.md b/docs/GAM7-on-Android-Devices.md
index bda1a569..c169664c 100644
--- a/docs/GAM7-on-Android-Devices.md
+++ b/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)._
diff --git a/docs/GAM7-on-Chrome-OS-Devices.md b/docs/GAM7-on-Chrome-OS-Devices.md
index 5a15cd28..6764e238 100644
--- a/docs/GAM7-on-Chrome-OS-Devices.md
+++ b/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).
diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md
index bf6f0d9b..c253d526 100644
--- a/docs/GamUpdates.md
+++ b/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.
diff --git a/docs/Google-Data-Transfers.md b/docs/Google-Data-Transfers.md
index ef86526d..17997a40 100644
--- a/docs/Google-Data-Transfers.md
+++ b/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)
diff --git a/docs/Google-Network-Addresses.md b/docs/Google-Network-Addresses.md
index 0a136a0e..bd4c40d6 100644
--- a/docs/Google-Network-Addresses.md
+++ b/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:
 ```
diff --git a/docs/HTTPS-Proxy.md b/docs/HTTPS-Proxy.md
index 0ff3cdf8..e094adac 100644
--- a/docs/HTTPS-Proxy.md
+++ b/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.
diff --git a/docs/How-to-Install-GAM7.md b/docs/How-to-Install-GAM7.md
index d792fce1..92c5a288 100644
--- a/docs/How-to-Install-GAM7.md
+++ b/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.
 
diff --git a/docs/How-to-Uninstall-GAM7.md b/docs/How-to-Uninstall-GAM7.md
index f26f8bf8..5ac0bb76 100644
--- a/docs/How-to-Uninstall-GAM7.md
+++ b/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)
diff --git a/docs/How-to-Update-GAM7.md b/docs/How-to-Update-GAM7.md
index a0ff1b69..d4525699 100644
--- a/docs/How-to-Update-GAM7.md
+++ b/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)
diff --git a/docs/How-to-Upgrade-Legacy-GAM-to-GAM7.md b/docs/How-to-Upgrade-Legacy-GAM-to-GAM7.md
index 15096866..67cb8331 100644
--- a/docs/How-to-Upgrade-Legacy-GAM-to-GAM7.md
+++ b/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
diff --git a/docs/Inbound-SSO.md b/docs/Inbound-SSO.md
index fa609cbe..9c5f10ab 100644
--- a/docs/Inbound-SSO.md
+++ b/docs/Inbound-SSO.md
@@ -1,4 +1,4 @@
-!# Inbound SSO
+# Inbound SSO
 - [Admin Console](#admin-console)
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
diff --git a/docs/Licenses.md b/docs/Licenses.md
index 9ec1a8d4..81a6fa65 100644
--- a/docs/Licenses.md
+++ b/docs/Licenses.md
@@ -1,4 +1,4 @@
-!# Licenses
+# Licenses
 - [API documentation](#api-documentation)
 - [License Products and SKUs](#license-products-and-skus)
 - [Definitions](#definitions)
diff --git a/docs/List-Items.md b/docs/List-Items.md
index 92dbd1bd..61eefbe6 100644
--- a/docs/List-Items.md
+++ b/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>)*"
diff --git a/docs/List.md b/docs/List.md
index 6c89a0e6..28b7543c 100644
--- a/docs/List.md
+++ b/docs/List.md
@@ -1,4 +1,4 @@
-!# List
+# List
 
 The list command is used to verify collections of objects.
 
diff --git a/docs/Meta-Commands-and-File-Redirection.md b/docs/Meta-Commands-and-File-Redirection.md
index 671bd0ab..101f3024 100644
--- a/docs/Meta-Commands-and-File-Redirection.md
+++ b/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)
diff --git a/docs/Mobile-Devices.md b/docs/Mobile-Devices.md
index bff25d8f..ac4c6593 100644
--- a/docs/Mobile-Devices.md
+++ b/docs/Mobile-Devices.md
@@ -1,4 +1,4 @@
-!# Mobile Devices
+# Mobile Devices
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)
 - [Definitions](#definitions)
diff --git a/docs/Organizational-Units.md b/docs/Organizational-Units.md
index ab577353..a006f5ab 100644
--- a/docs/Organizational-Units.md
+++ b/docs/Organizational-Units.md
@@ -1,4 +1,4 @@
-!# Organizational Units
+# Organizational Units
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
 - [Special quoting](#special-quoting)
diff --git a/docs/Other-Resources.md b/docs/Other-Resources.md
index 70f8e161..56db2562 100644
--- a/docs/Other-Resources.md
+++ b/docs/Other-Resources.md
@@ -1,4 +1,4 @@
-!# Other Resources
+# Other Resources
 
 The following are links to contributions of others in support of GAM7.
 
diff --git a/docs/Permission-Matches.md b/docs/Permission-Matches.md
index 7f303a99..9bd73156 100644
--- a/docs/Permission-Matches.md
+++ b/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)
diff --git a/docs/Python-Regular-Expressions.md b/docs/Python-Regular-Expressions.md
index 63aca8ed..c2f7edd9 100644
--- a/docs/Python-Regular-Expressions.md
+++ b/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)
diff --git a/docs/Rclone.md b/docs/Rclone.md
index ac49d4dc..48ee2c29 100644
--- a/docs/Rclone.md
+++ b/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/
diff --git a/docs/Reseller.md b/docs/Reseller.md
index 3fc92b1c..feb86851 100644
--- a/docs/Reseller.md
+++ b/docs/Reseller.md
@@ -1,4 +1,4 @@
-!# Reseller
+# Reseller
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Manage Multiple Domains](#manage-multiple-domains)
diff --git a/docs/SSL-Root-CA-Certificates.md b/docs/SSL-Root-CA-Certificates.md
index e353dbe2..4349db6b 100644
--- a/docs/SSL-Root-CA-Certificates.md
+++ b/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/
 
diff --git a/docs/Scripts.md b/docs/Scripts.md
index 26835a5f..9102684c 100644
--- a/docs/Scripts.md
+++ b/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.
diff --git a/docs/Tag-Replace.md b/docs/Tag-Replace.md
index 10bcc933..acced30e 100644
--- a/docs/Tag-Replace.md
+++ b/docs/Tag-Replace.md
@@ -1,4 +1,4 @@
-!# Tag Replace
+# Tag Replace
 - [Python Regular Expressions](Python-Regular-Expressions) Sub function
 - [Definitions](#definitions)
 - [Introduction](#introduction)
diff --git a/docs/Todrive.md b/docs/Todrive.md
index b5ca4ade..06c6407c 100644
--- a/docs/Todrive.md
+++ b/docs/Todrive.md
@@ -1,4 +1,4 @@
-!# Todrive
+# Todrive
 - [Introduction](#introduction)
 - [Definitions](#definitions)
 - [Config file options](#config-file-options)
diff --git a/docs/Unmanaged-Accounts.md b/docs/Unmanaged-Accounts.md
index f192d345..1aa4ea84 100644
--- a/docs/Unmanaged-Accounts.md
+++ b/docs/Unmanaged-Accounts.md
@@ -1,4 +1,4 @@
-!# Unmanaged Accounts
+# Unmanaged Accounts
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Collections of Users](Collections-of-Users)
diff --git a/docs/Upgrade-Benefits.md b/docs/Upgrade-Benefits.md
index 0607729c..e93bf4d3 100644
--- a/docs/Upgrade-Benefits.md
+++ b/docs/Upgrade-Benefits.md
@@ -1,4 +1,4 @@
-!# Upgrade Benefits
+# Upgrade Benefits
 - [Configuration](#Configuration)
 - [Syntax Checking](#syntax-checking)
 - [API error checking](#api-error-checking)
diff --git a/docs/Users-Analytics-Admin.md b/docs/Users-Analytics-Admin.md
index ef06abf2..84a07bab 100644
--- a/docs/Users-Analytics-Admin.md
+++ b/docs/Users-Analytics-Admin.md
@@ -1,4 +1,4 @@
-!# Users - Analytics Admin
+# Users - Analytics Admin
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)
diff --git a/docs/Users-Application-Specific-Passwords.md b/docs/Users-Application-Specific-Passwords.md
index 75d335b2..14452e13 100644
--- a/docs/Users-Application-Specific-Passwords.md
+++ b/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)
diff --git a/docs/Users-Backup-Verification-Codes.md b/docs/Users-Backup-Verification-Codes.md
index bc88f736..c4f40e53 100644
--- a/docs/Users-Backup-Verification-Codes.md
+++ b/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)
diff --git a/docs/Users-Calendars-Access.md b/docs/Users-Calendars-Access.md
index 1903569e..de13c148 100644
--- a/docs/Users-Calendars-Access.md
+++ b/docs/Users-Calendars-Access.md
@@ -1,4 +1,4 @@
-!# Users - Calendars - Access
+# Users - Calendars - Access
 - [Notes](#Notes)
 - [API documentation](#api-documentation)
 - [Definitions](#definitions)
diff --git a/docs/Users-Chat.md b/docs/Users-Chat.md
index 6f7d5922..122bb213 100644
--- a/docs/Users-Chat.md
+++ b/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)
diff --git a/docs/Users-Drive-Labels.md b/docs/Users-Classification-Labels.md
similarity index 98%
rename from docs/Users-Drive-Labels.md
rename to docs/Users-Classification-Labels.md
index 180862f2..8199fdff 100644
--- a/docs/Users-Drive-Labels.md
+++ b/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/v2beta/labels.permissions
+* https://developers.google.com/drive/labels/reference/rest/v2/labels
+* 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
 
diff --git a/docs/Users-Classroom-Profile.md b/docs/Users-Classroom-Profile.md
index 55699385..fea5c501 100644
--- a/docs/Users-Classroom-Profile.md
+++ b/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)
diff --git a/docs/Users-Contacts.md b/docs/Users-Contacts.md
index c4d53d02..ec184308 100644
--- a/docs/Users-Contacts.md
+++ b/docs/Users-Contacts.md
@@ -1,4 +1,4 @@
-!# User Contacts
+# User Contacts
 - [Notes](#notes)
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)
diff --git a/docs/Users-Deprovision.md b/docs/Users-Deprovision.md
index 6c964cf3..7d01448d 100644
--- a/docs/Users-Deprovision.md
+++ b/docs/Users-Deprovision.md
@@ -1,4 +1,4 @@
-!# Users - Deprovision
+# Users - Deprovision
 - [Introduction](#introduction)
 - [Definitions](#definitions)
 - [Deprovision a user](#deprovision-a-user)
diff --git a/docs/Users-Drive-Activity-Settings.md b/docs/Users-Drive-Activity-Settings.md
index 238b622b..4d00257e 100644
--- a/docs/Users-Drive-Activity-Settings.md
+++ b/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)
diff --git a/docs/Users-Drive-Cleanup.md b/docs/Users-Drive-Cleanup.md
index ad432516..63249c87 100644
--- a/docs/Users-Drive-Cleanup.md
+++ b/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)
diff --git a/docs/Users-Drive-Comments.md b/docs/Users-Drive-Comments.md
index 80dc2a85..76c7706b 100644
--- a/docs/Users-Drive-Comments.md
+++ b/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)
diff --git a/docs/Users-Drive-Files-Display.md b/docs/Users-Drive-Files-Display.md
index 4c0268a2..4feeb3e6 100644
--- a/docs/Users-Drive-Files-Display.md
+++ b/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]
diff --git a/docs/Users-Drive-Files-Manage.md b/docs/Users-Drive-Files-Manage.md
index 23d02a11..5b6c0b3b 100644
--- a/docs/Users-Drive-Files-Manage.md
+++ b/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)
 
diff --git a/docs/Users-Drive-Orphans.md b/docs/Users-Drive-Orphans.md
index 7383c35a..f851ac59 100644
--- a/docs/Users-Drive-Orphans.md
+++ b/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)
diff --git a/docs/Users-Drive-Ownership.md b/docs/Users-Drive-Ownership.md
index 0a41b420..5431d664 100644
--- a/docs/Users-Drive-Ownership.md
+++ b/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)
diff --git a/docs/Users-Drive-Query.md b/docs/Users-Drive-Query.md
index 72230838..953b042b 100644
--- a/docs/Users-Drive-Query.md
+++ b/docs/Users-Drive-Query.md
@@ -1,4 +1,4 @@
-!# Users - Drive - Query
+# Users - Drive - Query
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)
 
diff --git a/docs/Users-Drive-Revisions.md b/docs/Users-Drive-Revisions.md
index 1a0b8d68..f856ac46 100644
--- a/docs/Users-Drive-Revisions.md
+++ b/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)
diff --git a/docs/Users-Drive-Shortcuts.md b/docs/Users-Drive-Shortcuts.md
index d7080708..b86ddc7d 100644
--- a/docs/Users-Drive-Shortcuts.md
+++ b/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
diff --git a/docs/Users-Drive-Transfer.md b/docs/Users-Drive-Transfer.md
index cde2368e..aa74c72e 100644
--- a/docs/Users-Drive-Transfer.md
+++ b/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)
diff --git a/docs/Users-Forms.md b/docs/Users-Forms.md
index 1c5c3ced..c9042dff 100644
--- a/docs/Users-Forms.md
+++ b/docs/Users-Forms.md
@@ -1,4 +1,4 @@
-!# Users - Forms
+# Users - Forms
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Create a Form](#create-a-form)
diff --git a/docs/Users-Gmail-CSE.md b/docs/Users-Gmail-CSE.md
index 47aaaf49..be3aeff0 100644
--- a/docs/Users-Gmail-CSE.md
+++ b/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)
diff --git a/docs/Users-Gmail-Profile.md b/docs/Users-Gmail-Profile.md
index 6901795f..f2869d1c 100644
--- a/docs/Users-Gmail-Profile.md
+++ b/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)
diff --git a/docs/Users-Gmail-S-MIME.md b/docs/Users-Gmail-S-MIME.md
index b928bebd..515e1b23 100644
--- a/docs/Users-Gmail-S-MIME.md
+++ b/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)
diff --git a/docs/Users-Gmail-Settings.md b/docs/Users-Gmail-Settings.md
index b58d6940..f0bbe413 100644
--- a/docs/Users-Gmail-Settings.md
+++ b/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)
diff --git a/docs/Users-Meet.md b/docs/Users-Meet.md
index 479b5fbd..8628c490 100644
--- a/docs/Users-Meet.md
+++ b/docs/Users-Meet.md
@@ -1,4 +1,4 @@
-!# Users - Meet
+# Users - Meet
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)
 - [Introduction](#introduction)
diff --git a/docs/Users-Photo.md b/docs/Users-Photo.md
index e52f2df9..d2771711 100644
--- a/docs/Users-Photo.md
+++ b/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)
diff --git a/docs/Users-Profile-Sharing.md b/docs/Users-Profile-Sharing.md
index dba0f726..77c04ed8 100644
--- a/docs/Users-Profile-Sharing.md
+++ b/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)
diff --git a/docs/Users-Shared-Drives.md b/docs/Users-Shared-Drives.md
index d6ef99b2..d5298384 100644
--- a/docs/Users-Shared-Drives.md
+++ b/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)
diff --git a/docs/Users-Signout-Turnoff2SV.md b/docs/Users-Signout-Turnoff2SV.md
index 9397dd8d..f5dd43f4 100644
--- a/docs/Users-Signout-Turnoff2SV.md
+++ b/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)
diff --git a/docs/Users-Spreadsheets.md b/docs/Users-Spreadsheets.md
index 3d692316..bf4ff92d 100644
--- a/docs/Users-Spreadsheets.md
+++ b/docs/Users-Spreadsheets.md
@@ -1,4 +1,4 @@
-!# Users - Spreadsheets
+# Users - Spreadsheets
 - [API documentation](#api-documentation)
 - [Query documentation](#query-documentation)
 - [Definitions](#definitions)
diff --git a/docs/Users-Tasks.md b/docs/Users-Tasks.md
index 356f87e3..57398271 100644
--- a/docs/Users-Tasks.md
+++ b/docs/Users-Tasks.md
@@ -1,4 +1,4 @@
-!# Users - Tasks
+# Users - Tasks
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)
diff --git a/docs/Users-Tokens.md b/docs/Users-Tokens.md
index 07b9ecbc..e7f39b20 100644
--- a/docs/Users-Tokens.md
+++ b/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)
diff --git a/docs/Users-YouTube.md b/docs/Users-YouTube.md
index b5af84b8..df50ce29 100644
--- a/docs/Users-YouTube.md
+++ b/docs/Users-YouTube.md
@@ -1,4 +1,4 @@
-!!# Users - YouTube
+# Users - YouTube
 - [API documentation](#api-documentation)
 - [Notes](#notes)
 - [Definitions](#definitions)
diff --git a/docs/Using-GAM7-with-a-delegated-admin-service-account.md b/docs/Using-GAM7-with-a-delegated-admin-service-account.md
index 5e720e55..cf78ee26 100644
--- a/docs/Using-GAM7-with-a-delegated-admin-service-account.md
+++ b/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)
diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md
index 110390ca..0f814fe2 100644
--- a/docs/Version-and-Help.md
+++ b/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
diff --git a/docs/_Sidebar.md b/docs/_Sidebar.md
index 1756d633..6dccbba8 100644
--- a/docs/_Sidebar.md
+++ b/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)
diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index 580a859a..727daed7 100644
--- a/src/GamCommands.txt
+++ b/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>)*
-        (deletelabel <DriveLabelIDList>)*
-        (addlabelfield <DriveLabelID> <DriveLabelFieldID>
-            (text <String>)|selection <DriveLabelSelectionIDList>)|
+        (addlabel <ClassificationLabelIDList>)*
+        (deletelabel <ClassificationLabelIDList>)*
+        (addlabelfield <ClassificationLabelID> <ClassificationLabelFieldID>
+            (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]
diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt
index 1c201575..701c30d9 100644
--- a/src/GamUpdate.txt
+++ b/src/GamUpdate.txt
@@ -1,3 +1,21 @@
+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.
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 4f7455f2..8b62e18e 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.00.34'
+__version__ = '7.00.35'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -35214,7 +35214,7 @@ def doInfoCIPolicies():
       printGettingAllAccountEntities(Ent.POLICY, ifilter)
       policies = _filterPolicies(ci, getPageMessage(), ifilter)
     _showPolicies(policies, FJQC, add_warnings, no_appnames, cd, groups_ci)
-      
+
 # gam print policies [todrive <ToDriveAttribute>*]
 #	[filter <String>]  [nowarnings] [noappnames]
 #	[formatjson [quotechar <Character>]]
@@ -53831,7 +53831,7 @@ class DriveFileFields():
         else:
           _getDriveFieldSubField(field, self.fieldsList, self.parentsSubFields)
     elif myarg == 'includelabels':
-      labelIds = getEntityList(Cmd.OB_DRIVE_LABEL_ID, shlexSplit=True)
+      labelIds = getEntityList(Cmd.OB_CLASSIFICATION_LABEL_ID, shlexSplit=True)
       for labelId in labelIds:
         self.includeLabels.append(normalizeDriveLabelID(labelId))
     elif myarg.find('.') != -1:
@@ -63842,16 +63842,16 @@ def _showDriveLabel(label, j, jcount, FJQC):
   if FJQC.formatJSON:
     printLine(json.dumps(cleanJSON(label, timeObjects=DRIVELABELS_TIME_OBJECTS), ensure_ascii=False, sort_keys=True))
     return
-  printEntity([Ent.DRIVE_LABEL_NAME, f'{label["name"]}'], j, jcount)
+  printEntity([Ent.CLASSIFICATION_LABEL_NAME, f'{label["name"]}'], j, jcount)
   Ind.Increment()
   showJSON(None, label, timeObjects=DRIVELABELS_TIME_OBJECTS, dictObjectsKey={'fields': 'id', 'choices': 'id'})
   Ind.Decrement()
 
-# gam [<UserTypeEntity>] info drivelabels <DriveLabelNameEntity>
+# gam [<UserTypeEntity>] info classificationlabels <ClassificationLabelNameEntity>
 #	[[basic|full] [languagecode <BCP47LanguageCode>]
 #	[formatjson] [asadmin]
 def infoDriveLabels(users, useAdminAccess=False):
-  driveLabelNameEntity = getUserObjectEntity(Cmd.OB_DRIVE_LABEL_NAME, Ent.DRIVE_LABEL, shlexSplit=True)
+  driveLabelNameEntity = getUserObjectEntity(Cmd.OB_CLASSIFICATION_LABEL_NAME, Ent.CLASSIFICATION_LABEL, shlexSplit=True)
   FJQC = FormatJSONQuoteChar()
   parameters = {'useAdminAccess': useAdminAccess}
   while Cmd.ArgumentsRemaining():
@@ -63872,7 +63872,7 @@ def infoDriveLabels(users, useAdminAccess=False):
     j = 0
     for name in labelNames:
       j += 1
-      kvList = [Ent.USER, user, Ent.DRIVE_LABEL_NAME, name]
+      kvList = [Ent.USER, user, Ent.CLASSIFICATION_LABEL_NAME, name]
       name = validateDriveLabelName(name, kvList, j, jcount, False)
       if name is None:
         continue
@@ -63896,11 +63896,11 @@ def infoDriveLabels(users, useAdminAccess=False):
 def doInfoDriveLabels():
   infoDriveLabels([_getAdminEmail()], True)
 
-# gam [<UserTypeEntity>] print drivelabels> [todrive <ToDriveAttribute>*]
+# gam [<UserTypeEntity>] print classificationlabels> [todrive <ToDriveAttribute>*]
 #	[basic|full] [languagecode <BCP47LanguageCode>]
 #	[publishedonly [<Boolean>]] [minimumrole applier|editor|organizer|reader]
 #	[formatjson [quotechar <Character>]] [asadmin]
-# gam [<UserTypeEntity>] show drivelabels
+# gam [<UserTypeEntity>] show classificationlabels
 #	[basic|full] [languagecode <BCP47LanguageCode>]
 #	[publishedonly [<Boolean>]] [minimumrole applier|editor|organizer|reader]
 #	[formatjson] [asadmin]
@@ -63926,7 +63926,7 @@ def printShowDriveLabels(users, useAdminAccess=False):
     if not drive:
       continue
     if csvPF:
-      printGettingAllEntityItemsForWhom(Ent.DRIVE_LABEL, user, i, count)
+      printGettingAllEntityItemsForWhom(Ent.CLASSIFICATION_LABEL, user, i, count)
       pageMessage = getPageMessageForWhom()
     else:
       pageMessage = None
@@ -63938,7 +63938,7 @@ def printShowDriveLabels(users, useAdminAccess=False):
       if not csvPF:
         jcount = len(labels)
         if not FJQC.formatJSON:
-          entityPerformActionNumItems([Ent.USER, user], jcount, Ent.DRIVE_LABEL, i, count)
+          entityPerformActionNumItems([Ent.USER, user], jcount, Ent.CLASSIFICATION_LABEL, i, count)
         Ind.Increment()
         j = 0
         for label in labels:
@@ -63956,11 +63956,11 @@ def printShowDriveLabels(users, useAdminAccess=False):
                                      ensure_ascii=False, sort_keys=True)
             csvPF.WriteRowNoFilter(row)
     except GAPI.permissionDenied as e:
-      entityActionFailedWarning([Ent.USER, user, Ent.DRIVE_LABEL, None], str(e), i, count)
+      entityActionFailedWarning([Ent.USER, user, Ent.CLASSIFICATION_LABEL, None], str(e), i, count)
     except (GAPI.serviceNotAvailable, GAPI.authError, GAPI.domainPolicy) as e:
       userSvcNotApplicableOrDriveDisabled(user, str(e), i, count)
   if csvPF:
-    csvPF.writeCSVfile('Drive Labels')
+    csvPF.writeCSVfile('Classification Labels')
 
 def doPrintShowDriveLabels():
   printShowDriveLabels([_getAdminEmail()], True)
@@ -63969,17 +63969,17 @@ def _showDriveLabelPermission(labelperm, j, jcount, FJQC):
   if FJQC.formatJSON:
     printLine(json.dumps(cleanJSON(labelperm), ensure_ascii=False, sort_keys=True))
     return
-  printEntity([Ent.DRIVE_LABEL_PERMISSION_NAME, f'{labelperm["name"]}'], j, jcount)
+  printEntity([Ent.CLASSIFICATION_LABEL_PERMISSION_NAME, f'{labelperm["name"]}'], j, jcount)
   Ind.Increment()
   showJSON(None, labelperm)
   Ind.Decrement()
 
-# gam [<UserTypeEntity>] create drivelabelpermission <DriveLabelNameEntity>
+# gam [<UserTypeEntity>] create classificationlabelpermission <ClassificationLabelNameEntity>
 #	(user <UserItem>) | (group <GroupItem) | (audience <String>)
 #	role applier|editor|organizer|reader
 #	[nodetails|formatjson] [asadmin]
 def createDriveLabelPermissions(users, useAdminAccess=False):
-  driveLabelNameEntity = getUserObjectEntity(Cmd.OB_DRIVE_LABEL_NAME, Ent.DRIVE_LABEL_PERMISSION, shlexSplit=True)
+  driveLabelNameEntity = getUserObjectEntity(Cmd.OB_CLASSIFICATION_LABEL_NAME, Ent.CLASSIFICATION_LABEL_PERMISSION, shlexSplit=True)
   FJQC = FormatJSONQuoteChar()
   parameters = {'useAdminAccess': useAdminAccess}
   body = {}
@@ -64021,7 +64021,7 @@ def createDriveLabelPermissions(users, useAdminAccess=False):
     j = 0
     for name in labelNames:
       j += 1
-      kvList = [Ent.USER, user, Ent.DRIVE_LABEL_NAME, name, Ent.DRIVE_LABEL_PERMISSION, None]
+      kvList = [Ent.USER, user, Ent.CLASSIFICATION_LABEL_NAME, name, Ent.CLASSIFICATION_LABEL_PERMISSION, None]
       name = validateDriveLabelName(name, kvList, j, jcount, False)
       if name is None:
         continue
@@ -64031,7 +64031,7 @@ def createDriveLabelPermissions(users, useAdminAccess=False):
                              throwReasons=GAPI.DRIVE_USER_THROW_REASONS+[GAPI.PERMISSION_DENIED, GAPI.NOT_FOUND,
                                                                          GAPI.INVALID, GAPI.INTERNAL_ERROR],
                              parent=name, body=body, **parameters)
-        kvList = [Ent.USER, user, Ent.DRIVE_LABEL_PERMISSION, labelperm['name']]
+        kvList = [Ent.USER, user, Ent.CLASSIFICATION_LABEL_PERMISSION, labelperm['name']]
         if not FJQC.formatJSON:
           entityActionPerformed(kvList, j, jcount)
         if showDetails:
@@ -64048,17 +64048,17 @@ def createDriveLabelPermissions(users, useAdminAccess=False):
 def doCreateDriveLabelPermissions():
   createDriveLabelPermissions([_getAdminEmail()], True)
 
-# gam [<UserTypeEntity>] delete drivelabelpermission <DriveLabelNameEntity>
+# gam [<UserTypeEntity>] delete classificationlabelpermission <ClassificationLabelNameEntity>
 #	(user <UserItem>) | (group <GroupItem) | (audience <String>)
 #	[asadmin]
-# gam [<UserTypeEntity>] remove drivelabelpermission <DriveLabelPermissionNameEntity>
+# gam [<UserTypeEntity>] remove classificationlabelpermission <ClassificationLabelPermissionNameEntity>
 #	[asadmin]
 def deleteDriveLabelPermissions(users, useAdminAccess=False):
   doDelete = Act.Get() == Act.DELETE
   if doDelete:
-    driveLabelNameEntity = getUserObjectEntity(Cmd.OB_DRIVE_LABEL_NAME, Ent.DRIVE_LABEL, shlexSplit=True)
+    driveLabelNameEntity = getUserObjectEntity(Cmd.OB_CLASSIFICATION_LABEL_NAME, Ent.CLASSIFICATION_LABEL, shlexSplit=True)
   else:
-    driveLabelNameEntity = getUserObjectEntity(Cmd.OB_DRIVE_LABEL_PERMISSION_NAME, Ent.DRIVE_LABEL_PERMISSION, shlexSplit=True)
+    driveLabelNameEntity = getUserObjectEntity(Cmd.OB_CLASSIFICATION_LABEL_PERMISSION_NAME, Ent.CLASSIFICATION_LABEL_PERMISSION, shlexSplit=True)
   parameters = {'useAdminAccess': useAdminAccess, 'requests': [None]}
   labelperm = ''
   while Cmd.ArgumentsRemaining():
@@ -64088,7 +64088,7 @@ def deleteDriveLabelPermissions(users, useAdminAccess=False):
     j = 0
     for name in labelPermNames:
       j += 1
-      kvList = [Ent.USER, user, Ent.DRIVE_LABEL_PERMISSION_NAME, name]
+      kvList = [Ent.USER, user, Ent.CLASSIFICATION_LABEL_PERMISSION_NAME, name]
       if doDelete:
         parent = validateDriveLabelName(name, kvList, j, jcount, False)
         if parent is None:
@@ -64115,13 +64115,13 @@ def deleteDriveLabelPermissions(users, useAdminAccess=False):
 def doDeleteDriveLabelPermissions():
   deleteDriveLabelPermissions([_getAdminEmail()], True)
 
-# gam [<UserTypeEntity>] print drivelabelpermissions <DriveLabelNameEntity> [todrive <ToDriveAttribute>*]
+# gam [<UserTypeEntity>] print classificationlabelpermissions <ClassificationLabelNameEntity> [todrive <ToDriveAttribute>*]
 #	[formatjson [quotechar <Character>]] [asadmin]
-# gam [<UserTypeEntity>] show drivelabelpermissions <DriveLabelNameEntity>
+# gam [<UserTypeEntity>] show classificationlabelpermissions <ClassificationLabelNameEntity>
 #	[formatjson] [asadmin]
 def printShowDriveLabelPermissions(users, useAdminAccess=False):
   csvPF = CSVPrintFile(['User', 'name', 'email', 'role', 'person', 'group', 'audience'], 'sortall') if Act.csvFormat() else None
-  driveLabelNameEntity = getUserObjectEntity(Cmd.OB_DRIVE_LABEL_NAME, Ent.DRIVE_LABEL_PERMISSION, shlexSplit=True)
+  driveLabelNameEntity = getUserObjectEntity(Cmd.OB_CLASSIFICATION_LABEL_NAME, Ent.CLASSIFICATION_LABEL_PERMISSION, shlexSplit=True)
   FJQC = FormatJSONQuoteChar(csvPF)
   parameters = {'useAdminAccess': useAdminAccess}
   while Cmd.ArgumentsRemaining():
@@ -64146,13 +64146,13 @@ def printShowDriveLabelPermissions(users, useAdminAccess=False):
     j = 0
     for name in labelNames:
       j += 1
-      kvList = [Ent.USER, user, Ent.DRIVE_LABEL_NAME, name, Ent.DRIVE_LABEL_PERMISSION, None]
+      kvList = [Ent.USER, user, Ent.CLASSIFICATION_LABEL_NAME, name, Ent.CLASSIFICATION_LABEL_PERMISSION, None]
       name = validateDriveLabelName(name, kvList, j, jcount, False)
       if name is None:
         continue
-      kvList = [Ent.USER, user, Ent.DRIVE_LABEL_NAME, name]
+      kvList = [Ent.USER, user, Ent.CLASSIFICATION_LABEL_NAME, name]
       if csvPF:
-        printGettingAllEntityItemsForWhom(Ent.DRIVE_LABEL_PERMISSION, name, j, jcount)
+        printGettingAllEntityItemsForWhom(Ent.CLASSIFICATION_LABEL_PERMISSION, name, j, jcount)
         pageMessage = getPageMessageForWhom()
       else:
         pageMessage = None
@@ -64164,7 +64164,7 @@ def printShowDriveLabelPermissions(users, useAdminAccess=False):
         if not csvPF:
           jcount = len(labelperms)
           if not FJQC.formatJSON:
-            entityPerformActionNumItems(kvList, jcount, Ent.DRIVE_LABEL_PERMISSION, i, count)
+            entityPerformActionNumItems(kvList, jcount, Ent.CLASSIFICATION_LABEL_PERMISSION, i, count)
           Ind.Increment()
           j = 0
           for labelperm in labelperms:
@@ -64188,7 +64188,7 @@ def printShowDriveLabelPermissions(users, useAdminAccess=False):
         break
     Ind.Decrement()
   if csvPF:
-    csvPF.writeCSVfile('Drive Label Permissions')
+    csvPF.writeCSVfile('Classification Label Permissions')
 
 def doPrintShowDriveLabelPermissions():
   printShowDriveLabelPermissions([_getAdminEmail()], True)
@@ -64202,12 +64202,12 @@ DRIVELABEL_FIELD_TYPE_MAP = {
   }
 
 # gam <UserTypeEntity> process filedrivelabels <DriveFileEntity>
-#	(addlabel <DriveLabelIDList>)*
-#	(deletelabel <DriveLabelIDList>)*
-#	(addlabelfield <DriveLabelID> <DriveLabelFieldID>
-#	    (text <String>)|selection <DriveLabelSelectionIDList>)|
+#	(addlabel <ClassificationLabelIDList>)*
+#	(deletelabel <ClassificationLabelIDList>)*
+#	(addlabelfield <ClassificationLabelID> <ClassificationLabelFieldID>
+#	    (text <String>)|selection <ClassificationLabelSelectionIDList>)|
 #	    (integer <Number>)|(date <Date>)|(user <EmailAddressList>))*
-#	(deletelabelfield <DriveLabelID> <DriveLabelFieldID>)*
+#	(deletelabelfield <ClassificationLabelID> <ClassificationLabelFieldID>)*
 #	[nodetails]
 def processFileDriveLabels(users):
   fileIdEntity = getDriveFileEntity()
@@ -64221,23 +64221,23 @@ def processFileDriveLabels(users):
   while Cmd.ArgumentsRemaining():
     myarg = getArgument()
     if myarg == 'addlabel':
-      labelIds = getEntityList(Cmd.OB_DRIVE_LABEL_ID, shlexSplit=True)
+      labelIds = getEntityList(Cmd.OB_CLASSIFICATION_LABEL_ID, shlexSplit=True)
       for labelId in labelIds:
         actionList[myarg]['list'].append({'labelModifications': [{'labelId': normalizeDriveLabelID(labelId)}]})
         kcount += 1
     elif myarg == 'deletelabel':
-      labelIds = getEntityList(Cmd.OB_DRIVE_LABEL_ID, shlexSplit=True)
+      labelIds = getEntityList(Cmd.OB_CLASSIFICATION_LABEL_ID, shlexSplit=True)
       for labelId in labelIds:
         actionList[myarg]['list'].append({'labelModifications': [{'labelId': normalizeDriveLabelID(labelId), 'removeLabel': True}]})
         kcount += 1
     elif myarg == 'addlabelfield':
-      labelId = normalizeDriveLabelID(getString(Cmd.OB_DRIVE_LABEL_ID))
-      fieldId = getString(Cmd.OB_DRIVE_LABEL_FIELD_ID)
+      labelId = normalizeDriveLabelID(getString(Cmd.OB_CLASSIFICATION_LABEL_ID))
+      fieldId = getString(Cmd.OB_CLASSIFICATION_LABEL_FIELD_ID)
       fieldType = getChoice(DRIVELABEL_FIELD_TYPE_MAP, mapChoice=True)
       if fieldType == 'setTextValues':
         valueList = [getString(Cmd.OB_STRING, minLen=0)]
       elif fieldType == 'setSelectionValues':
-        valueList = convertEntityToList(getString(Cmd.OB_DRIVE_LABEL_SELECTION_ID_LIST, minLen=0), shlexSplit=True)
+        valueList = convertEntityToList(getString(Cmd.OB_CLASSIFICATION_LABEL_SELECTION_ID_LIST, minLen=0), shlexSplit=True)
       elif fieldType == 'setIntegerValues':
         valueList = [getInteger()]
       elif fieldType == 'setDateValues':
@@ -64248,8 +64248,8 @@ def processFileDriveLabels(users):
                                                                 'fieldModifications': [{'fieldId': fieldId, fieldType: valueList}]}]})
       kcount += 1
     elif myarg == 'deletelabelfield':
-      labelId = normalizeDriveLabelID(getString(Cmd.OB_DRIVE_LABEL_ID))
-      fieldId = getString(Cmd.OB_DRIVE_LABEL_FIELD_ID)
+      labelId = normalizeDriveLabelID(getString(Cmd.OB_CLASSIFICATION_LABEL_ID))
+      fieldId = getString(Cmd.OB_CLASSIFICATION_LABEL_FIELD_ID)
       actionList[myarg]['list'].append({'labelModifications': [{'labelId': labelId,
                                                                 'fieldModifications': [{'fieldId': fieldId, 'unsetValues': True}]}]})
       kcount += 1
@@ -64264,7 +64264,7 @@ def processFileDriveLabels(users):
     if jcount == 0:
       continue
     Act.Set(Act.PROCESS)
-    entityPerformActionSubItemModifierNumItems([Ent.USER, user], Ent.DRIVE_LABEL, Act.MODIFIER_FOR, jcount, Ent.DRIVE_FILE_OR_FOLDER)
+    entityPerformActionSubItemModifierNumItems([Ent.USER, user], Ent.CLASSIFICATION_LABEL, Act.MODIFIER_FOR, jcount, Ent.DRIVE_FILE_OR_FOLDER)
     Ind.Increment()
     j = 0
     userError = False
@@ -64273,16 +64273,16 @@ def processFileDriveLabels(users):
       k = 0
       kvList = [Ent.USER, user, Ent.DRIVE_FILE_OR_FOLDER_ID, fileId]
       Act.Set(Act.PROCESS)
-      entityPerformActionNumItems(kvList, kcount, Ent.DRIVE_LABEL)
+      entityPerformActionNumItems(kvList, kcount, Ent.CLASSIFICATION_LABEL)
       Ind.Increment()
       for operation in ['deletelabelfield', 'deletelabel', 'addlabel', 'addlabelfield']:
         Act.Set(actionList[operation]['action'])
         for action in actionList[operation]['list']:
           k += 1
           xkvList = kvList.copy()
-          xkvList.extend([Ent.DRIVE_LABEL_ID, action['labelModifications'][0]['labelId']])
+          xkvList.extend([Ent.CLASSIFICATION_LABEL_ID, action['labelModifications'][0]['labelId']])
           if 'fieldModifications' in action['labelModifications'][0]:
-            xkvList.extend([Ent.DRIVE_LABEL_FIELD_ID, action['labelModifications'][0]['fieldModifications'][0]['fieldId']])
+            xkvList.extend([Ent.CLASSIFICATION_LABEL_FIELD_ID, action['labelModifications'][0]['fieldModifications'][0]['fieldId']])
           try:
             label = callGAPI(drive.files(), 'modifyLabels',
                              throwReasons=GAPI.DRIVE3_MODIFY_LABEL_THROW_REASONS,
@@ -75589,6 +75589,10 @@ MAIN_COMMANDS_OBJ_ALIASES = {
   Cmd.ARG_CIMEMBER:		Cmd.ARG_CIGROUPMEMBERS,
   Cmd.ARG_CIMEMBERS:		Cmd.ARG_CIGROUPMEMBERS,
   Cmd.ARG_CIPOLICIES:		Cmd.ARG_CIPOLICY,
+  Cmd.ARG_CLASSIFICATIONLABEL:	Cmd.ARG_DRIVELABEL,
+  Cmd.ARG_CLASSIFICATIONLABELS:	Cmd.ARG_DRIVELABEL,
+  Cmd.ARG_CLASSIFICATIONLABELPERMISSION:	Cmd.ARG_DRIVELABELPERMISSION,
+  Cmd.ARG_CLASSIFICATIONLABELPERMISSIONS:	Cmd.ARG_DRIVELABELPERMISSION,
   Cmd.ARG_CLASS:		Cmd.ARG_COURSE,
   Cmd.ARG_CLASSES:		Cmd.ARG_COURSES,
   Cmd.ARG_CLASSPARTICIPANTS:	Cmd.ARG_COURSEPARTICIPANTS,
@@ -76619,6 +76623,10 @@ USER_COMMANDS_OBJ_ALIASES = {
   Cmd.ARG_BACKUPCODES:		Cmd.ARG_BACKUPCODE,
   Cmd.ARG_CALENDARS:		Cmd.ARG_CALENDAR,
   Cmd.ARG_CALENDARACLS:		Cmd.ARG_CALENDARACL,
+  Cmd.ARG_CLASSIFICATIONLABEL:	Cmd.ARG_DRIVELABEL,
+  Cmd.ARG_CLASSIFICATIONLABELS:	Cmd.ARG_DRIVELABEL,
+  Cmd.ARG_CLASSIFICATIONLABELPERMISSION:	Cmd.ARG_DRIVELABELPERMISSION,
+  Cmd.ARG_CLASSIFICATIONLABELPERMISSIONS:	Cmd.ARG_DRIVELABELPERMISSION,
   Cmd.ARG_CLASSROOMINVITATIONS:	Cmd.ARG_CLASSROOMINVITATION,
   Cmd.ARG_CHATEVENTS:		Cmd.ARG_CHATEVENT,
   Cmd.ARG_CHATMEMBERS:		Cmd.ARG_CHATMEMBER,
diff --git a/src/gam/gamlib/glapi.py b/src/gam/gamlib/glapi.py
index 8d34aa10..b2dbd654 100644
--- a/src/gam/gamlib/glapi.py
+++ b/src/gam/gamlib/glapi.py
@@ -240,8 +240,8 @@ _INFO = {
   DRIVE3: {'name': 'Drive API v3', 'version': 'v3', 'v2discovery': False, 'mappedAPI': 'drive'},
   DRIVETD: {'name': 'Drive API v3 - todrive', 'version': 'v3', 'v2discovery': False, 'mappedAPI': 'drive'},
   DRIVEACTIVITY: {'name': 'Drive Activity API v2', 'version': 'v2', 'v2discovery': True},
-  DRIVELABELS_ADMIN: {'name': 'Drive Labels API v2beta - Admin', 'version': 'v2beta', 'v2discovery': True, 'mappedAPI': DRIVELABELS},
-  DRIVELABELS_USER: {'name': 'Drive Labels API v2beta - User', 'version': 'v2beta', 'v2discovery': True, 'mappedAPI': DRIVELABELS},
+  DRIVELABELS_ADMIN: {'name': 'Drive Labels API - Admin', 'version': 'v2', 'v2discovery': True, 'mappedAPI': DRIVELABELS},
+  DRIVELABELS_USER: {'name': 'Drive Labels API - User', 'version': 'v2', 'v2discovery': True, 'mappedAPI': DRIVELABELS},
   EMAIL_AUDIT: {'name': 'Email Audit API', 'version': 'v1', 'v2discovery': False},
   FORMS: {'name': 'Forms API', 'version': 'v1', 'v2discovery': True},
   GMAIL: {'name': 'Gmail API', 'version': 'v1', 'v2discovery': True},
@@ -619,11 +619,11 @@ _SVCACCT_SCOPES = [
    'api': DRIVEACTIVITY,
    'subscopes': [],
    'scope': 'https://www.googleapis.com/auth/drive.activity'},
-  {'name': 'Drive Labels API v2beta - Admin',
+  {'name': 'Drive Labels API - Admin',
    'api': DRIVELABELS_ADMIN,
    'subscopes': READONLY,
    'scope': 'https://www.googleapis.com/auth/drive.admin.labels'},
-  {'name': 'Drive Labels API v2beta - User',
+  {'name': 'Drive Labels API - User',
    'api': DRIVELABELS_USER,
    'subscopes': READONLY,
    'scope': 'https://www.googleapis.com/auth/drive.labels'},
diff --git a/src/gam/gamlib/glclargs.py b/src/gam/gamlib/glclargs.py
index 1f926767..89b3214b 100644
--- a/src/gam/gamlib/glclargs.py
+++ b/src/gam/gamlib/glclargs.py
@@ -495,6 +495,10 @@ class GamCLArgs():
   ARG_CIMEMBERS = 'cimembers'
   ARG_CIPOLICY = 'policy'
   ARG_CIPOLICIES = 'policies'
+  ARG_CLASSIFICATIONLABEL = 'classificationlabel'
+  ARG_CLASSIFICATIONLABELS = 'classificationlabels'
+  ARG_CLASSIFICATIONLABELPERMISSION = 'classificationlabelpermission'
+  ARG_CLASSIFICATIONLABELPERMISSIONS = 'classificationlabelpermissions'
   ARG_CLASS = 'class'
   ARG_CLASSES = 'classes'
   ARG_CLASSPARTICIPANTS = 'classparticipants'
@@ -846,6 +850,11 @@ class GamCLArgs():
   OB_CIDR_NETMASK = 'CIDRnetmask'
   OB_CIGROUP_ALIAS_LIST = "CIGroupAliasList"
   OB_CIPOLICY_NAME_ENTITY = 'CIPolicyNameEntity'
+  OB_CLASSIFICATION_LABEL_ID = 'ClassificationLabelID'
+  OB_CLASSIFICATION_LABEL_NAME = 'ClassificationLabelName'
+  OB_CLASSIFICATION_LABEL_PERMISSION_NAME = 'ClassificationLabelPermissionName'
+  OB_CLASSIFICATION_LABEL_FIELD_ID = 'ClassificationLabelFieldID'
+  OB_CLASSIFICATION_LABEL_SELECTION_ID_LIST = 'ClassificationLabelSelectionIDList'
   OB_CLASSROOM_INVITATION_ID_ENTITY = 'ClassroomInvitationIDEntity'
   OB_CLIENT_ID = 'ClientID'
   OB_COLLABORATOR_ITEM = 'CollaboratorItem'
@@ -899,11 +908,6 @@ class GamCLArgs():
   OB_DRIVE_FOLDER_NAME = 'DriveFolderName'
   OB_DRIVE_FOLDER_NAME_LIST = 'DriveFolderNameList'
   OB_DRIVE_FOLDER_PATH = 'DriveFolderPath'
-  OB_DRIVE_LABEL_ID = 'DriveLabelID'
-  OB_DRIVE_LABEL_NAME = 'DriveLabelName'
-  OB_DRIVE_LABEL_PERMISSION_NAME = 'DriveLabelPermissionName'
-  OB_DRIVE_LABEL_FIELD_ID = 'DriveLabelFieldID'
-  OB_DRIVE_LABEL_SELECTION_ID_LIST = 'DriveLabelSelectionIDList'
   OB_EMAIL_ADDRESS = 'EmailAddress'
   OB_EMAIL_ADDRESS_ENTITY = 'EmailAddressEntity'
   OB_EMAIL_ADDRESS_LIST = 'EmailAddressList'
diff --git a/src/gam/gamlib/glentity.py b/src/gam/gamlib/glentity.py
index 809e5b9f..44209a5b 100644
--- a/src/gam/gamlib/glentity.py
+++ b/src/gam/gamlib/glentity.py
@@ -110,6 +110,12 @@ class GamEntity():
   CHROME_POLICY_SCHEMA = 'cpsc'
   CHROME_RELEASE = 'crel'
   CHROME_VERSION = 'cver'
+  CLASSIFICATION_LABEL = 'dlab'
+  CLASSIFICATION_LABEL_FIELD_ID = 'dlfi'
+  CLASSIFICATION_LABEL_ID = 'dlid'
+  CLASSIFICATION_LABEL_NAME = 'dlna'
+  CLASSIFICATION_LABEL_PERMISSION = 'dlpe'
+  CLASSIFICATION_LABEL_PERMISSION_NAME = 'dlpn'
   CLASSROOM_INVITATION = 'clai'
   CLASSROOM_INVITATION_OWNER = 'clio'
   CLASSROOM_INVITATION_STUDENT = 'clis'
@@ -193,12 +199,6 @@ class GamEntity():
   DRIVE_FOLDER_PATH = 'folp'
   DRIVE_FOLDER_RENAMED = 'forn'
   DRIVE_FOLDER_SHORTCUT = 'fols'
-  DRIVE_LABEL = 'dlab'
-  DRIVE_LABEL_FIELD_ID = 'dlfi'
-  DRIVE_LABEL_ID = 'dlid'
-  DRIVE_LABEL_NAME = 'dlna'
-  DRIVE_LABEL_PERMISSION = 'dlpe'
-  DRIVE_LABEL_PERMISSION_NAME = 'dlpn'
   DRIVE_ORPHAN_FILE_OR_FOLDER = 'orph'
   DRIVE_PARENT_FOLDER = 'fipf'
   DRIVE_PARENT_FOLDER_ID = 'fipi'
@@ -462,6 +462,12 @@ class GamEntity():
     CHROME_POLICY_SCHEMA: ['Chrome Policy Schemas', 'Chrome Policy Schema'],
     CHROME_RELEASE: ['Chrome Releases', 'Chrome Release'],
     CHROME_VERSION: ['Chrome Versions', 'Chrome Version'],
+    CLASSIFICATION_LABEL: ['Classification Labels', 'Classification Label'],
+    CLASSIFICATION_LABEL_FIELD_ID: ['Classification Label Field IDs', 'Classification Label Field ID'],
+    CLASSIFICATION_LABEL_ID: ['Classification Label IDs', 'Classification Label ID'],
+    CLASSIFICATION_LABEL_NAME: ['Classification Label Names', 'Classification Label Name'],
+    CLASSIFICATION_LABEL_PERMISSION: ['Classification Label Permissions', 'Classification Label Permission'],
+    CLASSIFICATION_LABEL_PERMISSION_NAME: ['Classification Label Permission Names', 'Classification Label Permission Name'],
     CLASSROOM_INVITATION: ['Classroom Invitations', 'Classroom Invitation'],
     CLASSROOM_INVITATION_OWNER: ['Classroom Owner Invitations', 'Classroom Owner Invitation'],
     CLASSROOM_INVITATION_STUDENT: ['Classroom Student Invitations', 'Classroom Student Invitation'],
@@ -545,12 +551,6 @@ class GamEntity():
     DRIVE_FOLDER_PATH: ['Drive Folder Paths', 'Drive Folder Path'],
     DRIVE_FOLDER_RENAMED: ['Drive Folders Renamed', 'Drive Folder Renamed'],
     DRIVE_FOLDER_SHORTCUT: ['Drive Folder Shortcuts', 'Drive Folder Shortcut'],
-    DRIVE_LABEL: ['Drive Labels', 'Drive Label'],
-    DRIVE_LABEL_FIELD_ID: ['Drive Label Field IDs', 'Drive Label Field ID'],
-    DRIVE_LABEL_ID: ['Drive Label IDs', 'Drive Label ID'],
-    DRIVE_LABEL_NAME: ['Drive Label Names', 'Drive Label Name'],
-    DRIVE_LABEL_PERMISSION: ['Drive Label Permissions', 'Drive Label Permission'],
-    DRIVE_LABEL_PERMISSION_NAME: ['Drive Label Permission Names', 'Drive Label Permission Name'],
     DRIVE_ORPHAN_FILE_OR_FOLDER: ['Drive Orphan Files/Folders', 'Drive Orphan File/Folder'],
     DRIVE_PARENT_FOLDER: ['Drive Parent Folders', 'Drive Parent Folder'],
     DRIVE_PARENT_FOLDER_ID: ['Drive Parent Folder IDs', 'Drive Parent Folder ID'],