diff --git a/common.py b/common.py
index 3932a97..df09bed 100755
--- a/common.py
+++ b/common.py
@@ -2318,7 +2318,12 @@
     >>> convert_pinname('EN')
     'EN'
 
+    >>> convert_pinname('Q_N', 'sky130_fd_bd_sram__openram_sram_dff')
+    'Q_N'
     """
+    if new_modname and '__' in new_modname:
+        new_modname = new_modname.split('__')[-1]
+
     s = old_pinname
     u = old_pinname.upper()
 
@@ -2357,7 +2362,7 @@
             return 'SLEEP_B'
         elif 'NOTIF' in u or u in ('NTFY', 'NFR', 'NO'):
             return 'NOTIFIER'
-        elif u == 'ON':
+        elif u in ('ON', 'Q_N'):
             return 'Q_N'
         elif u in ('VDD', 'GND'):
             return u