diff --git a/_unittest/test_00_EDB.py b/_unittest/test_00_EDB.py
index 717b7d2b97d..83e586aab40 100644
--- a/_unittest/test_00_EDB.py
+++ b/_unittest/test_00_EDB.py
@@ -302,6 +302,8 @@ def test_020_components(self):
         assert self.edbapp.components.components["R1"].pinlist
         assert self.edbapp.components.components["R1"].pins
         assert self.edbapp.components.components["R1"].pins["1"].pin_number
+        assert self.edbapp.components.components["R1"].pins["1"].name
+        self.edbapp.components.components["R1"].pins["1"].name = "1a"
         assert self.edbapp.components.components["R1"].pins["1"].component
         assert (
             self.edbapp.components.components["R1"].pins["1"].lower_elevation
diff --git a/pyaedt/edb_core/edb_data/padstacks_data.py b/pyaedt/edb_core/edb_data/padstacks_data.py
index a37d2b2987a..70915aa58ba 100644
--- a/pyaedt/edb_core/edb_data/padstacks_data.py
+++ b/pyaedt/edb_core/edb_data/padstacks_data.py
@@ -1455,13 +1455,8 @@ def rotation(self):
 
     @property
     def name(self):
-        """Padstack Instance Name. If it is a pin, the syntax will be like in AEDT ComponentName-PinName."""
-        if self.is_pin:
-            comp_name = self._edb_padstackinstance.GetComponent().GetName()
-            pin_name = self._edb_padstackinstance.GetName()
-            return "-".join([comp_name, pin_name])
-        else:
-            return self._edb_padstackinstance.GetName()
+        """Padstack instance name."""
+        return self._edb_padstackinstance.GetName()
 
     @name.setter
     def name(self, value):
@@ -1504,6 +1499,7 @@ def metal_volume(self):
     @property
     def pin_number(self):
         """Get pin number."""
+        warnings.warn("`pin_number` is deprecated. Use `name` property instead.", DeprecationWarning)
         return self._edb_padstackinstance.GetName()
 
     @property