diff --git a/dataflow_neuro/cell_lib_async.act b/dataflow_neuro/cell_lib_async.act
index 3571692..e96850f 100644
--- a/dataflow_neuro/cell_lib_async.act
+++ b/dataflow_neuro/cell_lib_async.act
@@ -193,12 +193,12 @@ namespace tmpl {
             y {-1}}
         }
 
-        export defcell A_2C2N_RB_X1 (bool ! y; bool? c1, c2, n1, n2, rp_B, rs_B; bool? vdd, vss)
+        export defcell A_2C2N_RB_X1 (bool ! y; bool? c1, c2, n1, n2, pr_B, sr_B; bool? vdd, vss)
         {
         bool _y;
         prs{
-            (~c1 & ~c2) | ~rp_B -> _y+
-            c1 & c2 & n1 & n2 & rs_B -> _y-
+            (~c1 & ~c2) | ~pr_B -> _y+
+            c1 & c2 & n1 & n2 & sr_B -> _y-
             _y => y-
         }
         sizing {    
@@ -207,12 +207,12 @@ namespace tmpl {
             y {-1}; _y{-1}}
         }
 
-        export defcell A_2C2N_RB_X2 (bool ! y; bool? c1, c2, n1, n2, rp_B, rs_B; bool? vdd, vss)
+        export defcell A_2C2N_RB_X2 (bool ! y; bool? c1, c2, n1, n2, pr_B, sr_B; bool? vdd, vss)
         {
         bool _y;
         prs{
-            (~c1 & ~c2) | ~rp_B -> _y+
-            c1 & c2 & n1 & n2 & rs_B -> _y-
+            (~c1 & ~c2) | ~pr_B -> _y+
+            c1 & c2 & n1 & n2 & sr_B -> _y-
             _y => y-
         }
         sizing {    
@@ -221,12 +221,12 @@ namespace tmpl {
             y {-2}; _y{-1}}
         }
 
-        export defcell A_2C2N_RB_X4 (bool ! y; bool? c1, c2, n1, n2, rp_B, rs_B; bool? vdd, vss)
+        export defcell A_2C2N_RB_X4 (bool ! y; bool? c1, c2, n1, n2, pr_B, sr_B; bool? vdd, vss)
         {
         bool _y;
         prs{
-            (~c1 & ~c2) | ~rp_B -> _y+
-            c1 & c2 & n1 & n2 & rs_B -> _y-
+            (~c1 & ~c2) | ~pr_B -> _y+
+            c1 & c2 & n1 & n2 & sr_B -> _y-
             _y => y-
         }
         sizing {    
@@ -236,11 +236,11 @@ namespace tmpl {
         }
 
 
-        export defcell A_2C2N_R_X1 (bool ! y; bool? c1, c2, n1, n2, rp_B, rs_B; bool? vdd, vss)
+        export defcell A_2C2N_R_X1 (bool ! y; bool? c1, c2, n1, n2, pr_B, sr_B; bool? vdd, vss)
         {
         prs{
-            (~c1 & ~c2) | ~rp_B -> y+
-            c1 & c2 & n1 & n2 & rs_B -> y-
+            (~c1 & ~c2) | ~pr_B -> y+
+            c1 & c2 & n1 & n2 & sr_B -> y-
         }
         sizing {    
                 leak_adjust <- 1;