diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 6df9d8af..c3a226a0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -19297,7 +19297,7 @@
     <property role="TrG5h" value="frag_ProvideFeedbackOperation" />
     <ref role="3gUMe" to="wq2x:6mHZizzmqvc" resolve="ProvideFeedbackOperation" />
     <node concept="1N15co" id="61G6TdBuudP" role="1s_3oS">
-      <property role="TrG5h" value="target" />
+      <property role="TrG5h" value="origin" />
       <node concept="3Tqbb2" id="61G6TdBuuvl" role="1N15GL">
         <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
       </node>
@@ -19306,7 +19306,7 @@
       <node concept="3clFbS" id="61G6TdBu_qU" role="9aQI4">
         <node concept="3cpWs8" id="61G6TdBu_PJ" role="3cqZAp">
           <node concept="3cpWsn" id="61G6TdBu_PM" role="3cpWs9">
-            <property role="TrG5h" value="target" />
+            <property role="TrG5h" value="origin" />
             <node concept="3Tqbb2" id="61G6TdBu_PH" role="1tU5fm" />
             <node concept="10Nm6u" id="61G6TdBu_X_" role="33vP2m" />
           </node>
@@ -19398,7 +19398,7 @@
                     <node concept="3clFbS" id="61G6TdBuBmv" role="2VODD2">
                       <node concept="3clFbF" id="61G6TdBuB_A" role="3cqZAp">
                         <node concept="v3LJS" id="61G6TdBuB__" role="3clFbG">
-                          <ref role="v3LJV" node="61G6TdBuudP" resolve="target" />
+                          <ref role="v3LJV" node="61G6TdBuudP" resolve="origin" />
                         </node>
                       </node>
                     </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 49552bdb..03cdde89 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -6317,7 +6317,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="4ekZiHddLRK" role="2OqNvi">
-                        <ref role="37wK5l" to="tpfl:4ekZiHddjeb" resolve="getTarget" />
+                        <ref role="37wK5l" to="tpfl:4ekZiHddjeb" resolve="getOrigin" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="1laj_RTMMMd" role="37vLTJ">
@@ -6380,7 +6380,7 @@
                         <ref role="3cqZAo" node="1laj_RSiJwS" resolve="rule" />
                       </node>
                       <node concept="liA8E" id="1laj_RTMJXt" role="2OqNvi">
-                        <ref role="37wK5l" to="ugy2:7nPD14Ob4em" resolve="targetRef" />
+                        <ref role="37wK5l" to="ugy2:7nPD14Ob4em" resolve="originRef" />
                       </node>
                     </node>
                   </node>
@@ -9339,7 +9339,7 @@
             <node concept="3clFbH" id="4nDRG5DbkJO" role="3cqZAp" />
             <node concept="3cpWs8" id="4nDRG5DbkJP" role="3cqZAp">
               <node concept="3cpWsn" id="4nDRG5DbkJQ" role="3cpWs9">
-                <property role="TrG5h" value="targetRef" />
+                <property role="TrG5h" value="originRef" />
                 <node concept="2sp9CU" id="4nDRG5DbkJR" role="1tU5fm" />
                 <node concept="10Nm6u" id="4nDRG5DbkJS" role="33vP2m" />
               </node>
@@ -9373,11 +9373,11 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="4nDRG5DbkK9" role="2OqNvi">
-                        <ref role="37wK5l" to="tpfl:4ekZiHddjeb" resolve="getTarget" />
+                        <ref role="37wK5l" to="tpfl:4ekZiHddjeb" resolve="getOrigin" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="4nDRG5DbkKa" role="37vLTJ">
-                      <ref role="3cqZAo" node="4nDRG5DbkJQ" resolve="targetRef" />
+                      <ref role="3cqZAo" node="4nDRG5DbkJQ" resolve="originRef" />
                     </node>
                   </node>
                 </node>
@@ -9429,14 +9429,14 @@
                 <node concept="3clFbF" id="4nDRG5DbkKu" role="3cqZAp">
                   <node concept="37vLTI" id="4nDRG5DbkKv" role="3clFbG">
                     <node concept="37vLTw" id="4nDRG5DbkKw" role="37vLTJ">
-                      <ref role="3cqZAo" node="4nDRG5DbkJQ" resolve="targetRef" />
+                      <ref role="3cqZAo" node="4nDRG5DbkJQ" resolve="originRef" />
                     </node>
                     <node concept="2OqwBi" id="4nDRG5DbkKx" role="37vLTx">
                       <node concept="37vLTw" id="4nDRG5DbkKy" role="2Oq$k0">
                         <ref role="3cqZAo" node="4nDRG5DbkJB" resolve="rule" />
                       </node>
                       <node concept="liA8E" id="4nDRG5DbkKz" role="2OqNvi">
-                        <ref role="37wK5l" to="ugy2:7nPD14Ob4em" resolve="targetRef" />
+                        <ref role="37wK5l" to="ugy2:7nPD14Ob4em" resolve="originRef" />
                       </node>
                     </node>
                   </node>
@@ -9460,7 +9460,7 @@
               <node concept="3clFbC" id="4nDRG5DbkKE" role="3clFbw">
                 <node concept="10Nm6u" id="4nDRG5DbkKF" role="3uHU7w" />
                 <node concept="37vLTw" id="4nDRG5DbkKG" role="3uHU7B">
-                  <ref role="3cqZAo" node="4nDRG5DbkJQ" resolve="targetRef" />
+                  <ref role="3cqZAo" node="4nDRG5DbkJQ" resolve="originRef" />
                 </node>
               </node>
             </node>
@@ -9567,7 +9567,7 @@
                           <ref role="3cqZAo" node="4nDRG5Dbtfc" resolve="status" />
                         </node>
                         <node concept="37vLTw" id="4nDRG5DcoDq" role="37wK5m">
-                          <ref role="3cqZAo" node="4nDRG5DbkJQ" resolve="targetRef" />
+                          <ref role="3cqZAo" node="4nDRG5DbkJQ" resolve="originRef" />
                         </node>
                         <node concept="2OqwBi" id="4nDRG5DcoDr" role="37wK5m">
                           <node concept="37vLTw" id="4nDRG5DcoDs" role="2Oq$k0">
@@ -9641,7 +9641,7 @@
               </node>
               <node concept="3y3z36" id="4nDRG5DbkLu" role="3clFbw">
                 <node concept="37vLTw" id="4nDRG5DbkLv" role="3uHU7B">
-                  <ref role="3cqZAo" node="4nDRG5DbkJQ" resolve="targetRef" />
+                  <ref role="3cqZAo" node="4nDRG5DbkJQ" resolve="originRef" />
                 </node>
                 <node concept="10Nm6u" id="4nDRG5DbkLw" role="3uHU7w" />
               </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
index 9c3408bc..553ec6fc 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.predicate.mps
@@ -9924,11 +9924,11 @@
             <node concept="2OqwBi" id="4ekZiHddj3N" role="37vLTJ">
               <node concept="Xjq3P" id="4ekZiHddj4k" role="2Oq$k0" />
               <node concept="2OwXpG" id="4ekZiHddjy4" role="2OqNvi">
-                <ref role="2Oxat5" node="4ekZiHddj0h" resolve="target" />
+                <ref role="2Oxat5" node="4ekZiHddj0h" resolve="origin" />
               </node>
             </node>
             <node concept="37vLTw" id="4ekZiHddj0r" role="37vLTx">
-              <ref role="3cqZAo" node="4ekZiHddiZf" resolve="target" />
+              <ref role="3cqZAo" node="4ekZiHddiZf" resolve="origin" />
             </node>
           </node>
         </node>
@@ -9940,7 +9940,7 @@
         </node>
       </node>
       <node concept="37vLTG" id="4ekZiHddiZf" role="3clF46">
-        <property role="TrG5h" value="target" />
+        <property role="TrG5h" value="origin" />
         <node concept="3uibUv" id="4ekZiHddiZe" role="1tU5fm">
           <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
         </node>
@@ -9963,7 +9963,7 @@
     </node>
     <node concept="2tJIrI" id="4ekZiHddjmZ" role="jymVt" />
     <node concept="3clFb_" id="4ekZiHddjeb" role="jymVt">
-      <property role="TrG5h" value="getTarget" />
+      <property role="TrG5h" value="getOrigin" />
       <node concept="3uibUv" id="4ekZiHddjh7" role="3clF45">
         <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
       </node>
@@ -9971,7 +9971,7 @@
       <node concept="3clFbS" id="4ekZiHddjef" role="3clF47">
         <node concept="3clFbF" id="4ekZiHddjoE" role="3cqZAp">
           <node concept="37vLTw" id="4ekZiHddjqT" role="3clFbG">
-            <ref role="3cqZAo" node="4ekZiHddj0h" resolve="target" />
+            <ref role="3cqZAo" node="4ekZiHddj0h" resolve="origin" />
           </node>
         </node>
       </node>
@@ -9986,7 +9986,7 @@
       </node>
     </node>
     <node concept="312cEg" id="4ekZiHddj0h" role="jymVt">
-      <property role="TrG5h" value="target" />
+      <property role="TrG5h" value="origin" />
       <node concept="3Tm6S6" id="4ekZiHddj0i" role="1B3o_S" />
       <node concept="3uibUv" id="4ekZiHddj0k" role="1tU5fm">
         <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
@@ -9996,7 +9996,7 @@
     <node concept="3UR2Jj" id="4ekZiHddkfE" role="lGtFl">
       <node concept="TZ5HA" id="4ekZiHddkfF" role="TZ5H$">
         <node concept="1dT_AC" id="4ekZiHddkfG" role="1dT_Ay">
-          <property role="1dT_AB" value="A pair of references to the feedback's origin template and the target node." />
+          <property role="1dT_AB" value="A pair of references to the feedback's origin template and the origin node." />
         </node>
       </node>
     </node>
@@ -10021,7 +10021,7 @@
         </node>
       </node>
       <node concept="37vLTG" id="61G6TdBsHnY" role="3clF46">
-        <property role="TrG5h" value="targetRef" />
+        <property role="TrG5h" value="originRef" />
         <node concept="3uibUv" id="61G6TdBsHnZ" role="1tU5fm">
           <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
         </node>
@@ -10048,7 +10048,7 @@
                   <ref role="3cqZAo" node="61G6TdBsHnW" resolve="templateRef" />
                 </node>
                 <node concept="37vLTw" id="61G6TdBsHCw" role="37wK5m">
-                  <ref role="3cqZAo" node="61G6TdBsHnY" resolve="targetRef" />
+                  <ref role="3cqZAo" node="61G6TdBsHnY" resolve="originRef" />
                 </node>
               </node>
             </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
index 3d02aa8d..03a4422e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
@@ -3757,10 +3757,13 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="4nDRG5KFMkZ" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
+      </node>
     </node>
     <node concept="2tJIrI" id="6tnA4677Qqb" role="jymVt" />
     <node concept="3clFb_" id="7nPD14Ob4em" role="jymVt">
-      <property role="TrG5h" value="targetRef" />
+      <property role="TrG5h" value="originRef" />
       <property role="1EzhhJ" value="true" />
       <node concept="3uibUv" id="6i42QSs9msQ" role="3clF45">
         <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
@@ -3770,17 +3773,17 @@
       <node concept="P$JXv" id="6tnA466TYOV" role="lGtFl">
         <node concept="TZ5HA" id="6tnA466TYOW" role="TZ5H$">
           <node concept="1dT_AC" id="6tnA466TYOX" role="1dT_Ay">
-            <property role="1dT_AB" value="A reference to the target node for possible errors to be reported. " />
+            <property role="1dT_AB" value="A reference to the origin node for possible errors to be reported. " />
           </node>
         </node>
         <node concept="TZ5HA" id="6tnA467FJQk" role="TZ5H$">
           <node concept="1dT_AC" id="6tnA467FJQl" role="1dT_Ay">
-            <property role="1dT_AB" value="If not specified explicitly by the rule template, the origin node is assumed to be the target. " />
+            <property role="1dT_AB" value="If not specified explicitly by the rule template, the node used to trigger this rule is assumed. " />
           </node>
         </node>
         <node concept="TZ5HA" id="6tnA467FJQy" role="TZ5H$">
           <node concept="1dT_AC" id="6tnA467FJQz" role="1dT_Ay">
-            <property role="1dT_AB" value="If specified to be null, the target is looked up from the evaluation context. " />
+            <property role="1dT_AB" value="If specified to be null, the origin is looked up from the evaluation context (provenance). " />
           </node>
         </node>
       </node>
@@ -7779,7 +7782,7 @@
     </node>
     <node concept="2tJIrI" id="6tnA4677Wgw" role="jymVt" />
     <node concept="3clFb_" id="7nPD14Ob6b5" role="jymVt">
-      <property role="TrG5h" value="targetRef" />
+      <property role="TrG5h" value="originRef" />
       <property role="1EzhhJ" value="false" />
       <node concept="3uibUv" id="6i42QSs9phk" role="3clF45">
         <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index c1e0fdcd..04cc9f44 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -19551,7 +19551,7 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="61G6TdB_yxH" role="2OqNvi">
-                                    <ref role="37wK5l" to="tpfl:4ekZiHddjeb" resolve="getTarget" />
+                                    <ref role="37wK5l" to="tpfl:4ekZiHddjeb" resolve="getOrigin" />
                                   </node>
                                 </node>
                                 <node concept="2OqwBi" id="61G6TdB_yxI" role="37wK5m">