diff --git a/tools/azure-sdk-tools/packaging_tools/change_log.py b/tools/azure-sdk-tools/packaging_tools/change_log.py
index 7afb3f0d71d8..97b1ba954141 100644
--- a/tools/azure-sdk-tools/packaging_tools/change_log.py
+++ b/tools/azure-sdk-tools/packaging_tools/change_log.py
@@ -144,6 +144,9 @@ def models(self, diff_entry):
             self.breaking_changes.append(_MODEL_PARAM_CHANGE_REQUIRED.format(parameter_name, model_name))
             return
 
+    def client(self):
+        self.breaking_changes.append(_CLIENT_SIGNATURE_CHANGE)
+        return
 
 ## Features
 _ADD_OPERATION_GROUP = "Added operation group {}"
@@ -156,6 +159,7 @@ def models(self, diff_entry):
 _REMOVE_OPERATION_GROUP = "Removed operation group {}"
 _REMOVE_OPERATION = "Removed operation {}.{}"
 _REMOVE_OPERATION_PARAM = "Operation {}.{} no longer has parameter {}"
+_CLIENT_SIGNATURE_CHANGE = "Client name is changed"
 _MODEL_SIGNATURE_CHANGE = "Model {} has a new signature"
 _MODEL_PARAM_DELETE = "Model {} no longer has parameter {}"
 _MODEL_PARAM_ADD_REQUIRED = "Model {} has a new required parameter {}"
@@ -174,6 +178,8 @@ def build_change_log(old_report, new_report):
             change_log.operation(diff_line)
         else:
             change_log.models(diff_line)
+        if diff_line[0][0] == 'client':
+            change_log.client()
 
     return change_log
 
diff --git a/tools/azure-sdk-tools/packaging_tools/code_report.py b/tools/azure-sdk-tools/packaging_tools/code_report.py
index 35ac4c48ab17..60f45fbbbc10 100644
--- a/tools/azure-sdk-tools/packaging_tools/code_report.py
+++ b/tools/azure-sdk-tools/packaging_tools/code_report.py
@@ -37,14 +37,20 @@ def parse_input(input_parameter):
 
 
 def create_empty_report():
-    return {"models": {"enums": {}, "exceptions": {}, "models": {}}, "operations": {}}
+    return {"client": {}, "models": {"enums": {}, "exceptions": {}, "models": {}}, "operations": {}}
 
 
 def create_report(module_name: str) -> Dict[str, Any]:
     module_to_generate = importlib.import_module(module_name)
+    client_name = getattr(module_to_generate, '__all__')
 
     report = create_empty_report()
 
+    try:
+        report["client"] = client_name
+    except:
+        report["client"] = []
+        
     # Look for models first
     model_names = [model_name for model_name in dir(module_to_generate.models) if model_name[0].isupper()]
     for model_name in model_names: