Interventions. Modifiers can now operate on the static intervention labels and example interventions have been implemented for standard deterministic SIR and SEIR models

git-svn-id: http://dev.eclipse.org/svnroot/technology/org.eclipse.stem/trunk@2048 92a21009-5b66-0410-b83a-dc787c41c6e9

33 files changed, 514 insertions, 2321 deletions

diff --git a/org.eclipse.stem.interventions/META-INF/MANIFEST.MF b/org.eclipse.stem.interventions/META-INF/MANIFEST.MF
index 9701f9189..30243e751 100644
--- a/org.eclipse.stem.interventions/META-INF/MANIFEST.MF
+++ b/org.eclipse.stem.interventions/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.stem.core;visibility:=reexport,
  org.eclipse.emf.edit;visibility:=reexport,
  org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.stem.diseasemodels,
- org.eclipse.stem.populationmodels,
- org.eclipse.stem.graphgenerators;visibility:=reexport
+ org.eclipse.stem.graphgenerators;visibility:=reexport,
+ org.eclipse.stem.definitions
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.stem.interventions/icons/full/obj16/StandardInterventionLabel.gif b/org.eclipse.stem.interventions/icons/full/obj16/StandardInterventionLabel.gif
new file mode 100644
index 000000000..739ebbfa6
--- /dev/null
+++ b/org.eclipse.stem.interventions/icons/full/obj16/StandardInterventionLabel.gif
diff --git a/org.eclipse.stem.interventions/icons/full/obj16/StandardInterventionLabelValue.gif b/org.eclipse.stem.interventions/icons/full/obj16/StandardInterventionLabelValue.gif
new file mode 100644
index 000000000..53500daf9
--- /dev/null
+++ b/org.eclipse.stem.interventions/icons/full/obj16/StandardInterventionLabelValue.gif
diff --git a/org.eclipse.stem.interventions/model/interventions.ecore b/org.eclipse.stem.interventions/model/interventions.ecore
index 5e04fd6eb..145c8128c 100644
--- a/org.eclipse.stem.interventions/model/interventions.ecore
+++ b/org.eclipse.stem.interventions/model/interventions.ecore
@@ -3,24 +3,8 @@
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="interventions"
     nsURI="http:///org/eclipse/stem/interventions.ecore" nsPrefix="org.eclipse.stem.interventions">
-  <eClassifiers xsi:type="ecore:EClass" name="LabelValueTest" eSuperTypes="../../org.eclipse.stem.core/model/predicate.ecore#//Test">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetURI" eType="ecore:EDataType ../../org.eclipse.stem.core/model/common.ecore#//URI"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="state" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
-        defaultValueLiteral="incidence"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="threshold" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"
-        defaultValueLiteral="100"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="predicate" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
-        defaultValueLiteral=">"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="populationIdentifier" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
-        defaultValueLiteral="human"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ControlLabel" abstract="true" eSuperTypes="../../org.eclipse.stem.core/model/graph.ecore#//NodeLabel">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="originalValue" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.stem.core/model/graph.ecore#//LabelValue"
-        containment="true" resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StandardControlLabel" eSuperTypes="#//ControlLabel">
+  <eClassifiers xsi:type="ecore:EClass" name="InterventionLabel" abstract="true" eSuperTypes="../../org.eclipse.stem.core/model/graph.ecore#//StaticNodeLabel"/>
+  <eClassifiers xsi:type="ecore:EClass" name="StandardInterventionLabel" eSuperTypes="#//InterventionLabel">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="populationIdentifier" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
         defaultValueLiteral="human"/>
   </eClassifiers>
@@ -33,8 +17,9 @@
         defaultValueLiteral="human"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" eType="ecore:EDataType ../../org.eclipse.stem.core/model/common.ecore#//URI"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ControlLabelValue" abstract="true" eSuperTypes="../../org.eclipse.stem.core/model/graph.ecore#//LabelValue"/>
-  <eClassifiers xsi:type="ecore:EClass" name="StandardControlLabelValue" eSuperTypes="#//ControlLabelValue">
+  <eClassifiers xsi:type="ecore:EClass" name="InterventionLabelValue" abstract="true"
+      eSuperTypes="../../org.eclipse.stem.core/model/graph.ecore#//LabelValue"/>
+  <eClassifiers xsi:type="ecore:EClass" name="StandardInterventionLabelValue" eSuperTypes="#//InterventionLabelValue">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="vaccinations" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isolations" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"/>
   </eClassifiers>
diff --git a/org.eclipse.stem.interventions/model/interventions.genmodel b/org.eclipse.stem.interventions/model/interventions.genmodel
index f4866e369..345433a75 100644
--- a/org.eclipse.stem.interventions/model/interventions.genmodel
+++ b/org.eclipse.stem.interventions/model/interventions.genmodel
@@ -11,15 +11,7 @@
     optimizedHasChildren="true" usedGenPackages="../../org.eclipse.stem.core/model/core.genmodel#//common ../../org.eclipse.stem.core/model/core.genmodel#//graph ../../org.eclipse.stem.core/model/core.genmodel#//model ../../org.eclipse.stem.core/model/core.genmodel#//modifier ../../org.eclipse.stem.core/model/core.genmodel#//predicate ../../org.eclipse.stem.core/model/core.genmodel#//scenario ../../org.eclipse.stem.core/model/core.genmodel#//sequencer ../../org.eclipse.stem.core/model/core.genmodel#//solver platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.stem.graphgenerators/model/graphgenerator.genmodel#//graphgenerators">
   <foreignModel>interventions.ecore</foreignModel>
   <genPackages prefix="Interventions" basePackage="org.eclipse.stem" disposableProviderFactory="true"
-      childCreationExtenders="true" ecorePackage="interventions.ecore#/">
-    <genClasses ecoreClass="interventions.ecore#//LabelValueTest">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute interventions.ecore#//LabelValueTest/modelName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute interventions.ecore#//LabelValueTest/targetURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute interventions.ecore#//LabelValueTest/state"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute interventions.ecore#//LabelValueTest/threshold"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute interventions.ecore#//LabelValueTest/predicate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute interventions.ecore#//LabelValueTest/populationIdentifier"/>
-    </genClasses>
+      ecorePackage="interventions.ecore#/">
     <genClasses image="false" ecoreClass="interventions.ecore#//ControlLabel">
       <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference interventions.ecore#//ControlLabel/originalValue"/>
     </genClasses>
diff --git a/org.eclipse.stem.interventions/plugin.properties b/org.eclipse.stem.interventions/plugin.properties
index 51cef70b8..04ab588d6 100644
--- a/org.eclipse.stem.interventions/plugin.properties
+++ b/org.eclipse.stem.interventions/plugin.properties
@@ -90,3 +90,10 @@ _UI_ControlGraphGenerator_location_feature = Location
 _UI_StandardControlLabelValue_type = Standard Control Label Value
 _UI_StandardControlLabelValue_vaccinations_feature = Vaccinations
 _UI_StandardControlLabelValue_isolations_feature = Isolations
+_UI_InterventionLabel_type = Intervention Label
+_UI_StandardInterventionLabel_type = Standard Intervention Label
+_UI_InterventionLabelValue_type = Intervention Label Value
+_UI_StandardInterventionLabelValue_type = Standard Intervention Label Value
+_UI_StandardInterventionLabel_populationIdentifier_feature = Population Identifier
+_UI_StandardInterventionLabelValue_vaccinations_feature = Vaccinations
+_UI_StandardInterventionLabelValue_isolations_feature = Isolations
diff --git a/org.eclipse.stem.interventions/plugin.xml b/org.eclipse.stem.interventions/plugin.xml
index 83c3b9a06..eb26499be 100644
--- a/org.eclipse.stem.interventions/plugin.xml
+++ b/org.eclipse.stem.interventions/plugin.xml
@@ -22,12 +22,6 @@
                org.eclipse.emf.edit.provider.IItemPropertySource"/>
    </extension>
 
-   <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <extender
-            uri="http:///org/eclipse/stem/core/predicate.ecore"
-            class="org.eclipse.stem.interventions.provider.InterventionsItemProviderAdapterFactory$PredicateChildCreationExtender"/>
-   </extension>
-
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
             uri="http:///org/eclipse/stem/interventions.ecore"
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/ControlLabel.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/ControlLabel.java
deleted file mode 100644
index 6cd11a1f8..000000000
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/ControlLabel.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.stem.interventions;
-
-import org.eclipse.stem.core.graph.LabelValue;
-import org.eclipse.stem.core.graph.NodeLabel;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Control Label</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.stem.interventions.ControlLabel#getOriginalValue <em>Original Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.stem.interventions.InterventionsPackage#getControlLabel()
- * @model abstract="true"
- * @generated
- */
-public interface ControlLabel extends NodeLabel {
-
-	/**
-	 * Returns the value of the '<em><b>Original Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Original Value</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Original Value</em>' containment reference.
-	 * @see #setOriginalValue(LabelValue)
-	 * @see org.eclipse.stem.interventions.InterventionsPackage#getControlLabel_OriginalValue()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	LabelValue getOriginalValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.stem.interventions.ControlLabel#getOriginalValue <em>Original Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Original Value</em>' containment reference.
-	 * @see #getOriginalValue()
-	 * @generated
-	 */
-	void setOriginalValue(LabelValue value);
-} // ControlLabel
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/ControlLabelValue.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/ControlLabelValue.java
deleted file mode 100644
index 1aa3dd6e8..000000000
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/ControlLabelValue.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.stem.interventions;
-
-import org.eclipse.stem.core.graph.LabelValue;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Control Label Value</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.stem.interventions.InterventionsPackage#getControlLabelValue()
- * @model abstract="true"
- * @generated
- */
-public interface ControlLabelValue extends LabelValue {
-
-} // ControlLabelValue
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionLabel.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionLabel.java
new file mode 100644
index 000000000..501247493
--- /dev/null
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionLabel.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.stem.interventions;
+
+import org.eclipse.stem.core.graph.StaticNodeLabel;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Intervention Label</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.stem.interventions.InterventionsPackage#getInterventionLabel()
+ * @model abstract="true"
+ * @generated
+ */
+public interface InterventionLabel extends StaticNodeLabel {
+} // InterventionLabel
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionLabelValue.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionLabelValue.java
new file mode 100644
index 000000000..6f4c2a5bc
--- /dev/null
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionLabelValue.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.stem.interventions;
+
+import org.eclipse.stem.core.graph.LabelValue;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Intervention Label Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.stem.interventions.InterventionsPackage#getInterventionLabelValue()
+ * @model abstract="true"
+ * @generated
+ */
+public interface InterventionLabelValue extends LabelValue {
+} // InterventionLabelValue
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsFactory.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsFactory.java
index 2d5f898ee..669263724 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsFactory.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsFactory.java
@@ -31,22 +31,13 @@ public interface InterventionsFactory extends EFactory {
 	InterventionsFactory eINSTANCE = org.eclipse.stem.interventions.impl.InterventionsFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Label Value Test</em>'.
+	 * Returns a new object of class '<em>Standard Intervention Label</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Label Value Test</em>'.
+	 * @return a new object of class '<em>Standard Intervention Label</em>'.
 	 * @generated
 	 */
-	LabelValueTest createLabelValueTest();
-
-	/**
-	 * Returns a new object of class '<em>Standard Control Label</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Standard Control Label</em>'.
-	 * @generated
-	 */
-	StandardControlLabel createStandardControlLabel();
+	StandardInterventionLabel createStandardInterventionLabel();
 
 	/**
 	 * Returns a new object of class '<em>Control Graph Generator</em>'.
@@ -58,13 +49,13 @@ public interface InterventionsFactory extends EFactory {
 	ControlGraphGenerator createControlGraphGenerator();
 
 	/**
-	 * Returns a new object of class '<em>Standard Control Label Value</em>'.
+	 * Returns a new object of class '<em>Standard Intervention Label Value</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Standard Control Label Value</em>'.
+	 * @return a new object of class '<em>Standard Intervention Label Value</em>'.
 	 * @generated
 	 */
-	StandardControlLabelValue createStandardControlLabelValue();
+	StandardInterventionLabelValue createStandardInterventionLabelValue();
 
 	/**
 	 * Returns the package supported by this factory.
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsPackage.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsPackage.java
index 9b62e4679..c54be10d4 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsPackage.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/InterventionsPackage.java
@@ -69,88 +69,14 @@ public interface InterventionsPackage extends EPackage {
 	InterventionsPackage eINSTANCE = org.eclipse.stem.interventions.impl.InterventionsPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.stem.interventions.impl.LabelValueTestImpl <em>Label Value Test</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.stem.interventions.impl.InterventionLabelImpl <em>Intervention Label</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.stem.interventions.impl.LabelValueTestImpl
-	 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getLabelValueTest()
+	 * @see org.eclipse.stem.interventions.impl.InterventionLabelImpl
+	 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getInterventionLabel()
 	 * @generated
 	 */
-	int LABEL_VALUE_TEST = 0;
-
-	/**
-	 * The feature id for the '<em><b>Model Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_VALUE_TEST__MODEL_NAME = PredicatePackage.TEST_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Target URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_VALUE_TEST__TARGET_URI = PredicatePackage.TEST_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>State</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_VALUE_TEST__STATE = PredicatePackage.TEST_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Threshold</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_VALUE_TEST__THRESHOLD = PredicatePackage.TEST_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Predicate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_VALUE_TEST__PREDICATE = PredicatePackage.TEST_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Population Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_VALUE_TEST__POPULATION_IDENTIFIER = PredicatePackage.TEST_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Label Value Test</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_VALUE_TEST_FEATURE_COUNT = PredicatePackage.TEST_FEATURE_COUNT + 6;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.stem.interventions.impl.ControlLabelImpl <em>Control Label</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.stem.interventions.impl.ControlLabelImpl
-	 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getControlLabel()
-	 * @generated
-	 */
-	int CONTROL_LABEL = 1;
+	int INTERVENTION_LABEL = 0;
 
 	/**
 	 * The feature id for the '<em><b>URI</b></em>' attribute.
@@ -159,7 +85,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROL_LABEL__URI = GraphPackage.NODE_LABEL__URI;
+	int INTERVENTION_LABEL__URI = GraphPackage.STATIC_NODE_LABEL__URI;
 
 	/**
 	 * The feature id for the '<em><b>Type URI</b></em>' attribute.
@@ -168,7 +94,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROL_LABEL__TYPE_URI = GraphPackage.NODE_LABEL__TYPE_URI;
+	int INTERVENTION_LABEL__TYPE_URI = GraphPackage.STATIC_NODE_LABEL__TYPE_URI;
 
 	/**
 	 * The feature id for the '<em><b>Dublin Core</b></em>' containment reference.
@@ -177,7 +103,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROL_LABEL__DUBLIN_CORE = GraphPackage.NODE_LABEL__DUBLIN_CORE;
+	int INTERVENTION_LABEL__DUBLIN_CORE = GraphPackage.STATIC_NODE_LABEL__DUBLIN_CORE;
 
 	/**
 	 * The feature id for the '<em><b>URI Of Identifiable To Be Labeled</b></em>' attribute.
@@ -186,7 +112,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROL_LABEL__URI_OF_IDENTIFIABLE_TO_BE_LABELED = GraphPackage.NODE_LABEL__URI_OF_IDENTIFIABLE_TO_BE_LABELED;
+	int INTERVENTION_LABEL__URI_OF_IDENTIFIABLE_TO_BE_LABELED = GraphPackage.STATIC_NODE_LABEL__URI_OF_IDENTIFIABLE_TO_BE_LABELED;
 
 	/**
 	 * The feature id for the '<em><b>Current Value</b></em>' containment reference.
@@ -195,7 +121,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROL_LABEL__CURRENT_VALUE = GraphPackage.NODE_LABEL__CURRENT_VALUE;
+	int INTERVENTION_LABEL__CURRENT_VALUE = GraphPackage.STATIC_NODE_LABEL__CURRENT_VALUE;
 
 	/**
 	 * The feature id for the '<em><b>Identifiable</b></em>' reference.
@@ -204,7 +130,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROL_LABEL__IDENTIFIABLE = GraphPackage.NODE_LABEL__IDENTIFIABLE;
+	int INTERVENTION_LABEL__IDENTIFIABLE = GraphPackage.STATIC_NODE_LABEL__IDENTIFIABLE;
 
 	/**
 	 * The feature id for the '<em><b>Node</b></em>' reference.
@@ -213,35 +139,26 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROL_LABEL__NODE = GraphPackage.NODE_LABEL__NODE;
+	int INTERVENTION_LABEL__NODE = GraphPackage.STATIC_NODE_LABEL__NODE;
 
 	/**
-	 * The feature id for the '<em><b>Original Value</b></em>' containment reference.
+	 * The number of structural features of the '<em>Intervention Label</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROL_LABEL__ORIGINAL_VALUE = GraphPackage.NODE_LABEL_FEATURE_COUNT + 0;
+	int INTERVENTION_LABEL_FEATURE_COUNT = GraphPackage.STATIC_NODE_LABEL_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Control Label</em>' class.
+	 * The meta object id for the '{@link org.eclipse.stem.interventions.impl.StandardInterventionLabelImpl <em>Standard Intervention Label</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see org.eclipse.stem.interventions.impl.StandardInterventionLabelImpl
+	 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getStandardInterventionLabel()
 	 * @generated
-	 * @ordered
 	 */
-	int CONTROL_LABEL_FEATURE_COUNT = GraphPackage.NODE_LABEL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.stem.interventions.impl.StandardControlLabelImpl <em>Standard Control Label</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.stem.interventions.impl.StandardControlLabelImpl
-	 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getStandardControlLabel()
-	 * @generated
-	 */
-	int STANDARD_CONTROL_LABEL = 2;
+	int STANDARD_INTERVENTION_LABEL = 1;
 
 	/**
 	 * The feature id for the '<em><b>URI</b></em>' attribute.
@@ -250,7 +167,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL__URI = CONTROL_LABEL__URI;
+	int STANDARD_INTERVENTION_LABEL__URI = INTERVENTION_LABEL__URI;
 
 	/**
 	 * The feature id for the '<em><b>Type URI</b></em>' attribute.
@@ -259,7 +176,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL__TYPE_URI = CONTROL_LABEL__TYPE_URI;
+	int STANDARD_INTERVENTION_LABEL__TYPE_URI = INTERVENTION_LABEL__TYPE_URI;
 
 	/**
 	 * The feature id for the '<em><b>Dublin Core</b></em>' containment reference.
@@ -268,7 +185,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL__DUBLIN_CORE = CONTROL_LABEL__DUBLIN_CORE;
+	int STANDARD_INTERVENTION_LABEL__DUBLIN_CORE = INTERVENTION_LABEL__DUBLIN_CORE;
 
 	/**
 	 * The feature id for the '<em><b>URI Of Identifiable To Be Labeled</b></em>' attribute.
@@ -277,7 +194,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL__URI_OF_IDENTIFIABLE_TO_BE_LABELED = CONTROL_LABEL__URI_OF_IDENTIFIABLE_TO_BE_LABELED;
+	int STANDARD_INTERVENTION_LABEL__URI_OF_IDENTIFIABLE_TO_BE_LABELED = INTERVENTION_LABEL__URI_OF_IDENTIFIABLE_TO_BE_LABELED;
 
 	/**
 	 * The feature id for the '<em><b>Current Value</b></em>' containment reference.
@@ -286,7 +203,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL__CURRENT_VALUE = CONTROL_LABEL__CURRENT_VALUE;
+	int STANDARD_INTERVENTION_LABEL__CURRENT_VALUE = INTERVENTION_LABEL__CURRENT_VALUE;
 
 	/**
 	 * The feature id for the '<em><b>Identifiable</b></em>' reference.
@@ -295,7 +212,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL__IDENTIFIABLE = CONTROL_LABEL__IDENTIFIABLE;
+	int STANDARD_INTERVENTION_LABEL__IDENTIFIABLE = INTERVENTION_LABEL__IDENTIFIABLE;
 
 	/**
 	 * The feature id for the '<em><b>Node</b></em>' reference.
@@ -304,16 +221,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL__NODE = CONTROL_LABEL__NODE;
-
-	/**
-	 * The feature id for the '<em><b>Original Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STANDARD_CONTROL_LABEL__ORIGINAL_VALUE = CONTROL_LABEL__ORIGINAL_VALUE;
+	int STANDARD_INTERVENTION_LABEL__NODE = INTERVENTION_LABEL__NODE;
 
 	/**
 	 * The feature id for the '<em><b>Population Identifier</b></em>' attribute.
@@ -322,17 +230,16 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL__POPULATION_IDENTIFIER = CONTROL_LABEL_FEATURE_COUNT + 0;
+	int STANDARD_INTERVENTION_LABEL__POPULATION_IDENTIFIER = INTERVENTION_LABEL_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Standard Control Label</em>' class.
+	 * The number of structural features of the '<em>Standard Intervention Label</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL_FEATURE_COUNT = CONTROL_LABEL_FEATURE_COUNT + 1;
-
+	int STANDARD_INTERVENTION_LABEL_FEATURE_COUNT = INTERVENTION_LABEL_FEATURE_COUNT + 1;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.stem.interventions.impl.ControlGraphGeneratorImpl <em>Control Graph Generator</em>}' class.
@@ -342,7 +249,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getControlGraphGenerator()
 	 * @generated
 	 */
-	int CONTROL_GRAPH_GENERATOR = 3;
+	int CONTROL_GRAPH_GENERATOR = 2;
 
 	/**
 	 * The feature id for the '<em><b>URI</b></em>' attribute.
@@ -418,34 +325,33 @@ public interface InterventionsPackage extends EPackage {
 
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.stem.interventions.impl.ControlLabelValueImpl <em>Control Label Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.stem.interventions.impl.InterventionLabelValueImpl <em>Intervention Label Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.stem.interventions.impl.ControlLabelValueImpl
-	 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getControlLabelValue()
+	 * @see org.eclipse.stem.interventions.impl.InterventionLabelValueImpl
+	 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getInterventionLabelValue()
 	 * @generated
 	 */
-	int CONTROL_LABEL_VALUE = 4;
+	int INTERVENTION_LABEL_VALUE = 3;
 
 	/**
-	 * The number of structural features of the '<em>Control Label Value</em>' class.
+	 * The number of structural features of the '<em>Intervention Label Value</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROL_LABEL_VALUE_FEATURE_COUNT = GraphPackage.LABEL_VALUE_FEATURE_COUNT + 0;
-
+	int INTERVENTION_LABEL_VALUE_FEATURE_COUNT = GraphPackage.LABEL_VALUE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.stem.interventions.impl.StandardControlLabelValueImpl <em>Standard Control Label Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.stem.interventions.impl.StandardInterventionLabelValueImpl <em>Standard Intervention Label Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.stem.interventions.impl.StandardControlLabelValueImpl
-	 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getStandardControlLabelValue()
+	 * @see org.eclipse.stem.interventions.impl.StandardInterventionLabelValueImpl
+	 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getStandardInterventionLabelValue()
 	 * @generated
 	 */
-	int STANDARD_CONTROL_LABEL_VALUE = 5;
+	int STANDARD_INTERVENTION_LABEL_VALUE = 4;
 
 	/**
 	 * The feature id for the '<em><b>Vaccinations</b></em>' attribute.
@@ -454,7 +360,7 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL_VALUE__VACCINATIONS = CONTROL_LABEL_VALUE_FEATURE_COUNT + 0;
+	int STANDARD_INTERVENTION_LABEL_VALUE__VACCINATIONS = INTERVENTION_LABEL_VALUE_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Isolations</b></em>' attribute.
@@ -463,135 +369,48 @@ public interface InterventionsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL_VALUE__ISOLATIONS = CONTROL_LABEL_VALUE_FEATURE_COUNT + 1;
+	int STANDARD_INTERVENTION_LABEL_VALUE__ISOLATIONS = INTERVENTION_LABEL_VALUE_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Standard Control Label Value</em>' class.
+	 * The number of structural features of the '<em>Standard Intervention Label Value</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_CONTROL_LABEL_VALUE_FEATURE_COUNT = CONTROL_LABEL_VALUE_FEATURE_COUNT + 2;
+	int STANDARD_INTERVENTION_LABEL_VALUE_FEATURE_COUNT = INTERVENTION_LABEL_VALUE_FEATURE_COUNT + 2;
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.stem.interventions.LabelValueTest <em>Label Value Test</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.stem.interventions.InterventionLabel <em>Intervention Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Label Value Test</em>'.
-	 * @see org.eclipse.stem.interventions.LabelValueTest
+	 * @return the meta object for class '<em>Intervention Label</em>'.
+	 * @see org.eclipse.stem.interventions.InterventionLabel
 	 * @generated
 	 */
-	EClass getLabelValueTest();
+	EClass getInterventionLabel();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.LabelValueTest#getModelName <em>Model Name</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.stem.interventions.StandardInterventionLabel <em>Standard Intervention Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Model Name</em>'.
-	 * @see org.eclipse.stem.interventions.LabelValueTest#getModelName()
-	 * @see #getLabelValueTest()
+	 * @return the meta object for class '<em>Standard Intervention Label</em>'.
+	 * @see org.eclipse.stem.interventions.StandardInterventionLabel
 	 * @generated
 	 */
-	EAttribute getLabelValueTest_ModelName();
+	EClass getStandardInterventionLabel();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.LabelValueTest#getTargetURI <em>Target URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Target URI</em>'.
-	 * @see org.eclipse.stem.interventions.LabelValueTest#getTargetURI()
-	 * @see #getLabelValueTest()
-	 * @generated
-	 */
-	EAttribute getLabelValueTest_TargetURI();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.LabelValueTest#getState <em>State</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>State</em>'.
-	 * @see org.eclipse.stem.interventions.LabelValueTest#getState()
-	 * @see #getLabelValueTest()
-	 * @generated
-	 */
-	EAttribute getLabelValueTest_State();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.LabelValueTest#getThreshold <em>Threshold</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Threshold</em>'.
-	 * @see org.eclipse.stem.interventions.LabelValueTest#getThreshold()
-	 * @see #getLabelValueTest()
-	 * @generated
-	 */
-	EAttribute getLabelValueTest_Threshold();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.LabelValueTest#getPredicate <em>Predicate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Predicate</em>'.
-	 * @see org.eclipse.stem.interventions.LabelValueTest#getPredicate()
-	 * @see #getLabelValueTest()
-	 * @generated
-	 */
-	EAttribute getLabelValueTest_Predicate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.LabelValueTest#getPopulationIdentifier <em>Population Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.StandardInterventionLabel#getPopulationIdentifier <em>Population Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Population Identifier</em>'.
-	 * @see org.eclipse.stem.interventions.LabelValueTest#getPopulationIdentifier()
-	 * @see #getLabelValueTest()
+	 * @see org.eclipse.stem.interventions.StandardInterventionLabel#getPopulationIdentifier()
+	 * @see #getStandardInterventionLabel()
 	 * @generated
 	 */
-	EAttribute getLabelValueTest_PopulationIdentifier();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.stem.interventions.ControlLabel <em>Control Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Control Label</em>'.
-	 * @see org.eclipse.stem.interventions.ControlLabel
-	 * @generated
-	 */
-	EClass getControlLabel();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.stem.interventions.ControlLabel#getOriginalValue <em>Original Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Original Value</em>'.
-	 * @see org.eclipse.stem.interventions.ControlLabel#getOriginalValue()
-	 * @see #getControlLabel()
-	 * @generated
-	 */
-	EReference getControlLabel_OriginalValue();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.stem.interventions.StandardControlLabel <em>Standard Control Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Standard Control Label</em>'.
-	 * @see org.eclipse.stem.interventions.StandardControlLabel
-	 * @generated
-	 */
-	EClass getStandardControlLabel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.StandardControlLabel#getPopulationIdentifier <em>Population Identifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Population Identifier</em>'.
-	 * @see org.eclipse.stem.interventions.StandardControlLabel#getPopulationIdentifier()
-	 * @see #getStandardControlLabel()
-	 * @generated
-	 */
-	EAttribute getStandardControlLabel_PopulationIdentifier();
+	EAttribute getStandardInterventionLabel_PopulationIdentifier();
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.stem.interventions.ControlGraphGenerator <em>Control Graph Generator</em>}'.
@@ -648,46 +467,46 @@ public interface InterventionsPackage extends EPackage {
 	EAttribute getControlGraphGenerator_Location();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.stem.interventions.ControlLabelValue <em>Control Label Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.stem.interventions.InterventionLabelValue <em>Intervention Label Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Control Label Value</em>'.
-	 * @see org.eclipse.stem.interventions.ControlLabelValue
+	 * @return the meta object for class '<em>Intervention Label Value</em>'.
+	 * @see org.eclipse.stem.interventions.InterventionLabelValue
 	 * @generated
 	 */
-	EClass getControlLabelValue();
+	EClass getInterventionLabelValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.stem.interventions.StandardControlLabelValue <em>Standard Control Label Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.stem.interventions.StandardInterventionLabelValue <em>Standard Intervention Label Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Standard Control Label Value</em>'.
-	 * @see org.eclipse.stem.interventions.StandardControlLabelValue
+	 * @return the meta object for class '<em>Standard Intervention Label Value</em>'.
+	 * @see org.eclipse.stem.interventions.StandardInterventionLabelValue
 	 * @generated
 	 */
-	EClass getStandardControlLabelValue();
+	EClass getStandardInterventionLabelValue();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.StandardControlLabelValue#getVaccinations <em>Vaccinations</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.StandardInterventionLabelValue#getVaccinations <em>Vaccinations</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Vaccinations</em>'.
-	 * @see org.eclipse.stem.interventions.StandardControlLabelValue#getVaccinations()
-	 * @see #getStandardControlLabelValue()
+	 * @see org.eclipse.stem.interventions.StandardInterventionLabelValue#getVaccinations()
+	 * @see #getStandardInterventionLabelValue()
 	 * @generated
 	 */
-	EAttribute getStandardControlLabelValue_Vaccinations();
+	EAttribute getStandardInterventionLabelValue_Vaccinations();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.StandardControlLabelValue#getIsolations <em>Isolations</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.stem.interventions.StandardInterventionLabelValue#getIsolations <em>Isolations</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Isolations</em>'.
-	 * @see org.eclipse.stem.interventions.StandardControlLabelValue#getIsolations()
-	 * @see #getStandardControlLabelValue()
+	 * @see org.eclipse.stem.interventions.StandardInterventionLabelValue#getIsolations()
+	 * @see #getStandardInterventionLabelValue()
 	 * @generated
 	 */
-	EAttribute getStandardControlLabelValue_Isolations();
+	EAttribute getStandardInterventionLabelValue_Isolations();
 
 	/**
 	 * Returns the factory that creates the instances of the model.
@@ -712,90 +531,24 @@ public interface InterventionsPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.stem.interventions.impl.LabelValueTestImpl <em>Label Value Test</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.stem.interventions.impl.LabelValueTestImpl
-		 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getLabelValueTest()
-		 * @generated
-		 */
-		EClass LABEL_VALUE_TEST = eINSTANCE.getLabelValueTest();
-
-		/**
-		 * The meta object literal for the '<em><b>Model Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LABEL_VALUE_TEST__MODEL_NAME = eINSTANCE.getLabelValueTest_ModelName();
-
-		/**
-		 * The meta object literal for the '<em><b>Target URI</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LABEL_VALUE_TEST__TARGET_URI = eINSTANCE.getLabelValueTest_TargetURI();
-
-		/**
-		 * The meta object literal for the '<em><b>State</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LABEL_VALUE_TEST__STATE = eINSTANCE.getLabelValueTest_State();
-
-		/**
-		 * The meta object literal for the '<em><b>Threshold</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LABEL_VALUE_TEST__THRESHOLD = eINSTANCE.getLabelValueTest_Threshold();
-
-		/**
-		 * The meta object literal for the '<em><b>Predicate</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LABEL_VALUE_TEST__PREDICATE = eINSTANCE.getLabelValueTest_Predicate();
-
-		/**
-		 * The meta object literal for the '<em><b>Population Identifier</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute LABEL_VALUE_TEST__POPULATION_IDENTIFIER = eINSTANCE.getLabelValueTest_PopulationIdentifier();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.stem.interventions.impl.ControlLabelImpl <em>Control Label</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.stem.interventions.impl.ControlLabelImpl
-		 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getControlLabel()
-		 * @generated
-		 */
-		EClass CONTROL_LABEL = eINSTANCE.getControlLabel();
-
-		/**
-		 * The meta object literal for the '<em><b>Original Value</b></em>' containment reference feature.
+		 * The meta object literal for the '{@link org.eclipse.stem.interventions.impl.InterventionLabelImpl <em>Intervention Label</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.stem.interventions.impl.InterventionLabelImpl
+		 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getInterventionLabel()
 		 * @generated
 		 */
-		EReference CONTROL_LABEL__ORIGINAL_VALUE = eINSTANCE.getControlLabel_OriginalValue();
+		EClass INTERVENTION_LABEL = eINSTANCE.getInterventionLabel();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.stem.interventions.impl.StandardControlLabelImpl <em>Standard Control Label</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.stem.interventions.impl.StandardInterventionLabelImpl <em>Standard Intervention Label</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.stem.interventions.impl.StandardControlLabelImpl
-		 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getStandardControlLabel()
+		 * @see org.eclipse.stem.interventions.impl.StandardInterventionLabelImpl
+		 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getStandardInterventionLabel()
 		 * @generated
 		 */
-		EClass STANDARD_CONTROL_LABEL = eINSTANCE.getStandardControlLabel();
+		EClass STANDARD_INTERVENTION_LABEL = eINSTANCE.getStandardInterventionLabel();
 
 		/**
 		 * The meta object literal for the '<em><b>Population Identifier</b></em>' attribute feature.
@@ -803,7 +556,7 @@ public interface InterventionsPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute STANDARD_CONTROL_LABEL__POPULATION_IDENTIFIER = eINSTANCE.getStandardControlLabel_PopulationIdentifier();
+		EAttribute STANDARD_INTERVENTION_LABEL__POPULATION_IDENTIFIER = eINSTANCE.getStandardInterventionLabel_PopulationIdentifier();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.stem.interventions.impl.ControlGraphGeneratorImpl <em>Control Graph Generator</em>}' class.
@@ -848,24 +601,24 @@ public interface InterventionsPackage extends EPackage {
 		EAttribute CONTROL_GRAPH_GENERATOR__LOCATION = eINSTANCE.getControlGraphGenerator_Location();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.stem.interventions.impl.ControlLabelValueImpl <em>Control Label Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.stem.interventions.impl.InterventionLabelValueImpl <em>Intervention Label Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.stem.interventions.impl.ControlLabelValueImpl
-		 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getControlLabelValue()
+		 * @see org.eclipse.stem.interventions.impl.InterventionLabelValueImpl
+		 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getInterventionLabelValue()
 		 * @generated
 		 */
-		EClass CONTROL_LABEL_VALUE = eINSTANCE.getControlLabelValue();
+		EClass INTERVENTION_LABEL_VALUE = eINSTANCE.getInterventionLabelValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.stem.interventions.impl.StandardControlLabelValueImpl <em>Standard Control Label Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.stem.interventions.impl.StandardInterventionLabelValueImpl <em>Standard Intervention Label Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.stem.interventions.impl.StandardControlLabelValueImpl
-		 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getStandardControlLabelValue()
+		 * @see org.eclipse.stem.interventions.impl.StandardInterventionLabelValueImpl
+		 * @see org.eclipse.stem.interventions.impl.InterventionsPackageImpl#getStandardInterventionLabelValue()
 		 * @generated
 		 */
-		EClass STANDARD_CONTROL_LABEL_VALUE = eINSTANCE.getStandardControlLabelValue();
+		EClass STANDARD_INTERVENTION_LABEL_VALUE = eINSTANCE.getStandardInterventionLabelValue();
 
 		/**
 		 * The meta object literal for the '<em><b>Vaccinations</b></em>' attribute feature.
@@ -873,7 +626,7 @@ public interface InterventionsPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute STANDARD_CONTROL_LABEL_VALUE__VACCINATIONS = eINSTANCE.getStandardControlLabelValue_Vaccinations();
+		EAttribute STANDARD_INTERVENTION_LABEL_VALUE__VACCINATIONS = eINSTANCE.getStandardInterventionLabelValue_Vaccinations();
 
 		/**
 		 * The meta object literal for the '<em><b>Isolations</b></em>' attribute feature.
@@ -881,7 +634,7 @@ public interface InterventionsPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute STANDARD_CONTROL_LABEL_VALUE__ISOLATIONS = eINSTANCE.getStandardControlLabelValue_Isolations();
+		EAttribute STANDARD_INTERVENTION_LABEL_VALUE__ISOLATIONS = eINSTANCE.getStandardInterventionLabelValue_Isolations();
 
 	}
 
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/LabelValueTest.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/LabelValueTest.java
deleted file mode 100644
index 5ff105a52..000000000
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/LabelValueTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package org.eclipse.stem.interventions;
-
-/******************************************************************************* 
- * Copyright (c) 2011 IBM Corporation and others. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *     IBM Corporation - initial API and implementation 
- *******************************************************************************/
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.stem.core.predicate.Test;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Label Value Test</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.stem.interventions.LabelValueTest#getModelName <em>Model Name</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.LabelValueTest#getTargetURI <em>Target URI</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.LabelValueTest#getState <em>State</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.LabelValueTest#getThreshold <em>Threshold</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.LabelValueTest#getPredicate <em>Predicate</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.LabelValueTest#getPopulationIdentifier <em>Population Identifier</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.stem.interventions.InterventionsPackage#getLabelValueTest()
- * @model
- * @generated
- */
-public interface LabelValueTest extends Test {
-	/**
-	 * Returns the value of the '<em><b>Model Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Model Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Model Name</em>' attribute.
-	 * @see #setModelName(String)
-	 * @see org.eclipse.stem.interventions.InterventionsPackage#getLabelValueTest_ModelName()
-	 * @model
-	 * @generated
-	 */
-	String getModelName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.stem.interventions.LabelValueTest#getModelName <em>Model Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Model Name</em>' attribute.
-	 * @see #getModelName()
-	 * @generated
-	 */
-	void setModelName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Target URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target URI</em>' attribute.
-	 * @see #setTargetURI(URI)
-	 * @see org.eclipse.stem.interventions.InterventionsPackage#getLabelValueTest_TargetURI()
-	 * @model dataType="org.eclipse.stem.core.common.URI"
-	 * @generated
-	 */
-	URI getTargetURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.stem.interventions.LabelValueTest#getTargetURI <em>Target URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target URI</em>' attribute.
-	 * @see #getTargetURI()
-	 * @generated
-	 */
-	void setTargetURI(URI value);
-
-	/**
-	 * Returns the value of the '<em><b>State</b></em>' attribute.
-	 * The default value is <code>"incidence"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>State</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>State</em>' attribute.
-	 * @see #setState(String)
-	 * @see org.eclipse.stem.interventions.InterventionsPackage#getLabelValueTest_State()
-	 * @model default="incidence"
-	 * @generated
-	 */
-	String getState();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.stem.interventions.LabelValueTest#getState <em>State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>State</em>' attribute.
-	 * @see #getState()
-	 * @generated
-	 */
-	void setState(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Threshold</b></em>' attribute.
-	 * The default value is <code>"100"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Threshold</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Threshold</em>' attribute.
-	 * @see #setThreshold(double)
-	 * @see org.eclipse.stem.interventions.InterventionsPackage#getLabelValueTest_Threshold()
-	 * @model default="100"
-	 * @generated
-	 */
-	double getThreshold();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.stem.interventions.LabelValueTest#getThreshold <em>Threshold</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Threshold</em>' attribute.
-	 * @see #getThreshold()
-	 * @generated
-	 */
-	void setThreshold(double value);
-
-	/**
-	 * Returns the value of the '<em><b>Predicate</b></em>' attribute.
-	 * The default value is <code>">"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Predicate</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Predicate</em>' attribute.
-	 * @see #setPredicate(String)
-	 * @see org.eclipse.stem.interventions.InterventionsPackage#getLabelValueTest_Predicate()
-	 * @model default=">"
-	 * @generated
-	 */
-	String getPredicate();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.stem.interventions.LabelValueTest#getPredicate <em>Predicate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Predicate</em>' attribute.
-	 * @see #getPredicate()
-	 * @generated
-	 */
-	void setPredicate(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Population Identifier</b></em>' attribute.
-	 * The default value is <code>"human"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Population Identifier</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Population Identifier</em>' attribute.
-	 * @see #setPopulationIdentifier(String)
-	 * @see org.eclipse.stem.interventions.InterventionsPackage#getLabelValueTest_PopulationIdentifier()
-	 * @model default="human"
-	 * @generated
-	 */
-	String getPopulationIdentifier();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.stem.interventions.LabelValueTest#getPopulationIdentifier <em>Population Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Population Identifier</em>' attribute.
-	 * @see #getPopulationIdentifier()
-	 * @generated
-	 */
-	void setPopulationIdentifier(String value);
-
-} // LabelValueTest
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/StandardControlLabel.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/StandardInterventionLabel.java
index f2fe34545..17b07cb1e 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/StandardControlLabel.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/StandardInterventionLabel.java
@@ -9,22 +9,21 @@ package org.eclipse.stem.interventions;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Standard Control Label</b></em>'.
+ * A representation of the model object '<em><b>Standard Intervention Label</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.stem.interventions.StandardControlLabel#getPopulationIdentifier <em>Population Identifier</em>}</li>
+ *   <li>{@link org.eclipse.stem.interventions.StandardInterventionLabel#getPopulationIdentifier <em>Population Identifier</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.stem.interventions.InterventionsPackage#getStandardControlLabel()
+ * @see org.eclipse.stem.interventions.InterventionsPackage#getStandardInterventionLabel()
  * @model
  * @generated
  */
-public interface StandardControlLabel extends ControlLabel {
-
+public interface StandardInterventionLabel extends InterventionLabel {
 	/**
 	 * Returns the value of the '<em><b>Population Identifier</b></em>' attribute.
 	 * The default value is <code>"human"</code>.
@@ -36,14 +35,14 @@ public interface StandardControlLabel extends ControlLabel {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Population Identifier</em>' attribute.
 	 * @see #setPopulationIdentifier(String)
-	 * @see org.eclipse.stem.interventions.InterventionsPackage#getStandardControlLabel_PopulationIdentifier()
+	 * @see org.eclipse.stem.interventions.InterventionsPackage#getStandardInterventionLabel_PopulationIdentifier()
 	 * @model default="human"
 	 * @generated
 	 */
 	String getPopulationIdentifier();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.stem.interventions.StandardControlLabel#getPopulationIdentifier <em>Population Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.stem.interventions.StandardInterventionLabel#getPopulationIdentifier <em>Population Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Population Identifier</em>' attribute.
@@ -52,4 +51,4 @@ public interface StandardControlLabel extends ControlLabel {
 	 */
 	void setPopulationIdentifier(String value);
 
-} // StandardControlLabel
+} // StandardInterventionLabel
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/StandardControlLabelValue.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/StandardInterventionLabelValue.java
index 95b568bdc..5e7df3ed8 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/StandardControlLabelValue.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/StandardInterventionLabelValue.java
@@ -9,22 +9,22 @@ package org.eclipse.stem.interventions;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Standard Control Label Value</b></em>'.
+ * A representation of the model object '<em><b>Standard Intervention Label Value</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.stem.interventions.StandardControlLabelValue#getVaccinations <em>Vaccinations</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.StandardControlLabelValue#getIsolations <em>Isolations</em>}</li>
+ *   <li>{@link org.eclipse.stem.interventions.StandardInterventionLabelValue#getVaccinations <em>Vaccinations</em>}</li>
+ *   <li>{@link org.eclipse.stem.interventions.StandardInterventionLabelValue#getIsolations <em>Isolations</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.stem.interventions.InterventionsPackage#getStandardControlLabelValue()
+ * @see org.eclipse.stem.interventions.InterventionsPackage#getStandardInterventionLabelValue()
  * @model
  * @generated
  */
-public interface StandardControlLabelValue extends ControlLabelValue {
+public interface StandardInterventionLabelValue extends InterventionLabelValue {
 	/**
 	 * Returns the value of the '<em><b>Vaccinations</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -35,14 +35,14 @@ public interface StandardControlLabelValue extends ControlLabelValue {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Vaccinations</em>' attribute.
 	 * @see #setVaccinations(double)
-	 * @see org.eclipse.stem.interventions.InterventionsPackage#getStandardControlLabelValue_Vaccinations()
+	 * @see org.eclipse.stem.interventions.InterventionsPackage#getStandardInterventionLabelValue_Vaccinations()
 	 * @model
 	 * @generated
 	 */
 	double getVaccinations();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.stem.interventions.StandardControlLabelValue#getVaccinations <em>Vaccinations</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.stem.interventions.StandardInterventionLabelValue#getVaccinations <em>Vaccinations</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Vaccinations</em>' attribute.
@@ -61,14 +61,14 @@ public interface StandardControlLabelValue extends ControlLabelValue {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Isolations</em>' attribute.
 	 * @see #setIsolations(double)
-	 * @see org.eclipse.stem.interventions.InterventionsPackage#getStandardControlLabelValue_Isolations()
+	 * @see org.eclipse.stem.interventions.InterventionsPackage#getStandardInterventionLabelValue_Isolations()
 	 * @model
 	 * @generated
 	 */
 	double getIsolations();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.stem.interventions.StandardControlLabelValue#getIsolations <em>Isolations</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.stem.interventions.StandardInterventionLabelValue#getIsolations <em>Isolations</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Isolations</em>' attribute.
@@ -77,4 +77,4 @@ public interface StandardControlLabelValue extends ControlLabelValue {
 	 */
 	void setIsolations(double value);
 
-} // StandardControlLabelValue
+} // StandardInterventionLabelValue
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlGraphGeneratorImpl.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlGraphGeneratorImpl.java
index 08ee195cc..a71a4daef 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlGraphGeneratorImpl.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlGraphGeneratorImpl.java
@@ -39,8 +39,8 @@ import org.eclipse.stem.graphgenerators.impl.GraphGeneratorImpl;
 import org.eclipse.stem.interventions.ControlGraphGenerator;
 import org.eclipse.stem.interventions.InterventionsFactory;
 import org.eclipse.stem.interventions.InterventionsPackage;
-import org.eclipse.stem.interventions.StandardControlLabel;
-import org.eclipse.stem.interventions.StandardControlLabelValue;
+import org.eclipse.stem.interventions.StandardInterventionLabel;
+import org.eclipse.stem.interventions.StandardInterventionLabelValue;
 
 /**
  * <!-- begin-user-doc -->
@@ -182,8 +182,6 @@ public class ControlGraphGeneratorImpl extends GraphGeneratorImpl implements Con
         SimpleDateFormat formatter = new SimpleDateFormat("E yyyy.MM.dd 'at' hh:mm:ss a zzz");
         String valid = formatter.format(c.getTime());
        	dc.setValid(valid);
-       	// TODO for now, just for testing
-       	// gets ALL common border edges
        	Set<Node> allNodes = LocationUtility.getNodes(project, this.getLocation());
 		
 		Iterator<Node> iter = allNodes.iterator();
@@ -191,17 +189,15 @@ public class ControlGraphGeneratorImpl extends GraphGeneratorImpl implements Con
        	 		Node n = iter.next();
 		
        	 		
-       	 		StandardControlLabel scl = InterventionsFactory.eINSTANCE.createStandardControlLabel();
+       	 		StandardInterventionLabel scl = InterventionsFactory.eINSTANCE.createStandardInterventionLabel();
        	 		
 			
        	 		scl.setURIOfIdentifiableToBeLabeled(n.getURI());
        	 		scl.setPopulationIdentifier(this.getPopulationIdentifier());
        	 		
-       	 		StandardControlLabelValue currentValue = InterventionsFactory.eINSTANCE.createStandardControlLabelValue();
-       	 		StandardControlLabelValue originalValue = InterventionsFactory.eINSTANCE.createStandardControlLabelValue();
+       	 		StandardInterventionLabelValue currentValue = InterventionsFactory.eINSTANCE.createStandardInterventionLabelValue();
    	 		
        	 		scl.setCurrentValue(currentValue);
-       	 		scl.setOriginalValue(originalValue);
        	 		
        	 		// We need to find the population label to get the actual initial number of
        	 		// daily isolations/vaccinations
@@ -216,8 +212,6 @@ public class ControlGraphGeneratorImpl extends GraphGeneratorImpl implements Con
        	 		}
        	 		currentValue.setIsolations(this.getIsolationFraction()*population);
        	 		currentValue.setVaccinations(this.getVaccinationFraction()*population);
-       	 		originalValue.setIsolations(this.getIsolationFraction()*population);
-       	 		originalValue.setVaccinations(this.getVaccinationFraction()*population);
    	 						
 				graph.putNodeLabel(scl);
 		}
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlLabelImpl.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlLabelImpl.java
deleted file mode 100644
index e854f2196..000000000
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlLabelImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.stem.interventions.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.stem.core.graph.LabelValue;
-import org.eclipse.stem.core.graph.impl.NodeLabelImpl;
-import org.eclipse.stem.core.graph.impl.LabelValueImpl;
-
-import org.eclipse.stem.interventions.ControlLabel;
-import org.eclipse.stem.interventions.InterventionsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Control Label</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.stem.interventions.impl.ControlLabelImpl#getOriginalValue <em>Original Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ControlLabelImpl extends NodeLabelImpl implements ControlLabel {
-	/**
-	 * The cached value of the '{@link #getOriginalValue() <em>Original Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOriginalValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected LabelValue originalValue;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ControlLabelImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return InterventionsPackage.Literals.CONTROL_LABEL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabelValue getOriginalValue() {
-		return originalValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOriginalValue(LabelValue newOriginalValue, NotificationChain msgs) {
-		LabelValue oldOriginalValue = originalValue;
-		originalValue = newOriginalValue;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InterventionsPackage.CONTROL_LABEL__ORIGINAL_VALUE, oldOriginalValue, newOriginalValue);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOriginalValue(LabelValue newOriginalValue) {
-		if (newOriginalValue != originalValue) {
-			NotificationChain msgs = null;
-			if (originalValue != null)
-				msgs = ((InternalEObject)originalValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InterventionsPackage.CONTROL_LABEL__ORIGINAL_VALUE, null, msgs);
-			if (newOriginalValue != null)
-				msgs = ((InternalEObject)newOriginalValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InterventionsPackage.CONTROL_LABEL__ORIGINAL_VALUE, null, msgs);
-			msgs = basicSetOriginalValue(newOriginalValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.CONTROL_LABEL__ORIGINAL_VALUE, newOriginalValue, newOriginalValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case InterventionsPackage.CONTROL_LABEL__ORIGINAL_VALUE:
-				return basicSetOriginalValue(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case InterventionsPackage.CONTROL_LABEL__ORIGINAL_VALUE:
-				return getOriginalValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case InterventionsPackage.CONTROL_LABEL__ORIGINAL_VALUE:
-				setOriginalValue((LabelValue)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case InterventionsPackage.CONTROL_LABEL__ORIGINAL_VALUE:
-				setOriginalValue((LabelValue)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case InterventionsPackage.CONTROL_LABEL__ORIGINAL_VALUE:
-				return originalValue != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ControlLabelImpl
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelImpl.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelImpl.java
new file mode 100644
index 000000000..d5e107ff4
--- /dev/null
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelImpl.java
@@ -0,0 +1,45 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.stem.interventions.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.stem.core.graph.impl.StaticNodeLabelImpl;
+
+import org.eclipse.stem.interventions.InterventionLabel;
+import org.eclipse.stem.interventions.InterventionsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Intervention Label</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class InterventionLabelImpl extends StaticNodeLabelImpl implements InterventionLabel {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected InterventionLabelImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return InterventionsPackage.Literals.INTERVENTION_LABEL;
+	}
+
+} //InterventionLabelImpl
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlLabelValueImpl.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelValueImpl.java
index 4edcf358b..bbf75cf65 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/ControlLabelValueImpl.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionLabelValueImpl.java
@@ -6,33 +6,29 @@
  */
 package org.eclipse.stem.interventions.impl;
 
-import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.stem.core.graph.impl.LabelValueImpl;
 
-import org.eclipse.stem.interventions.ControlLabelValue;
+import org.eclipse.stem.interventions.InterventionLabelValue;
 import org.eclipse.stem.interventions.InterventionsPackage;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Control Label Value</b></em>'.
+ * An implementation of the model object '<em><b>Intervention Label Value</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * </p>
  *
  * @generated
  */
-public abstract class ControlLabelValueImpl extends LabelValueImpl implements ControlLabelValue {
+public abstract class InterventionLabelValueImpl extends LabelValueImpl implements InterventionLabelValue {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ControlLabelValueImpl() {
+	protected InterventionLabelValueImpl() {
 		super();
 	}
 
@@ -43,7 +39,7 @@ public abstract class ControlLabelValueImpl extends LabelValueImpl implements Co
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return InterventionsPackage.Literals.CONTROL_LABEL_VALUE;
+		return InterventionsPackage.Literals.INTERVENTION_LABEL_VALUE;
 	}
 
-} //ControlLabelValueImpl
+} //InterventionLabelValueImpl
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsFactoryImpl.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsFactoryImpl.java
index 21fbf96d0..04626036a 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsFactoryImpl.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsFactoryImpl.java
@@ -65,10 +65,9 @@ public class InterventionsFactoryImpl extends EFactoryImpl implements Interventi
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case InterventionsPackage.LABEL_VALUE_TEST: return createLabelValueTest();
-			case InterventionsPackage.STANDARD_CONTROL_LABEL: return createStandardControlLabel();
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL: return createStandardInterventionLabel();
 			case InterventionsPackage.CONTROL_GRAPH_GENERATOR: return createControlGraphGenerator();
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE: return createStandardControlLabelValue();
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE: return createStandardInterventionLabelValue();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -79,19 +78,9 @@ public class InterventionsFactoryImpl extends EFactoryImpl implements Interventi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public LabelValueTest createLabelValueTest() {
-		LabelValueTestImpl labelValueTest = new LabelValueTestImpl();
-		return labelValueTest;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StandardControlLabel createStandardControlLabel() {
-		StandardControlLabelImpl standardControlLabel = new StandardControlLabelImpl();
-		return standardControlLabel;
+	public StandardInterventionLabel createStandardInterventionLabel() {
+		StandardInterventionLabelImpl standardInterventionLabel = new StandardInterventionLabelImpl();
+		return standardInterventionLabel;
 	}
 
 	/**
@@ -109,9 +98,9 @@ public class InterventionsFactoryImpl extends EFactoryImpl implements Interventi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StandardControlLabelValue createStandardControlLabelValue() {
-		StandardControlLabelValueImpl standardControlLabelValue = new StandardControlLabelValueImpl();
-		return standardControlLabelValue;
+	public StandardInterventionLabelValue createStandardInterventionLabelValue() {
+		StandardInterventionLabelValueImpl standardInterventionLabelValue = new StandardInterventionLabelValueImpl();
+		return standardInterventionLabelValue;
 	}
 
 	/**
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsPackageImpl.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsPackageImpl.java
index ce5b2c897..7244beea2 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsPackageImpl.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/InterventionsPackageImpl.java
@@ -37,13 +37,12 @@ import org.eclipse.stem.core.sequencer.SequencerPackage;
 import org.eclipse.stem.core.solver.SolverPackage;
 
 import org.eclipse.stem.interventions.ControlGraphGenerator;
-import org.eclipse.stem.interventions.ControlLabel;
-import org.eclipse.stem.interventions.ControlLabelValue;
+import org.eclipse.stem.interventions.InterventionLabel;
+import org.eclipse.stem.interventions.InterventionLabelValue;
 import org.eclipse.stem.interventions.InterventionsFactory;
 import org.eclipse.stem.interventions.InterventionsPackage;
-import org.eclipse.stem.interventions.LabelValueTest;
-import org.eclipse.stem.interventions.StandardControlLabel;
-import org.eclipse.stem.interventions.StandardControlLabelValue;
+import org.eclipse.stem.interventions.StandardInterventionLabel;
+import org.eclipse.stem.interventions.StandardInterventionLabelValue;
 
 /**
  * <!-- begin-user-doc -->
@@ -57,19 +56,13 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass labelValueTestEClass = null;
+	private EClass interventionLabelEClass = null;
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass controlLabelEClass = null;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass standardControlLabelEClass = null;
+	private EClass standardInterventionLabelEClass = null;
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -81,13 +74,13 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass controlLabelValueEClass = null;
+	private EClass interventionLabelValueEClass = null;
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass standardControlLabelValueEClass = null;
+	private EClass standardInterventionLabelValueEClass = null;
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
 	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
@@ -158,35 +151,8 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getLabelValueTest() {
-		return labelValueTestEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLabelValueTest_ModelName() {
-		return (EAttribute)labelValueTestEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLabelValueTest_TargetURI() {
-		return (EAttribute)labelValueTestEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLabelValueTest_State() {
-		return (EAttribute)labelValueTestEClass.getEStructuralFeatures().get(2);
+	public EClass getInterventionLabel() {
+		return interventionLabelEClass;
 	}
 
 	/**
@@ -194,8 +160,8 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getLabelValueTest_Threshold() {
-		return (EAttribute)labelValueTestEClass.getEStructuralFeatures().get(3);
+	public EClass getStandardInterventionLabel() {
+		return standardInterventionLabelEClass;
 	}
 
 	/**
@@ -203,53 +169,8 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getLabelValueTest_Predicate() {
-		return (EAttribute)labelValueTestEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLabelValueTest_PopulationIdentifier() {
-		return (EAttribute)labelValueTestEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getControlLabel() {
-		return controlLabelEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getControlLabel_OriginalValue() {
-		return (EReference)controlLabelEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getStandardControlLabel() {
-		return standardControlLabelEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getStandardControlLabel_PopulationIdentifier() {
-		return (EAttribute)standardControlLabelEClass.getEStructuralFeatures().get(0);
+	public EAttribute getStandardInterventionLabel_PopulationIdentifier() {
+		return (EAttribute)standardInterventionLabelEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -302,8 +223,8 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getControlLabelValue() {
-		return controlLabelValueEClass;
+	public EClass getInterventionLabelValue() {
+		return interventionLabelValueEClass;
 	}
 
 	/**
@@ -311,8 +232,8 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getStandardControlLabelValue() {
-		return standardControlLabelValueEClass;
+	public EClass getStandardInterventionLabelValue() {
+		return standardInterventionLabelValueEClass;
 	}
 
 	/**
@@ -320,8 +241,8 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getStandardControlLabelValue_Vaccinations() {
-		return (EAttribute)standardControlLabelValueEClass.getEStructuralFeatures().get(0);
+	public EAttribute getStandardInterventionLabelValue_Vaccinations() {
+		return (EAttribute)standardInterventionLabelValueEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -329,8 +250,8 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getStandardControlLabelValue_Isolations() {
-		return (EAttribute)standardControlLabelValueEClass.getEStructuralFeatures().get(1);
+	public EAttribute getStandardInterventionLabelValue_Isolations() {
+		return (EAttribute)standardInterventionLabelValueEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -361,19 +282,10 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 		isCreated = true;
 
 		// Create classes and their features
-		labelValueTestEClass = createEClass(LABEL_VALUE_TEST);
-		createEAttribute(labelValueTestEClass, LABEL_VALUE_TEST__MODEL_NAME);
-		createEAttribute(labelValueTestEClass, LABEL_VALUE_TEST__TARGET_URI);
-		createEAttribute(labelValueTestEClass, LABEL_VALUE_TEST__STATE);
-		createEAttribute(labelValueTestEClass, LABEL_VALUE_TEST__THRESHOLD);
-		createEAttribute(labelValueTestEClass, LABEL_VALUE_TEST__PREDICATE);
-		createEAttribute(labelValueTestEClass, LABEL_VALUE_TEST__POPULATION_IDENTIFIER);
+		interventionLabelEClass = createEClass(INTERVENTION_LABEL);
 
-		controlLabelEClass = createEClass(CONTROL_LABEL);
-		createEReference(controlLabelEClass, CONTROL_LABEL__ORIGINAL_VALUE);
-
-		standardControlLabelEClass = createEClass(STANDARD_CONTROL_LABEL);
-		createEAttribute(standardControlLabelEClass, STANDARD_CONTROL_LABEL__POPULATION_IDENTIFIER);
+		standardInterventionLabelEClass = createEClass(STANDARD_INTERVENTION_LABEL);
+		createEAttribute(standardInterventionLabelEClass, STANDARD_INTERVENTION_LABEL__POPULATION_IDENTIFIER);
 
 		controlGraphGeneratorEClass = createEClass(CONTROL_GRAPH_GENERATOR);
 		createEAttribute(controlGraphGeneratorEClass, CONTROL_GRAPH_GENERATOR__VACCINATION_FRACTION);
@@ -381,11 +293,11 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 		createEAttribute(controlGraphGeneratorEClass, CONTROL_GRAPH_GENERATOR__POPULATION_IDENTIFIER);
 		createEAttribute(controlGraphGeneratorEClass, CONTROL_GRAPH_GENERATOR__LOCATION);
 
-		controlLabelValueEClass = createEClass(CONTROL_LABEL_VALUE);
+		interventionLabelValueEClass = createEClass(INTERVENTION_LABEL_VALUE);
 
-		standardControlLabelValueEClass = createEClass(STANDARD_CONTROL_LABEL_VALUE);
-		createEAttribute(standardControlLabelValueEClass, STANDARD_CONTROL_LABEL_VALUE__VACCINATIONS);
-		createEAttribute(standardControlLabelValueEClass, STANDARD_CONTROL_LABEL_VALUE__ISOLATIONS);
+		standardInterventionLabelValueEClass = createEClass(STANDARD_INTERVENTION_LABEL_VALUE);
+		createEAttribute(standardInterventionLabelValueEClass, STANDARD_INTERVENTION_LABEL_VALUE__VACCINATIONS);
+		createEAttribute(standardInterventionLabelValueEClass, STANDARD_INTERVENTION_LABEL_VALUE__ISOLATIONS);
 	}
 
 	/**
@@ -412,38 +324,27 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		PredicatePackage thePredicatePackage = (PredicatePackage)EPackage.Registry.INSTANCE.getEPackage(PredicatePackage.eNS_URI);
-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
 		GraphPackage theGraphPackage = (GraphPackage)EPackage.Registry.INSTANCE.getEPackage(GraphPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 		GraphgeneratorsPackage theGraphgeneratorsPackage = (GraphgeneratorsPackage)EPackage.Registry.INSTANCE.getEPackage(GraphgeneratorsPackage.eNS_URI);
+		CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
 
 		// Create type parameters
 
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		labelValueTestEClass.getESuperTypes().add(thePredicatePackage.getTest());
-		controlLabelEClass.getESuperTypes().add(theGraphPackage.getNodeLabel());
-		standardControlLabelEClass.getESuperTypes().add(this.getControlLabel());
+		interventionLabelEClass.getESuperTypes().add(theGraphPackage.getStaticNodeLabel());
+		standardInterventionLabelEClass.getESuperTypes().add(this.getInterventionLabel());
 		controlGraphGeneratorEClass.getESuperTypes().add(theGraphgeneratorsPackage.getGraphGenerator());
-		controlLabelValueEClass.getESuperTypes().add(theGraphPackage.getLabelValue());
-		standardControlLabelValueEClass.getESuperTypes().add(this.getControlLabelValue());
+		interventionLabelValueEClass.getESuperTypes().add(theGraphPackage.getLabelValue());
+		standardInterventionLabelValueEClass.getESuperTypes().add(this.getInterventionLabelValue());
 
 		// Initialize classes and features; add operations and parameters
-		initEClass(labelValueTestEClass, LabelValueTest.class, "LabelValueTest", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLabelValueTest_ModelName(), theEcorePackage.getEString(), "modelName", null, 0, 1, LabelValueTest.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLabelValueTest_TargetURI(), theCommonPackage.getURI(), "targetURI", null, 0, 1, LabelValueTest.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLabelValueTest_State(), theEcorePackage.getEString(), "state", "incidence", 0, 1, LabelValueTest.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLabelValueTest_Threshold(), theEcorePackage.getEDouble(), "threshold", "100", 0, 1, LabelValueTest.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLabelValueTest_Predicate(), theEcorePackage.getEString(), "predicate", ">", 0, 1, LabelValueTest.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLabelValueTest_PopulationIdentifier(), theEcorePackage.getEString(), "populationIdentifier", "human", 0, 1, LabelValueTest.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(controlLabelEClass, ControlLabel.class, "ControlLabel", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getControlLabel_OriginalValue(), theGraphPackage.getLabelValue(), null, "originalValue", null, 1, 1, ControlLabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(interventionLabelEClass, InterventionLabel.class, "InterventionLabel", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(standardControlLabelEClass, StandardControlLabel.class, "StandardControlLabel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getStandardControlLabel_PopulationIdentifier(), theEcorePackage.getEString(), "populationIdentifier", "human", 0, 1, StandardControlLabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(standardInterventionLabelEClass, StandardInterventionLabel.class, "StandardInterventionLabel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getStandardInterventionLabel_PopulationIdentifier(), theEcorePackage.getEString(), "populationIdentifier", "human", 0, 1, StandardInterventionLabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(controlGraphGeneratorEClass, ControlGraphGenerator.class, "ControlGraphGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getControlGraphGenerator_VaccinationFraction(), theEcorePackage.getEDouble(), "vaccinationFraction", "0.0", 0, 1, ControlGraphGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -451,11 +352,11 @@ public class InterventionsPackageImpl extends EPackageImpl implements Interventi
 		initEAttribute(getControlGraphGenerator_PopulationIdentifier(), theEcorePackage.getEString(), "populationIdentifier", "human", 0, 1, ControlGraphGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getControlGraphGenerator_Location(), theCommonPackage.getURI(), "location", null, 0, 1, ControlGraphGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(controlLabelValueEClass, ControlLabelValue.class, "ControlLabelValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(interventionLabelValueEClass, InterventionLabelValue.class, "InterventionLabelValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(standardControlLabelValueEClass, StandardControlLabelValue.class, "StandardControlLabelValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getStandardControlLabelValue_Vaccinations(), theEcorePackage.getEDouble(), "vaccinations", null, 0, 1, StandardControlLabelValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getStandardControlLabelValue_Isolations(), theEcorePackage.getEDouble(), "isolations", null, 0, 1, StandardControlLabelValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEClass(standardInterventionLabelValueEClass, StandardInterventionLabelValue.class, "StandardInterventionLabelValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getStandardInterventionLabelValue_Vaccinations(), theEcorePackage.getEDouble(), "vaccinations", null, 0, 1, StandardInterventionLabelValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getStandardInterventionLabelValue_Isolations(), theEcorePackage.getEDouble(), "isolations", null, 0, 1, StandardInterventionLabelValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/LabelValueTestImpl.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/LabelValueTestImpl.java
deleted file mode 100644
index 847ba74e9..000000000
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/LabelValueTestImpl.java
+++ /dev/null
@@ -1,561 +0,0 @@
-package org.eclipse.stem.interventions.impl;
-
-/******************************************************************************* 
- * Copyright (c) 2011 IBM Corporation and others. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *     IBM Corporation - initial API and implementation 
- *******************************************************************************/
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.stem.core.graph.DynamicLabel;
-import org.eclipse.stem.core.graph.Graph;
-import org.eclipse.stem.core.graph.LabelValue;
-import org.eclipse.stem.core.graph.Node;
-import org.eclipse.stem.core.graph.NodeLabel;
-import org.eclipse.stem.core.model.Decorator;
-import org.eclipse.stem.core.model.STEMTime;
-import org.eclipse.stem.core.predicate.impl.TestImpl;
-import org.eclipse.stem.definitions.LocationUtility;
-import org.eclipse.stem.diseasemodels.standard.DiseaseModel;
-import org.eclipse.stem.diseasemodels.standard.DiseaseModelLabel;
-
-import org.eclipse.stem.interventions.InterventionsPackage;
-import org.eclipse.stem.interventions.LabelValueTest;
-import org.eclipse.stem.populationmodels.standard.PopulationModel;
-import org.eclipse.stem.populationmodels.standard.PopulationModelLabel;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Label Value Test</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.stem.interventions.impl.LabelValueTestImpl#getModelName <em>Model Name</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.impl.LabelValueTestImpl#getTargetURI <em>Target URI</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.impl.LabelValueTestImpl#getState <em>State</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.impl.LabelValueTestImpl#getThreshold <em>Threshold</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.impl.LabelValueTestImpl#getPredicate <em>Predicate</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.impl.LabelValueTestImpl#getPopulationIdentifier <em>Population Identifier</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LabelValueTestImpl extends TestImpl implements LabelValueTest {
-	/**
-	 * The default value of the '{@link #getModelName() <em>Model Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getModelName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MODEL_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getModelName() <em>Model Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getModelName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String modelName = MODEL_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTargetURI() <em>Target URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final URI TARGET_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTargetURI() <em>Target URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected URI targetURI = TARGET_URI_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getState() <em>State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getState()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String STATE_EDEFAULT = "incidence";
-
-	/**
-	 * The cached value of the '{@link #getState() <em>State</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getState()
-	 * @generated
-	 * @ordered
-	 */
-	protected String state = STATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getThreshold() <em>Threshold</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getThreshold()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final double THRESHOLD_EDEFAULT = 100.0;
-
-	/**
-	 * The cached value of the '{@link #getThreshold() <em>Threshold</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getThreshold()
-	 * @generated
-	 * @ordered
-	 */
-	protected double threshold = THRESHOLD_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPredicate() <em>Predicate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPredicate()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PREDICATE_EDEFAULT = ">";
-
-	/**
-	 * The cached value of the '{@link #getPredicate() <em>Predicate</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPredicate()
-	 * @generated
-	 * @ordered
-	 */
-	protected String predicate = PREDICATE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPopulationIdentifier() <em>Population Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPopulationIdentifier()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String POPULATION_IDENTIFIER_EDEFAULT = "human";
-
-	/**
-	 * The cached value of the '{@link #getPopulationIdentifier() <em>Population Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPopulationIdentifier()
-	 * @generated
-	 * @ordered
-	 */
-	protected String populationIdentifier = POPULATION_IDENTIFIER_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LabelValueTestImpl() {
-		super();
-	}
-
-	
-	Set<LabelValue> labelValueCache;
-	EAttribute attribute;
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public boolean evaluate(STEMTime time, long timerPeriod, Decorator action, Graph graph) {
-		// First find the region (or set of regions contained) by the targetISOKey
-		
-		if(labelValueCache == null)
-			labelValueCache = this.findLabelValues(graph);
-		
-		if(labelValueCache == null) return false; // Unable to find the disease or other problem
-		double totalCount = 0.0;
-		
-		for(LabelValue currentValue:labelValueCache) {
-			double val = (Double)currentValue.eGet(attribute);
-			totalCount += val;
-		}
-		
-		// Check threshold
-		
-		if(this.getPredicate().equals("=") && totalCount == this.getThreshold())
-			return true;
-		else if(this.getPredicate().equals(">") && totalCount > this.getThreshold())
-			return true;
-		else if(this.getPredicate().equals("<") && totalCount < this.getThreshold())
-			return true;
-		else if(this.getPredicate().equals(">=") && totalCount >= this.getThreshold())
-			return true;
-		else if(this.getPredicate().equals("<=") && totalCount <= this.getThreshold())
-			return true;
-		
-		return false;
-	}
-
-	Set<LabelValue> findLabelValues(Graph graph) {
-		
-		HashSet<LabelValue>  returnValue = new HashSet<LabelValue>();
-		
-		final Node parent = graph.getNode(getTargetURI());
-		Set<Node> children = LocationUtility.getAllChildren(parent);
-		children.add(parent);
-		
-		// Find the matching disease/population model
-		
-		Decorator dec = null;
-		
-		for(Decorator d:graph.getDecorators()) {
-			if(d instanceof DiseaseModel && 
-					((DiseaseModel)d).getDiseaseName().equals(this.getModelName()) ||
-					d instanceof PopulationModel && ((PopulationModel)d).getName().equals(this.getModelName())) { dec = d;break;}
-		}
-		
-		if(dec == null) // Not found
-			return null;
-		
-		// Now find the matching disease label and add up the states 
-			
-		for(Node region:children) {
-			for(NodeLabel label : region.getLabels()) {
-				if(!(label instanceof DynamicLabel)) continue;
-				DynamicLabel dl = (DynamicLabel)label;
-				if(dl.getDecorator().equals(dec) && 
-						(dl instanceof DiseaseModelLabel && ((DiseaseModelLabel)dl).getPopulationModelLabel().getPopulationIdentifier().equals(this.getPopulationIdentifier())) ||
-						(dl instanceof PopulationModelLabel && ((PopulationModelLabel)dl).getPopulationIdentifier().equals(this.getPopulationIdentifier()))) {
-					
-					LabelValue currentValue = dl.getCurrentValue();
-					// Find the matching state
-					for(EAttribute ea:currentValue.eClass().getEAllAttributes()) {
-						EDataType esf =ea.getEAttributeType();
-						if(!esf.getName().equals("EDouble")) continue;
-						if(ea.getName().equals(this.getState())) {
-							if(attribute == null) attribute = ea;
-							returnValue.add(currentValue);
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return returnValue;
-	}
-	
-	
-	/**
-	 * Reset the cache
-	 */
-	
-	@Override
-	public void reset() {
-		this.attribute = null;
-		this.labelValueCache = null;
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return InterventionsPackage.Literals.LABEL_VALUE_TEST;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getModelName() {
-		return modelName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setModelName(String newModelName) {
-		String oldModelName = modelName;
-		modelName = newModelName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.LABEL_VALUE_TEST__MODEL_NAME, oldModelName, modelName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public URI getTargetURI() {
-		return targetURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTargetURI(URI newTargetURI) {
-		URI oldTargetURI = targetURI;
-		targetURI = newTargetURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.LABEL_VALUE_TEST__TARGET_URI, oldTargetURI, targetURI));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getState() {
-		return state;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setState(String newState) {
-		String oldState = state;
-		state = newState;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.LABEL_VALUE_TEST__STATE, oldState, state));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public double getThreshold() {
-		return threshold;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setThreshold(double newThreshold) {
-		double oldThreshold = threshold;
-		threshold = newThreshold;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.LABEL_VALUE_TEST__THRESHOLD, oldThreshold, threshold));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPredicate() {
-		return predicate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPredicate(String newPredicate) {
-		String oldPredicate = predicate;
-		predicate = newPredicate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.LABEL_VALUE_TEST__PREDICATE, oldPredicate, predicate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPopulationIdentifier() {
-		return populationIdentifier;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPopulationIdentifier(String newPopulationIdentifier) {
-		String oldPopulationIdentifier = populationIdentifier;
-		populationIdentifier = newPopulationIdentifier;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.LABEL_VALUE_TEST__POPULATION_IDENTIFIER, oldPopulationIdentifier, populationIdentifier));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case InterventionsPackage.LABEL_VALUE_TEST__MODEL_NAME:
-				return getModelName();
-			case InterventionsPackage.LABEL_VALUE_TEST__TARGET_URI:
-				return getTargetURI();
-			case InterventionsPackage.LABEL_VALUE_TEST__STATE:
-				return getState();
-			case InterventionsPackage.LABEL_VALUE_TEST__THRESHOLD:
-				return getThreshold();
-			case InterventionsPackage.LABEL_VALUE_TEST__PREDICATE:
-				return getPredicate();
-			case InterventionsPackage.LABEL_VALUE_TEST__POPULATION_IDENTIFIER:
-				return getPopulationIdentifier();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case InterventionsPackage.LABEL_VALUE_TEST__MODEL_NAME:
-				setModelName((String)newValue);
-				return;
-			case InterventionsPackage.LABEL_VALUE_TEST__TARGET_URI:
-				setTargetURI((URI)newValue);
-				return;
-			case InterventionsPackage.LABEL_VALUE_TEST__STATE:
-				setState((String)newValue);
-				return;
-			case InterventionsPackage.LABEL_VALUE_TEST__THRESHOLD:
-				setThreshold((Double)newValue);
-				return;
-			case InterventionsPackage.LABEL_VALUE_TEST__PREDICATE:
-				setPredicate((String)newValue);
-				return;
-			case InterventionsPackage.LABEL_VALUE_TEST__POPULATION_IDENTIFIER:
-				setPopulationIdentifier((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case InterventionsPackage.LABEL_VALUE_TEST__MODEL_NAME:
-				setModelName(MODEL_NAME_EDEFAULT);
-				return;
-			case InterventionsPackage.LABEL_VALUE_TEST__TARGET_URI:
-				setTargetURI(TARGET_URI_EDEFAULT);
-				return;
-			case InterventionsPackage.LABEL_VALUE_TEST__STATE:
-				setState(STATE_EDEFAULT);
-				return;
-			case InterventionsPackage.LABEL_VALUE_TEST__THRESHOLD:
-				setThreshold(THRESHOLD_EDEFAULT);
-				return;
-			case InterventionsPackage.LABEL_VALUE_TEST__PREDICATE:
-				setPredicate(PREDICATE_EDEFAULT);
-				return;
-			case InterventionsPackage.LABEL_VALUE_TEST__POPULATION_IDENTIFIER:
-				setPopulationIdentifier(POPULATION_IDENTIFIER_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case InterventionsPackage.LABEL_VALUE_TEST__MODEL_NAME:
-				return MODEL_NAME_EDEFAULT == null ? modelName != null : !MODEL_NAME_EDEFAULT.equals(modelName);
-			case InterventionsPackage.LABEL_VALUE_TEST__TARGET_URI:
-				return TARGET_URI_EDEFAULT == null ? targetURI != null : !TARGET_URI_EDEFAULT.equals(targetURI);
-			case InterventionsPackage.LABEL_VALUE_TEST__STATE:
-				return STATE_EDEFAULT == null ? state != null : !STATE_EDEFAULT.equals(state);
-			case InterventionsPackage.LABEL_VALUE_TEST__THRESHOLD:
-				return threshold != THRESHOLD_EDEFAULT;
-			case InterventionsPackage.LABEL_VALUE_TEST__PREDICATE:
-				return PREDICATE_EDEFAULT == null ? predicate != null : !PREDICATE_EDEFAULT.equals(predicate);
-			case InterventionsPackage.LABEL_VALUE_TEST__POPULATION_IDENTIFIER:
-				return POPULATION_IDENTIFIER_EDEFAULT == null ? populationIdentifier != null : !POPULATION_IDENTIFIER_EDEFAULT.equals(populationIdentifier);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (modelName: ");
-		result.append(modelName);
-		result.append(", targetURI: ");
-		result.append(targetURI);
-		result.append(", state: ");
-		result.append(state);
-		result.append(", threshold: ");
-		result.append(threshold);
-		result.append(", predicate: ");
-		result.append(predicate);
-		result.append(", populationIdentifier: ");
-		result.append(populationIdentifier);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LabelValueTestImpl
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardControlLabelImpl.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelImpl.java
index 72e368f89..c712ee749 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardControlLabelImpl.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelImpl.java
@@ -13,22 +13,22 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 import org.eclipse.stem.interventions.InterventionsPackage;
-import org.eclipse.stem.interventions.StandardControlLabel;
+import org.eclipse.stem.interventions.StandardInterventionLabel;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Standard Control Label</b></em>'.
+ * An implementation of the model object '<em><b>Standard Intervention Label</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.stem.interventions.impl.StandardControlLabelImpl#getPopulationIdentifier <em>Population Identifier</em>}</li>
+ *   <li>{@link org.eclipse.stem.interventions.impl.StandardInterventionLabelImpl#getPopulationIdentifier <em>Population Identifier</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class StandardControlLabelImpl extends ControlLabelImpl implements StandardControlLabel {
+public class StandardInterventionLabelImpl extends InterventionLabelImpl implements StandardInterventionLabel {
 	/**
 	 * The default value of the '{@link #getPopulationIdentifier() <em>Population Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -38,6 +38,7 @@ public class StandardControlLabelImpl extends ControlLabelImpl implements Standa
 	 * @ordered
 	 */
 	protected static final String POPULATION_IDENTIFIER_EDEFAULT = "human";
+
 	/**
 	 * The cached value of the '{@link #getPopulationIdentifier() <em>Population Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -53,7 +54,7 @@ public class StandardControlLabelImpl extends ControlLabelImpl implements Standa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected StandardControlLabelImpl() {
+	protected StandardInterventionLabelImpl() {
 		super();
 	}
 
@@ -64,7 +65,7 @@ public class StandardControlLabelImpl extends ControlLabelImpl implements Standa
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return InterventionsPackage.Literals.STANDARD_CONTROL_LABEL;
+		return InterventionsPackage.Literals.STANDARD_INTERVENTION_LABEL;
 	}
 
 	/**
@@ -85,7 +86,7 @@ public class StandardControlLabelImpl extends ControlLabelImpl implements Standa
 		String oldPopulationIdentifier = populationIdentifier;
 		populationIdentifier = newPopulationIdentifier;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.STANDARD_CONTROL_LABEL__POPULATION_IDENTIFIER, oldPopulationIdentifier, populationIdentifier));
+			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.STANDARD_INTERVENTION_LABEL__POPULATION_IDENTIFIER, oldPopulationIdentifier, populationIdentifier));
 	}
 
 	/**
@@ -96,7 +97,7 @@ public class StandardControlLabelImpl extends ControlLabelImpl implements Standa
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case InterventionsPackage.STANDARD_CONTROL_LABEL__POPULATION_IDENTIFIER:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL__POPULATION_IDENTIFIER:
 				return getPopulationIdentifier();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -110,7 +111,7 @@ public class StandardControlLabelImpl extends ControlLabelImpl implements Standa
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case InterventionsPackage.STANDARD_CONTROL_LABEL__POPULATION_IDENTIFIER:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL__POPULATION_IDENTIFIER:
 				setPopulationIdentifier((String)newValue);
 				return;
 		}
@@ -125,7 +126,7 @@ public class StandardControlLabelImpl extends ControlLabelImpl implements Standa
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case InterventionsPackage.STANDARD_CONTROL_LABEL__POPULATION_IDENTIFIER:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL__POPULATION_IDENTIFIER:
 				setPopulationIdentifier(POPULATION_IDENTIFIER_EDEFAULT);
 				return;
 		}
@@ -140,7 +141,7 @@ public class StandardControlLabelImpl extends ControlLabelImpl implements Standa
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case InterventionsPackage.STANDARD_CONTROL_LABEL__POPULATION_IDENTIFIER:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL__POPULATION_IDENTIFIER:
 				return POPULATION_IDENTIFIER_EDEFAULT == null ? populationIdentifier != null : !POPULATION_IDENTIFIER_EDEFAULT.equals(populationIdentifier);
 		}
 		return super.eIsSet(featureID);
@@ -162,4 +163,4 @@ public class StandardControlLabelImpl extends ControlLabelImpl implements Standa
 		return result.toString();
 	}
 
-} //StandardControlLabelImpl
+} //StandardInterventionLabelImpl
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardControlLabelValueImpl.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelValueImpl.java
index 5348c7f3c..533142a6a 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardControlLabelValueImpl.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/impl/StandardInterventionLabelValueImpl.java
@@ -13,23 +13,23 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 import org.eclipse.stem.interventions.InterventionsPackage;
-import org.eclipse.stem.interventions.StandardControlLabelValue;
+import org.eclipse.stem.interventions.StandardInterventionLabelValue;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Standard Control Label Value</b></em>'.
+ * An implementation of the model object '<em><b>Standard Intervention Label Value</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.stem.interventions.impl.StandardControlLabelValueImpl#getVaccinations <em>Vaccinations</em>}</li>
- *   <li>{@link org.eclipse.stem.interventions.impl.StandardControlLabelValueImpl#getIsolations <em>Isolations</em>}</li>
+ *   <li>{@link org.eclipse.stem.interventions.impl.StandardInterventionLabelValueImpl#getVaccinations <em>Vaccinations</em>}</li>
+ *   <li>{@link org.eclipse.stem.interventions.impl.StandardInterventionLabelValueImpl#getIsolations <em>Isolations</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class StandardControlLabelValueImpl extends ControlLabelValueImpl implements StandardControlLabelValue {
+public class StandardInterventionLabelValueImpl extends InterventionLabelValueImpl implements StandardInterventionLabelValue {
 	/**
 	 * The default value of the '{@link #getVaccinations() <em>Vaccinations</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -75,7 +75,7 @@ public class StandardControlLabelValueImpl extends ControlLabelValueImpl impleme
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected StandardControlLabelValueImpl() {
+	protected StandardInterventionLabelValueImpl() {
 		super();
 	}
 
@@ -86,7 +86,7 @@ public class StandardControlLabelValueImpl extends ControlLabelValueImpl impleme
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return InterventionsPackage.Literals.STANDARD_CONTROL_LABEL_VALUE;
+		return InterventionsPackage.Literals.STANDARD_INTERVENTION_LABEL_VALUE;
 	}
 
 	/**
@@ -107,7 +107,7 @@ public class StandardControlLabelValueImpl extends ControlLabelValueImpl impleme
 		double oldVaccinations = vaccinations;
 		vaccinations = newVaccinations;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__VACCINATIONS, oldVaccinations, vaccinations));
+			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__VACCINATIONS, oldVaccinations, vaccinations));
 	}
 
 	/**
@@ -128,7 +128,7 @@ public class StandardControlLabelValueImpl extends ControlLabelValueImpl impleme
 		double oldIsolations = isolations;
 		isolations = newIsolations;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__ISOLATIONS, oldIsolations, isolations));
+			eNotify(new ENotificationImpl(this, Notification.SET, InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__ISOLATIONS, oldIsolations, isolations));
 	}
 
 	/**
@@ -139,9 +139,9 @@ public class StandardControlLabelValueImpl extends ControlLabelValueImpl impleme
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__VACCINATIONS:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__VACCINATIONS:
 				return getVaccinations();
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__ISOLATIONS:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__ISOLATIONS:
 				return getIsolations();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -155,10 +155,10 @@ public class StandardControlLabelValueImpl extends ControlLabelValueImpl impleme
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__VACCINATIONS:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__VACCINATIONS:
 				setVaccinations((Double)newValue);
 				return;
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__ISOLATIONS:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__ISOLATIONS:
 				setIsolations((Double)newValue);
 				return;
 		}
@@ -173,10 +173,10 @@ public class StandardControlLabelValueImpl extends ControlLabelValueImpl impleme
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__VACCINATIONS:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__VACCINATIONS:
 				setVaccinations(VACCINATIONS_EDEFAULT);
 				return;
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__ISOLATIONS:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__ISOLATIONS:
 				setIsolations(ISOLATIONS_EDEFAULT);
 				return;
 		}
@@ -191,9 +191,9 @@ public class StandardControlLabelValueImpl extends ControlLabelValueImpl impleme
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__VACCINATIONS:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__VACCINATIONS:
 				return vaccinations != VACCINATIONS_EDEFAULT;
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__ISOLATIONS:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__ISOLATIONS:
 				return isolations != ISOLATIONS_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
@@ -217,4 +217,4 @@ public class StandardControlLabelValueImpl extends ControlLabelValueImpl impleme
 		return result.toString();
 	}
 
-} //StandardControlLabelValueImpl
+} //StandardInterventionLabelValueImpl
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/ControlLabelItemProvider.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelItemProvider.java
index bc87616ef..e5d507b0e 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/ControlLabelItemProvider.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelItemProvider.java
@@ -14,10 +14,8 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -25,20 +23,18 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.stem.core.graph.provider.NodeLabelItemProvider;
-import org.eclipse.stem.interventions.ControlLabel;
-import org.eclipse.stem.interventions.InterventionsPackage;
-import org.eclipse.stem.core.graph.provider.LabelValueItemProvider;
+import org.eclipse.stem.core.graph.provider.StaticNodeLabelItemProvider;
+
+import org.eclipse.stem.interventions.InterventionLabel;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.stem.interventions.ControlLabel} object.
+ * This is the item provider adapter for a {@link org.eclipse.stem.interventions.InterventionLabel} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class ControlLabelItemProvider
-	extends NodeLabelItemProvider
+public class InterventionLabelItemProvider
+	extends StaticNodeLabelItemProvider
 	implements
 		IEditingDomainItemProvider,
 		IStructuredItemContentProvider,
@@ -51,7 +47,7 @@ public class ControlLabelItemProvider
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ControlLabelItemProvider(AdapterFactory adapterFactory) {
+	public InterventionLabelItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -71,36 +67,6 @@ public class ControlLabelItemProvider
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(InterventionsPackage.Literals.CONTROL_LABEL__ORIGINAL_VALUE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -118,11 +84,11 @@ public class ControlLabelItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		URI labelValue = ((ControlLabel)object).getURI();
+		URI labelValue = ((InterventionLabel)object).getURI();
 		String label = labelValue == null ? null : labelValue.toString();
 		return label == null || label.length() == 0 ?
-			getString("_UI_ControlLabel_type") :
-			getString("_UI_ControlLabel_type") + " " + label;
+			getString("_UI_InterventionLabel_type") :
+			getString("_UI_InterventionLabel_type") + " " + label;
 	}
 
 	/**
@@ -135,12 +101,6 @@ public class ControlLabelItemProvider
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(ControlLabel.class)) {
-			case InterventionsPackage.CONTROL_LABEL__ORIGINAL_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
 		super.notifyChanged(notification);
 	}
 
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/ControlLabelValueItemProvider.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelValueItemProvider.java
index 4324232c7..228c6e0a5 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/ControlLabelValueItemProvider.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionLabelValueItemProvider.java
@@ -15,28 +15,22 @@ import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.common.util.ResourceLocator;
 
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.stem.core.graph.provider.LabelValueItemProvider;
 
-import org.eclipse.stem.interventions.ControlLabelValue;
-import org.eclipse.stem.interventions.InterventionsPackage;
-
 /**
- * This is the item provider adapter for a {@link org.eclipse.stem.interventions.ControlLabelValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.stem.interventions.InterventionLabelValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class ControlLabelValueItemProvider
+public class InterventionLabelValueItemProvider
 	extends LabelValueItemProvider
 	implements
 		IEditingDomainItemProvider,
@@ -50,7 +44,7 @@ public class ControlLabelValueItemProvider
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ControlLabelValueItemProvider(AdapterFactory adapterFactory) {
+	public InterventionLabelValueItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -87,7 +81,7 @@ public class ControlLabelValueItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_ControlLabelValue_type");
+		return getString("_UI_InterventionLabelValue_type");
 	}
 
 	/**
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsItemProviderAdapterFactory.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsItemProviderAdapterFactory.java
index 8f5bf4108..455522ca9 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsItemProviderAdapterFactory.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/InterventionsItemProviderAdapterFactory.java
@@ -100,49 +100,26 @@ public class InterventionsItemProviderAdapterFactory extends InterventionsAdapte
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.stem.interventions.LabelValueTest} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.stem.interventions.StandardInterventionLabel} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected LabelValueTestItemProvider labelValueTestItemProvider;
+	protected StandardInterventionLabelItemProvider standardInterventionLabelItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.stem.interventions.LabelValueTest}.
+	 * This creates an adapter for a {@link org.eclipse.stem.interventions.StandardInterventionLabel}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	public Adapter createLabelValueTestAdapter() {
-		if (labelValueTestItemProvider == null) {
-			labelValueTestItemProvider = new LabelValueTestItemProvider(this);
+	public Adapter createStandardInterventionLabelAdapter() {
+		if (standardInterventionLabelItemProvider == null) {
+			standardInterventionLabelItemProvider = new StandardInterventionLabelItemProvider(this);
 		}
 
-		return labelValueTestItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.stem.interventions.StandardControlLabel} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StandardControlLabelItemProvider standardControlLabelItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.stem.interventions.StandardControlLabel}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createStandardControlLabelAdapter() {
-		if (standardControlLabelItemProvider == null) {
-			standardControlLabelItemProvider = new StandardControlLabelItemProvider(this);
-		}
-
-		return standardControlLabelItemProvider;
+		return standardInterventionLabelItemProvider;
 	}
 
 	/**
@@ -169,26 +146,26 @@ public class InterventionsItemProviderAdapterFactory extends InterventionsAdapte
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.stem.interventions.StandardControlLabelValue} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.stem.interventions.StandardInterventionLabelValue} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected StandardControlLabelValueItemProvider standardControlLabelValueItemProvider;
+	protected StandardInterventionLabelValueItemProvider standardInterventionLabelValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.stem.interventions.StandardControlLabelValue}.
+	 * This creates an adapter for a {@link org.eclipse.stem.interventions.StandardInterventionLabelValue}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	public Adapter createStandardControlLabelValueAdapter() {
-		if (standardControlLabelValueItemProvider == null) {
-			standardControlLabelValueItemProvider = new StandardControlLabelValueItemProvider(this);
+	public Adapter createStandardInterventionLabelValueAdapter() {
+		if (standardInterventionLabelValueItemProvider == null) {
+			standardInterventionLabelValueItemProvider = new StandardInterventionLabelValueItemProvider(this);
 		}
 
-		return standardControlLabelValueItemProvider;
+		return standardInterventionLabelValueItemProvider;
 	}
 
 	/**
@@ -290,127 +267,9 @@ public class InterventionsItemProviderAdapterFactory extends InterventionsAdapte
 	 * @generated
 	 */
 	public void dispose() {
-		if (labelValueTestItemProvider != null) labelValueTestItemProvider.dispose();
-		if (standardControlLabelItemProvider != null) standardControlLabelItemProvider.dispose();
+		if (standardInterventionLabelItemProvider != null) standardInterventionLabelItemProvider.dispose();
 		if (controlGraphGeneratorItemProvider != null) controlGraphGeneratorItemProvider.dispose();
-		if (standardControlLabelValueItemProvider != null) standardControlLabelValueItemProvider.dispose();
-	}
-
-	/**
-	 * A child creation extender for the {@link PredicatePackage}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static class PredicateChildCreationExtender implements IChildCreationExtender {
-		/**
-		 * The switch for creating child descriptors specific to each extended class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		protected static class CreationSwitch extends PredicateSwitch<Object> {
-			/**
-			 * The child descriptors being populated.
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			protected List<Object> newChildDescriptors;
-
-			/**
-			 * The domain in which to create the children.
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			protected EditingDomain editingDomain;
-
-			/**
-			 * Creates the a switch for populating child descriptors in the given domain.
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
-				this.newChildDescriptors = newChildDescriptors;
-				this.editingDomain = editingDomain;
-			}
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			@Override
-			public Object caseNaryBooleanOperator(NaryBooleanOperator object) {
-				newChildDescriptors.add
-					(createChildParameter
-						(PredicatePackage.Literals.NARY_BOOLEAN_OPERATOR__OPERANDS,
-						 InterventionsFactory.eINSTANCE.createLabelValueTest()));
-
-				return null;
-			}
- 
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			@Override
-			public Object caseUnaryBooleanOperator(UnaryBooleanOperator object) {
-				newChildDescriptors.add
-					(createChildParameter
-						(PredicatePackage.Literals.UNARY_BOOLEAN_OPERATOR__OPERAND,
-						 InterventionsFactory.eINSTANCE.createLabelValueTest()));
-
-				return null;
-			}
- 
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			@Override
-			public Object casePredicateExpression(PredicateExpression object) {
-				newChildDescriptors.add
-					(createChildParameter
-						(PredicatePackage.Literals.PREDICATE_EXPRESSION__PREDICATE,
-						 InterventionsFactory.eINSTANCE.createLabelValueTest()));
-
-				return null;
-			}
- 
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			protected CommandParameter createChildParameter(Object feature, Object child) {
-				return new CommandParameter(null, feature, child);
-			}
-
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
-			ArrayList<Object> result = new ArrayList<Object>();
-		   new CreationSwitch(result, editingDomain).doSwitch((EObject)object);
-		   return result;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public ResourceLocator getResourceLocator() {
-			return InterventionsEditPlugin.INSTANCE;
-		}
+		if (standardInterventionLabelValueItemProvider != null) standardInterventionLabelValueItemProvider.dispose();
 	}
 
 }
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/LabelValueTestItemProvider.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/LabelValueTestItemProvider.java
deleted file mode 100644
index 9d1870c9a..000000000
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/LabelValueTestItemProvider.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package org.eclipse.stem.interventions.provider;
-
-/******************************************************************************* 
- * Copyright (c) 2011 IBM Corporation and others. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *     IBM Corporation - initial API and implementation 
- *******************************************************************************/
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.stem.core.predicate.provider.TestItemProvider;
-
-import org.eclipse.stem.interventions.InterventionsPackage;
-import org.eclipse.stem.interventions.LabelValueTest;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.stem.interventions.LabelValueTest} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LabelValueTestItemProvider
-	extends TestItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabelValueTestItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addModelNamePropertyDescriptor(object);
-			addTargetURIPropertyDescriptor(object);
-			addStatePropertyDescriptor(object);
-			addThresholdPropertyDescriptor(object);
-			addPredicatePropertyDescriptor(object);
-			addPopulationIdentifierPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Model Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addModelNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LabelValueTest_modelName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LabelValueTest_modelName_feature", "_UI_LabelValueTest_type"),
-				 InterventionsPackage.Literals.LABEL_VALUE_TEST__MODEL_NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Target URI feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTargetURIPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LabelValueTest_targetURI_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LabelValueTest_targetURI_feature", "_UI_LabelValueTest_type"),
-				 InterventionsPackage.Literals.LABEL_VALUE_TEST__TARGET_URI,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the State feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addStatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LabelValueTest_state_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LabelValueTest_state_feature", "_UI_LabelValueTest_type"),
-				 InterventionsPackage.Literals.LABEL_VALUE_TEST__STATE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Threshold feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addThresholdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LabelValueTest_threshold_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LabelValueTest_threshold_feature", "_UI_LabelValueTest_type"),
-				 InterventionsPackage.Literals.LABEL_VALUE_TEST__THRESHOLD,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Predicate feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPredicatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LabelValueTest_predicate_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LabelValueTest_predicate_feature", "_UI_LabelValueTest_type"),
-				 InterventionsPackage.Literals.LABEL_VALUE_TEST__PREDICATE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Population Identifier feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPopulationIdentifierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LabelValueTest_populationIdentifier_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LabelValueTest_populationIdentifier_feature", "_UI_LabelValueTest_type"),
-				 InterventionsPackage.Literals.LABEL_VALUE_TEST__POPULATION_IDENTIFIER,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean hasChildren(Object object) {
-		return hasChildren(object, true);
-	}
-
-	/**
-	 * This returns LabelValueTest.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelValueTest"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((LabelValueTest)object).getModelName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_LabelValueTest_type") :
-			getString("_UI_LabelValueTest_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(LabelValueTest.class)) {
-			case InterventionsPackage.LABEL_VALUE_TEST__MODEL_NAME:
-			case InterventionsPackage.LABEL_VALUE_TEST__TARGET_URI:
-			case InterventionsPackage.LABEL_VALUE_TEST__STATE:
-			case InterventionsPackage.LABEL_VALUE_TEST__THRESHOLD:
-			case InterventionsPackage.LABEL_VALUE_TEST__PREDICATE:
-			case InterventionsPackage.LABEL_VALUE_TEST__POPULATION_IDENTIFIER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return InterventionsEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardControlLabelItemProvider.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelItemProvider.java
index afe8ca568..cd481f05e 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardControlLabelItemProvider.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelItemProvider.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.common.util.URI;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,16 +26,16 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.stem.interventions.InterventionsPackage;
-import org.eclipse.stem.interventions.StandardControlLabel;
+import org.eclipse.stem.interventions.StandardInterventionLabel;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.stem.interventions.StandardControlLabel} object.
+ * This is the item provider adapter for a {@link org.eclipse.stem.interventions.StandardInterventionLabel} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class StandardControlLabelItemProvider
-	extends ControlLabelItemProvider
+public class StandardInterventionLabelItemProvider
+	extends InterventionLabelItemProvider
 	implements
 		IEditingDomainItemProvider,
 		IStructuredItemContentProvider,
@@ -47,7 +48,7 @@ public class StandardControlLabelItemProvider
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StandardControlLabelItemProvider(AdapterFactory adapterFactory) {
+	public StandardInterventionLabelItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -78,9 +79,9 @@ public class StandardControlLabelItemProvider
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_StandardControlLabel_populationIdentifier_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_StandardControlLabel_populationIdentifier_feature", "_UI_StandardControlLabel_type"),
-				 InterventionsPackage.Literals.STANDARD_CONTROL_LABEL__POPULATION_IDENTIFIER,
+				 getString("_UI_StandardInterventionLabel_populationIdentifier_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_StandardInterventionLabel_populationIdentifier_feature", "_UI_StandardInterventionLabel_type"),
+				 InterventionsPackage.Literals.STANDARD_INTERVENTION_LABEL__POPULATION_IDENTIFIER,
 				 true,
 				 false,
 				 false,
@@ -90,14 +91,14 @@ public class StandardControlLabelItemProvider
 	}
 
 	/**
-	 * This returns StandardControlLabel.gif.
+	 * This returns StandardInterventionLabel.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StandardControlLabel"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StandardInterventionLabel"));
 	}
 
 	/**
@@ -108,11 +109,11 @@ public class StandardControlLabelItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		URI labelValue = ((StandardControlLabel)object).getURI();
+		URI labelValue = ((StandardInterventionLabel)object).getURI();
 		String label = labelValue == null ? null : labelValue.toString();
 		return label == null || label.length() == 0 ?
-			getString("_UI_StandardControlLabel_type") :
-			getString("_UI_StandardControlLabel_type") + " " + label;
+			getString("_UI_StandardInterventionLabel_type") :
+			getString("_UI_StandardInterventionLabel_type") + " " + label;
 	}
 
 	/**
@@ -126,8 +127,8 @@ public class StandardControlLabelItemProvider
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(StandardControlLabel.class)) {
-			case InterventionsPackage.STANDARD_CONTROL_LABEL__POPULATION_IDENTIFIER:
+		switch (notification.getFeatureID(StandardInterventionLabel.class)) {
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL__POPULATION_IDENTIFIER:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardControlLabelValueItemProvider.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelValueItemProvider.java
index 4e8415574..4c75e86ea 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardControlLabelValueItemProvider.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/provider/StandardInterventionLabelValueItemProvider.java
@@ -24,16 +24,16 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.stem.interventions.InterventionsPackage;
-import org.eclipse.stem.interventions.StandardControlLabelValue;
+import org.eclipse.stem.interventions.StandardInterventionLabelValue;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.stem.interventions.StandardControlLabelValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.stem.interventions.StandardInterventionLabelValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class StandardControlLabelValueItemProvider
-	extends ControlLabelValueItemProvider
+public class StandardInterventionLabelValueItemProvider
+	extends InterventionLabelValueItemProvider
 	implements
 		IEditingDomainItemProvider,
 		IStructuredItemContentProvider,
@@ -46,7 +46,7 @@ public class StandardControlLabelValueItemProvider
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StandardControlLabelValueItemProvider(AdapterFactory adapterFactory) {
+	public StandardInterventionLabelValueItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -78,9 +78,9 @@ public class StandardControlLabelValueItemProvider
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_StandardControlLabelValue_vaccinations_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_StandardControlLabelValue_vaccinations_feature", "_UI_StandardControlLabelValue_type"),
-				 InterventionsPackage.Literals.STANDARD_CONTROL_LABEL_VALUE__VACCINATIONS,
+				 getString("_UI_StandardInterventionLabelValue_vaccinations_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_StandardInterventionLabelValue_vaccinations_feature", "_UI_StandardInterventionLabelValue_type"),
+				 InterventionsPackage.Literals.STANDARD_INTERVENTION_LABEL_VALUE__VACCINATIONS,
 				 true,
 				 false,
 				 false,
@@ -100,9 +100,9 @@ public class StandardControlLabelValueItemProvider
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_StandardControlLabelValue_isolations_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_StandardControlLabelValue_isolations_feature", "_UI_StandardControlLabelValue_type"),
-				 InterventionsPackage.Literals.STANDARD_CONTROL_LABEL_VALUE__ISOLATIONS,
+				 getString("_UI_StandardInterventionLabelValue_isolations_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_StandardInterventionLabelValue_isolations_feature", "_UI_StandardInterventionLabelValue_type"),
+				 InterventionsPackage.Literals.STANDARD_INTERVENTION_LABEL_VALUE__ISOLATIONS,
 				 true,
 				 false,
 				 false,
@@ -112,14 +112,14 @@ public class StandardControlLabelValueItemProvider
 	}
 
 	/**
-	 * This returns StandardControlLabelValue.gif.
+	 * This returns StandardInterventionLabelValue.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StandardControlLabelValue"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StandardInterventionLabelValue"));
 	}
 
 	/**
@@ -130,8 +130,8 @@ public class StandardControlLabelValueItemProvider
 	 */
 	@Override
 	public String getText(Object object) {
-		StandardControlLabelValue standardControlLabelValue = (StandardControlLabelValue)object;
-		return getString("_UI_StandardControlLabelValue_type") + " " + standardControlLabelValue.getVaccinations();
+		StandardInterventionLabelValue standardInterventionLabelValue = (StandardInterventionLabelValue)object;
+		return getString("_UI_StandardInterventionLabelValue_type") + " " + standardInterventionLabelValue.getVaccinations();
 	}
 
 	/**
@@ -145,9 +145,9 @@ public class StandardControlLabelValueItemProvider
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(StandardControlLabelValue.class)) {
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__VACCINATIONS:
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE__ISOLATIONS:
+		switch (notification.getFeatureID(StandardInterventionLabelValue.class)) {
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__VACCINATIONS:
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE__ISOLATIONS:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsAdapterFactory.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsAdapterFactory.java
index c84b3c719..1e707471d 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsAdapterFactory.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsAdapterFactory.java
@@ -23,6 +23,9 @@ import org.eclipse.stem.core.common.SanityChecker;
 import org.eclipse.stem.core.graph.Label;
 import org.eclipse.stem.core.graph.LabelValue;
 import org.eclipse.stem.core.graph.NodeLabel;
+import org.eclipse.stem.core.graph.StaticLabel;
+import org.eclipse.stem.core.graph.StaticNodeLabel;
+import org.eclipse.stem.core.modifier.Modifiable;
 import org.eclipse.stem.core.predicate.Predicate;
 import org.eclipse.stem.core.predicate.Test;
 
@@ -86,36 +89,24 @@ public class InterventionsAdapterFactory extends AdapterFactoryImpl {
 	protected InterventionsSwitch<Adapter> modelSwitch =
 		new InterventionsSwitch<Adapter>() {
 			@Override
-			public Adapter caseLabelValueTest(LabelValueTest object) {
-				return createLabelValueTestAdapter();
+			public Adapter caseInterventionLabel(InterventionLabel object) {
+				return createInterventionLabelAdapter();
 			}
 			@Override
-			public Adapter caseControlLabel(ControlLabel object) {
-				return createControlLabelAdapter();
-			}
-			@Override
-			public Adapter caseStandardControlLabel(StandardControlLabel object) {
-				return createStandardControlLabelAdapter();
+			public Adapter caseStandardInterventionLabel(StandardInterventionLabel object) {
+				return createStandardInterventionLabelAdapter();
 			}
 			@Override
 			public Adapter caseControlGraphGenerator(ControlGraphGenerator object) {
 				return createControlGraphGeneratorAdapter();
 			}
 			@Override
-			public Adapter caseControlLabelValue(ControlLabelValue object) {
-				return createControlLabelValueAdapter();
-			}
-			@Override
-			public Adapter caseStandardControlLabelValue(StandardControlLabelValue object) {
-				return createStandardControlLabelValueAdapter();
+			public Adapter caseInterventionLabelValue(InterventionLabelValue object) {
+				return createInterventionLabelValueAdapter();
 			}
 			@Override
-			public Adapter casePredicate(Predicate object) {
-				return createPredicateAdapter();
-			}
-			@Override
-			public Adapter caseTest(Test object) {
-				return createTestAdapter();
+			public Adapter caseStandardInterventionLabelValue(StandardInterventionLabelValue object) {
+				return createStandardInterventionLabelValueAdapter();
 			}
 			@Override
 			public <T> Adapter caseComparable(Comparable<T> object) {
@@ -134,6 +125,18 @@ public class InterventionsAdapterFactory extends AdapterFactoryImpl {
 				return createNodeLabelAdapter();
 			}
 			@Override
+			public Adapter caseModifiable(Modifiable object) {
+				return createModifiableAdapter();
+			}
+			@Override
+			public Adapter caseStaticLabel(StaticLabel object) {
+				return createStaticLabelAdapter();
+			}
+			@Override
+			public Adapter caseStaticNodeLabel(StaticNodeLabel object) {
+				return createStaticNodeLabelAdapter();
+			}
+			@Override
 			public Adapter caseGraphGenerator(GraphGenerator object) {
 				return createGraphGeneratorAdapter();
 			}
@@ -166,198 +169,198 @@ public class InterventionsAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.interventions.LabelValueTest <em>Label Value Test</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.interventions.InterventionLabel <em>Intervention Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.interventions.LabelValueTest
+	 * @see org.eclipse.stem.interventions.InterventionLabel
 	 * @generated
 	 */
-	public Adapter createLabelValueTestAdapter() {
+	public Adapter createInterventionLabelAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.interventions.ControlLabel <em>Control Label</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.interventions.StandardInterventionLabel <em>Standard Intervention Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.interventions.ControlLabel
+	 * @see org.eclipse.stem.interventions.StandardInterventionLabel
 	 * @generated
 	 */
-	public Adapter createControlLabelAdapter() {
+	public Adapter createStandardInterventionLabelAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.interventions.StandardControlLabel <em>Standard Control Label</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.interventions.ControlGraphGenerator <em>Control Graph Generator</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.interventions.StandardControlLabel
+	 * @see org.eclipse.stem.interventions.ControlGraphGenerator
 	 * @generated
 	 */
-	public Adapter createStandardControlLabelAdapter() {
+	public Adapter createControlGraphGeneratorAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.interventions.ControlGraphGenerator <em>Control Graph Generator</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.interventions.InterventionLabelValue <em>Intervention Label Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.interventions.ControlGraphGenerator
+	 * @see org.eclipse.stem.interventions.InterventionLabelValue
 	 * @generated
 	 */
-	public Adapter createControlGraphGeneratorAdapter() {
+	public Adapter createInterventionLabelValueAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.interventions.ControlLabelValue <em>Control Label Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.interventions.StandardInterventionLabelValue <em>Standard Intervention Label Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.interventions.ControlLabelValue
+	 * @see org.eclipse.stem.interventions.StandardInterventionLabelValue
 	 * @generated
 	 */
-	public Adapter createControlLabelValueAdapter() {
+	public Adapter createStandardInterventionLabelValueAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.interventions.StandardControlLabelValue <em>Standard Control Label Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.common.SanityChecker <em>Sanity Checker</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.interventions.StandardControlLabelValue
+	 * @see org.eclipse.stem.core.common.SanityChecker
 	 * @generated
 	 */
-	public Adapter createStandardControlLabelValueAdapter() {
+	public Adapter createSanityCheckerAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.predicate.Predicate <em>Predicate</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.graph.LabelValue <em>Label Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.core.predicate.Predicate
+	 * @see org.eclipse.stem.core.graph.LabelValue
 	 * @generated
 	 */
-	public Adapter createPredicateAdapter() {
+	public Adapter createLabelValueAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.predicate.Test <em>Test</em>}'.
+	 * Creates a new adapter for an object of class '{@link java.lang.Comparable <em>Comparable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.core.predicate.Test
+	 * @see java.lang.Comparable
 	 * @generated
 	 */
-	public Adapter createTestAdapter() {
+	public Adapter createComparableAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.common.SanityChecker <em>Sanity Checker</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.common.Identifiable <em>Identifiable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.core.common.SanityChecker
+	 * @see org.eclipse.stem.core.common.Identifiable
 	 * @generated
 	 */
-	public Adapter createSanityCheckerAdapter() {
+	public Adapter createIdentifiableAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.graph.LabelValue <em>Label Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.graph.Label <em>Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.core.graph.LabelValue
+	 * @see org.eclipse.stem.core.graph.Label
 	 * @generated
 	 */
-	public Adapter createLabelValueAdapter() {
+	public Adapter createLabelAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link java.lang.Comparable <em>Comparable</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.graph.NodeLabel <em>Node Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see java.lang.Comparable
+	 * @see org.eclipse.stem.core.graph.NodeLabel
 	 * @generated
 	 */
-	public Adapter createComparableAdapter() {
+	public Adapter createNodeLabelAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.common.Identifiable <em>Identifiable</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.modifier.Modifiable <em>Modifiable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.core.common.Identifiable
+	 * @see org.eclipse.stem.core.modifier.Modifiable
 	 * @generated
 	 */
-	public Adapter createIdentifiableAdapter() {
+	public Adapter createModifiableAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.graph.Label <em>Label</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.graph.StaticLabel <em>Static Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.core.graph.Label
+	 * @see org.eclipse.stem.core.graph.StaticLabel
 	 * @generated
 	 */
-	public Adapter createLabelAdapter() {
+	public Adapter createStaticLabelAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.graph.NodeLabel <em>Node Label</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.stem.core.graph.StaticNodeLabel <em>Static Node Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.stem.core.graph.NodeLabel
+	 * @see org.eclipse.stem.core.graph.StaticNodeLabel
 	 * @generated
 	 */
-	public Adapter createNodeLabelAdapter() {
+	public Adapter createStaticNodeLabelAdapter() {
 		return null;
 	}
 
diff --git a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsSwitch.java b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsSwitch.java
index bd17751db..bab19f806 100644
--- a/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsSwitch.java
+++ b/org.eclipse.stem.interventions/src/org/eclipse/stem/interventions/util/InterventionsSwitch.java
@@ -21,6 +21,9 @@ import org.eclipse.stem.core.common.SanityChecker;
 import org.eclipse.stem.core.graph.Label;
 import org.eclipse.stem.core.graph.LabelValue;
 import org.eclipse.stem.core.graph.NodeLabel;
+import org.eclipse.stem.core.graph.StaticLabel;
+import org.eclipse.stem.core.graph.StaticNodeLabel;
+import org.eclipse.stem.core.modifier.Modifiable;
 import org.eclipse.stem.core.predicate.Predicate;
 import org.eclipse.stem.core.predicate.Test;
 
@@ -101,32 +104,30 @@ public class InterventionsSwitch<T1> {
 	 */
 	protected T1 doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case InterventionsPackage.LABEL_VALUE_TEST: {
-				LabelValueTest labelValueTest = (LabelValueTest)theEObject;
-				T1 result = caseLabelValueTest(labelValueTest);
-				if (result == null) result = caseTest(labelValueTest);
-				if (result == null) result = casePredicate(labelValueTest);
+			case InterventionsPackage.INTERVENTION_LABEL: {
+				InterventionLabel interventionLabel = (InterventionLabel)theEObject;
+				T1 result = caseInterventionLabel(interventionLabel);
+				if (result == null) result = caseStaticNodeLabel(interventionLabel);
+				if (result == null) result = caseNodeLabel(interventionLabel);
+				if (result == null) result = caseStaticLabel(interventionLabel);
+				if (result == null) result = caseLabel(interventionLabel);
+				if (result == null) result = caseModifiable(interventionLabel);
+				if (result == null) result = caseIdentifiable(interventionLabel);
+				if (result == null) result = caseComparable(interventionLabel);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case InterventionsPackage.CONTROL_LABEL: {
-				ControlLabel controlLabel = (ControlLabel)theEObject;
-				T1 result = caseControlLabel(controlLabel);
-				if (result == null) result = caseNodeLabel(controlLabel);
-				if (result == null) result = caseLabel(controlLabel);
-				if (result == null) result = caseIdentifiable(controlLabel);
-				if (result == null) result = caseComparable(controlLabel);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case InterventionsPackage.STANDARD_CONTROL_LABEL: {
-				StandardControlLabel standardControlLabel = (StandardControlLabel)theEObject;
-				T1 result = caseStandardControlLabel(standardControlLabel);
-				if (result == null) result = caseControlLabel(standardControlLabel);
-				if (result == null) result = caseNodeLabel(standardControlLabel);
-				if (result == null) result = caseLabel(standardControlLabel);
-				if (result == null) result = caseIdentifiable(standardControlLabel);
-				if (result == null) result = caseComparable(standardControlLabel);
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL: {
+				StandardInterventionLabel standardInterventionLabel = (StandardInterventionLabel)theEObject;
+				T1 result = caseStandardInterventionLabel(standardInterventionLabel);
+				if (result == null) result = caseInterventionLabel(standardInterventionLabel);
+				if (result == null) result = caseStaticNodeLabel(standardInterventionLabel);
+				if (result == null) result = caseNodeLabel(standardInterventionLabel);
+				if (result == null) result = caseStaticLabel(standardInterventionLabel);
+				if (result == null) result = caseLabel(standardInterventionLabel);
+				if (result == null) result = caseModifiable(standardInterventionLabel);
+				if (result == null) result = caseIdentifiable(standardInterventionLabel);
+				if (result == null) result = caseComparable(standardInterventionLabel);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -139,20 +140,20 @@ public class InterventionsSwitch<T1> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case InterventionsPackage.CONTROL_LABEL_VALUE: {
-				ControlLabelValue controlLabelValue = (ControlLabelValue)theEObject;
-				T1 result = caseControlLabelValue(controlLabelValue);
-				if (result == null) result = caseLabelValue(controlLabelValue);
-				if (result == null) result = caseSanityChecker(controlLabelValue);
+			case InterventionsPackage.INTERVENTION_LABEL_VALUE: {
+				InterventionLabelValue interventionLabelValue = (InterventionLabelValue)theEObject;
+				T1 result = caseInterventionLabelValue(interventionLabelValue);
+				if (result == null) result = caseLabelValue(interventionLabelValue);
+				if (result == null) result = caseSanityChecker(interventionLabelValue);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case InterventionsPackage.STANDARD_CONTROL_LABEL_VALUE: {
-				StandardControlLabelValue standardControlLabelValue = (StandardControlLabelValue)theEObject;
-				T1 result = caseStandardControlLabelValue(standardControlLabelValue);
-				if (result == null) result = caseControlLabelValue(standardControlLabelValue);
-				if (result == null) result = caseLabelValue(standardControlLabelValue);
-				if (result == null) result = caseSanityChecker(standardControlLabelValue);
+			case InterventionsPackage.STANDARD_INTERVENTION_LABEL_VALUE: {
+				StandardInterventionLabelValue standardInterventionLabelValue = (StandardInterventionLabelValue)theEObject;
+				T1 result = caseStandardInterventionLabelValue(standardInterventionLabelValue);
+				if (result == null) result = caseInterventionLabelValue(standardInterventionLabelValue);
+				if (result == null) result = caseLabelValue(standardInterventionLabelValue);
+				if (result == null) result = caseSanityChecker(standardInterventionLabelValue);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -161,212 +162,212 @@ public class InterventionsSwitch<T1> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Label Value Test</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Intervention Label</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Label Value Test</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Intervention Label</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseLabelValueTest(LabelValueTest object) {
+	public T1 caseInterventionLabel(InterventionLabel object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Control Label</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Standard Intervention Label</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Control Label</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Standard Intervention Label</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseControlLabel(ControlLabel object) {
+	public T1 caseStandardInterventionLabel(StandardInterventionLabel object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Standard Control Label</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Control Graph Generator</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Standard Control Label</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Control Graph Generator</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseStandardControlLabel(StandardControlLabel object) {
+	public T1 caseControlGraphGenerator(ControlGraphGenerator object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Control Graph Generator</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Intervention Label Value</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Control Graph Generator</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Intervention Label Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseControlGraphGenerator(ControlGraphGenerator object) {
+	public T1 caseInterventionLabelValue(InterventionLabelValue object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Control Label Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Standard Intervention Label Value</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Control Label Value</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Standard Intervention Label Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseControlLabelValue(ControlLabelValue object) {
+	public T1 caseStandardInterventionLabelValue(StandardInterventionLabelValue object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Standard Control Label Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Sanity Checker</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Standard Control Label Value</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Sanity Checker</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseStandardControlLabelValue(StandardControlLabelValue object) {
+	public T1 caseSanityChecker(SanityChecker object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Predicate</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Label Value</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Predicate</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Label Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 casePredicate(Predicate object) {
+	public T1 caseLabelValue(LabelValue object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Test</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Comparable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Test</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Comparable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseTest(Test object) {
+	public <T> T1 caseComparable(Comparable<T> object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Sanity Checker</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Identifiable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Sanity Checker</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Identifiable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseSanityChecker(SanityChecker object) {
+	public T1 caseIdentifiable(Identifiable object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Label Value</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Label</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Label Value</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Label</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseLabelValue(LabelValue object) {
+	public T1 caseLabel(Label object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Comparable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Node Label</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Comparable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Node Label</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public <T> T1 caseComparable(Comparable<T> object) {
+	public T1 caseNodeLabel(NodeLabel object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Identifiable</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Modifiable</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Identifiable</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Modifiable</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseIdentifiable(Identifiable object) {
+	public T1 caseModifiable(Modifiable object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Label</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Static Label</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Label</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Static Label</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseLabel(Label object) {
+	public T1 caseStaticLabel(StaticLabel object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Node Label</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Static Node Label</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Node Label</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Static Node Label</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T1 caseNodeLabel(NodeLabel object) {
+	public T1 caseStaticNodeLabel(StaticNodeLabel object) {
 		return null;
 	}