diff --git a/de.prob.core/plugin.xml b/de.prob.core/plugin.xml
index 086d193f0a2a734a27fb773347cc52e77f343fc9..c19d91206519aa9e612525bce6960363bbbb0891 100644
--- a/de.prob.core/plugin.xml
+++ b/de.prob.core/plugin.xml
@@ -26,12 +26,12 @@
    <extension
          point="org.rodinp.core.attributeTypes">
       <attributeType
-            id="unitPragma"
+            id="unitPragmaAttribute"
             kind="string"
             name="Content of a unit Pragma to send to ProB">
       </attributeType>
       <attributeType
-            id="inferredUnitPragma"
+            id="inferredUnitPragmaAttribute"
             kind="string"
             name="Content of a unit Pragma received from ProB">
       </attributeType>
diff --git a/de.prob.ui/plugin.xml b/de.prob.ui/plugin.xml
index 0bec42fe738ff764913bffc27f991f2f52067bf3..817c0fd5f246b495868644673648867d97274432 100644
--- a/de.prob.ui/plugin.xml
+++ b/de.prob.ui/plugin.xml
@@ -1255,40 +1255,40 @@
    <extension
          point="org.eventb.ui.editorItems">
       <textAttribute
-            class="de.prob.ui.pragmas.UnitPragma"
+            class="de.prob.ui.pragmas.UnitPragmaAttribute"
             expandsHorizontally="true"
-            id="de.prob.ui.unitPragma"
+            id="de.prob.ui.unitPragmaAttribute"
             isMath="true"
             prefix="Physical Unit:"
-            style="de.prob.ui.unitPragma"
-            typeId="de.prob.core.unitPragma">
+            style="de.prob.ui.unitPragmaAttribute"
+            typeId="de.prob.core.unitPragmaAttribute">
       </textAttribute>
       <attributeRelation
             elementTypeId="org.eventb.core.variable">
          <attributeReference
-               descriptionId="de.prob.ui.unitPragma">
+               descriptionId="de.prob.ui.unitPragmaAttribute">
          </attributeReference>
          <attributeReference
-               descriptionId="de.prob.ui.inferredUnitPragma">
+               descriptionId="de.prob.ui.inferredUnitPragmaAttribute">
          </attributeReference>
       </attributeRelation>
       <attributeRelation
             elementTypeId="org.eventb.core.constant">
          <attributeReference
-               descriptionId="de.prob.ui.unitPragma">
+               descriptionId="de.prob.ui.unitPragmaAttribute">
          </attributeReference>
          <attributeReference
-               descriptionId="de.prob.ui.inferredUnitPragma">
+               descriptionId="de.prob.ui.inferredUnitPragmaAttribute">
          </attributeReference>
       </attributeRelation>
       <textAttribute
-            class="de.prob.ui.pragmas.InferredUnitPragma"
+            class="de.prob.ui.pragmas.InferredUnitPragmaAttribute"
             expandsHorizontally="true"
-            id="de.prob.ui.inferredUnitPragma"
+            id="de.prob.ui.inferredUnitPragmaAttribute"
             isMath="true"
             prefix="Inferred Physical Unit:"
-            style="de.prob.ui.inferredUnitPragma"
-            typeId="de.prob.core.inferredUnitPragma">
+            style="de.prob.ui.inferredUnitPragmaAttribute"
+            typeId="de.prob.core.inferredUnitPragmaAttribute">
       </textAttribute>
    </extension>
 </plugin>
diff --git a/de.prob.ui/src/de/prob/ui/pragmas/UnitPragma.java b/de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragmaAttribute.java
similarity index 91%
rename from de.prob.ui/src/de/prob/ui/pragmas/UnitPragma.java
rename to de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragmaAttribute.java
index b3d86821cee5c32394cc390a59b6ea024febc3ac..c72487a5b24ec7c54e4e60707cf9ff10f7eefcfd 100644
--- a/de.prob.ui/src/de/prob/ui/pragmas/UnitPragma.java
+++ b/de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragmaAttribute.java
@@ -18,11 +18,12 @@ import org.rodinp.core.RodinDBException;
 
 import de.prob.core.internal.Activator;
 
-public class UnitPragma implements IAttributeManipulation {
+public class InferredUnitPragmaAttribute implements IAttributeManipulation {
 	public static IAttributeType.String ATTRIBUTE = RodinCore
-			.getStringAttrType(Activator.PLUGIN_ID + ".unitPragma");
+			.getStringAttrType(Activator.PLUGIN_ID
+					+ ".inferredUnitPragmaAttribute");
 
-	public UnitPragma() {
+	public InferredUnitPragmaAttribute() {
 		// empty constructor
 	}
 
diff --git a/de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragma.java b/de.prob.ui/src/de/prob/ui/pragmas/UnitPragmaAttribute.java
similarity index 92%
rename from de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragma.java
rename to de.prob.ui/src/de/prob/ui/pragmas/UnitPragmaAttribute.java
index 2dafdb2230b4a6a1098ba0040b94650fdf58296f..b159c38b34a372231eb230b76f4a2a7aad4eed0e 100644
--- a/de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragma.java
+++ b/de.prob.ui/src/de/prob/ui/pragmas/UnitPragmaAttribute.java
@@ -18,11 +18,11 @@ import org.rodinp.core.RodinDBException;
 
 import de.prob.core.internal.Activator;
 
-public class InferredUnitPragma implements IAttributeManipulation {
+public class UnitPragmaAttribute implements IAttributeManipulation {
 	public static IAttributeType.String ATTRIBUTE = RodinCore
-			.getStringAttrType(Activator.PLUGIN_ID + ".inferredUnitPragma");
+			.getStringAttrType(Activator.PLUGIN_ID + ".unitPragmaAttribute");
 
-	public InferredUnitPragma() {
+	public UnitPragmaAttribute() {
 		// empty constructor
 	}