From 3a003b387a215a857276cf20d4ce9d2d8571d8de Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Mon, 22 Mar 2021 13:15:23 +0000
Subject: [PATCH 1/2] fix: Update module alias to resolve naming conflict

---
 gapic/schema/metadata.py           | 4 +++-
 tests/unit/schema/test_metadata.py | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gapic/schema/metadata.py b/gapic/schema/metadata.py
index 0276fe0989..a0dcc6a977 100644
--- a/gapic/schema/metadata.py
+++ b/gapic/schema/metadata.py
@@ -115,7 +115,9 @@ def module_alias(self) -> str:
             return '_'.join(
                 (
                     ''.join(
-                        i[0]
+                        ''.join(
+                            [partial_name[0] for partial_name in i.split("_")]
+                        )
                         for i in self.package
                         if i != self.api_naming.version
                     ),
diff --git a/tests/unit/schema/test_metadata.py b/tests/unit/schema/test_metadata.py
index 4be166bc1b..693beffa9b 100644
--- a/tests/unit/schema/test_metadata.py
+++ b/tests/unit/schema/test_metadata.py
@@ -184,6 +184,14 @@ def test_address_name_builtin_keyword():
     )
     assert addr_kword.module_alias == "gp_class"
 
+    addr_kword = metadata.Address(
+        name="Class",
+        module="class",
+        package=("google", "appengine_admin"),
+        api_naming=naming.NewNaming(proto_package="foo.bar.baz.v1"),
+    )
+    assert addr_kword.module_alias == "gaa_class"
+
 
 def test_doc_nothing():
     meta = metadata.Metadata()

From dab190afb09624c997dc099a24ef4bea5d07b621 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Tue, 23 Mar 2021 18:28:46 +0000
Subject: [PATCH 2/2] Refactor  to improve readability

---
 gapic/schema/metadata.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gapic/schema/metadata.py b/gapic/schema/metadata.py
index a0dcc6a977..0b1f6df2d5 100644
--- a/gapic/schema/metadata.py
+++ b/gapic/schema/metadata.py
@@ -115,11 +115,12 @@ def module_alias(self) -> str:
             return '_'.join(
                 (
                     ''.join(
-                        ''.join(
-                            [partial_name[0] for partial_name in i.split("_")]
-                        )
-                        for i in self.package
-                        if i != self.api_naming.version
+                        [
+                            partial_name[0]
+                            for i in self.package
+                            for partial_name in i.split("_")
+                            if i != self.api_naming.version
+                        ]
                     ),
                     self.module,
                 )