diff --git a/app-proto/src/add_remove.rs b/app-proto/src/add_remove.rs
index 6fee142..df91d3c 100644
--- a/app-proto/src/add_remove.rs
+++ b/app-proto/src/add_remove.rs
@@ -208,16 +208,16 @@ pub fn AddRemove() -> View {
                 },
                 on:click=|_| {
                     let state = use_context::<AppState>();
-                    let args = state.selection.with(
+                    let subjects = state.selection.with(
                         |sel| {
-                            let arg_vec: Vec<_> = sel.into_iter().collect();
-                            (arg_vec[0].clone(), arg_vec[1].clone())
+                            let subject_vec: Vec<_> = sel.into_iter().collect();
+                            (subject_vec[0].clone(), subject_vec[1].clone())
                         }
                     );
                     let rep = create_signal(0.0);
                     let active = create_signal(true);
                     state.assembly.insert_constraint(Constraint {
-                        args: args,
+                        subjects: subjects,
                         rep: rep,
                         rep_text: create_signal(String::new()),
                         rep_valid: create_signal(false),
@@ -233,8 +233,8 @@ pub fn AddRemove() -> View {
                         for (_, cst) in csts.into_iter() {
                             console::log_5(
                                 &JsValue::from(" "),
-                                &JsValue::from(cst.args.0),
-                                &JsValue::from(cst.args.1),
+                                &JsValue::from(cst.subjects.0),
+                                &JsValue::from(cst.subjects.1),
                                 &JsValue::from(":"),
                                 &JsValue::from(cst.rep.get_untracked())
                             );
diff --git a/app-proto/src/assembly.rs b/app-proto/src/assembly.rs
index 27774a1..8217922 100644
--- a/app-proto/src/assembly.rs
+++ b/app-proto/src/assembly.rs
@@ -21,7 +21,7 @@ pub struct Element {
 
 #[derive(Clone)]
 pub struct Constraint {
-    pub args: (usize, usize),
+    pub subjects: (usize, usize),
     pub rep: Signal<f64>,
     pub rep_text: Signal<String>,
     pub rep_valid: Signal<bool>,
@@ -94,11 +94,11 @@ impl Assembly {
     }
     
     pub fn insert_constraint(&self, constraint: Constraint) {
-        let args = constraint.args;
+        let subjects = constraint.subjects;
         let key = self.constraints.update(|csts| csts.insert(constraint));
         self.elements.update(|elts| {
-            elts[args.0].constraints.insert(key);
-            elts[args.1].constraints.insert(key);
+            elts[subjects.0].constraints.insert(key);
+            elts[subjects.1].constraints.insert(key);
         });
     }
     
@@ -119,9 +119,9 @@ impl Assembly {
             self.constraints.with_untracked(|csts| {
                 for (_, cst) in csts {
                     if cst.active.get_untracked() && cst.rep_valid.get_untracked() {
-                        let args = cst.args;
-                        let row = elts[args.0].index;
-                        let col = elts[args.1].index;
+                        let subjects = cst.subjects;
+                        let row = elts[subjects.0].index;
+                        let col = elts[subjects.1].index;
                         gram_to_be.push_sym(row, col, cst.rep.get_untracked());
                     }
                 }
diff --git a/app-proto/src/outline.rs b/app-proto/src/outline.rs
index 9ebf34d..98b422f 100644
--- a/app-proto/src/outline.rs
+++ b/app-proto/src/outline.rs
@@ -154,10 +154,10 @@ pub fn Outline() -> View {
                                             let c_state = use_context::<AppState>();
                                             let assembly = &c_state.assembly;
                                             let cst = assembly.constraints.with(|csts| csts[c_key].clone());
-                                            let other_arg = if cst.args.0 == key {
-                                                cst.args.1
+                                            let other_arg = if cst.subjects.0 == key {
+                                                cst.subjects.1
                                             } else {
-                                                cst.args.0
+                                                cst.subjects.0
                                             };
                                             let other_arg_label = assembly.elements.with(|elts| elts[other_arg].label.clone());
                                             view! {