diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
index b3317ae847ac7caa19aa3ded80158387d9c392e8..9cec805bbd39fbf21c75426a8f949af9208ab1b5 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java
@@ -725,7 +725,7 @@ public class BpmnParse extends Parse {
   }
 
   protected FieldDeclaration parseFieldDeclaration(Element serviceTaskElement, Element fieldDeclarationElement) {
-    String fieldName = fieldDeclarationElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "name");
+    String fieldName = fieldDeclarationElement.attribute("name");
     
     FieldDeclaration fieldDeclaration = parseStringFieldDeclaration(fieldDeclarationElement, serviceTaskElement, fieldName);    
     if(fieldDeclaration == null) {
@@ -741,7 +741,7 @@ public class BpmnParse extends Parse {
   
   protected FieldDeclaration parseStringFieldDeclaration(Element fieldDeclarationElement, Element serviceTaskElement, String fieldName) {
     try {
-      String fieldValue = getStringValueFromAttributeOrElement("stringValue", "string", BpmnParser.BPMN_EXTENSIONS_NS, fieldDeclarationElement);
+      String fieldValue = getStringValueFromAttributeOrElement("stringValue", "string", null, fieldDeclarationElement);
       if(fieldValue != null) {
         return new FieldDeclaration(fieldName, Expression.class.getName(), new FixedValue(fieldValue)); 
       }
@@ -758,7 +758,7 @@ public class BpmnParse extends Parse {
   
   protected FieldDeclaration parseExpressionFieldDeclaration(Element fieldDeclarationElement, Element serviceTaskElement, String fieldName) {
     try {
-      String expression = getStringValueFromAttributeOrElement("expression", "expression", BpmnParser.BPMN_EXTENSIONS_NS, fieldDeclarationElement);
+      String expression = getStringValueFromAttributeOrElement("expression", "expression", null, fieldDeclarationElement);
       if(expression != null && expression.trim().length() > 0) {
         return new FieldDeclaration(fieldName, Expression.class.getName(), expressionManager.createExpression(expression));
       }
@@ -1261,7 +1261,7 @@ public class BpmnParse extends Parse {
   public void parsePropertyCustomExtensions(ActivityImpl activity, Element propertyElement, String propertyName, String propertyType) {
 
     if (propertyType == null) {
-      String type = propertyElement.attribute("activiti:type");
+      String type = propertyElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "type");
       propertyType = type != null ? type : "string"; // default is string
     }
 
@@ -1381,7 +1381,7 @@ public class BpmnParse extends Parse {
     if(extentionsElement != null) {
       List<Element> listenerElements = extentionsElement.elementsNS(BpmnParser.BPMN_EXTENSIONS_NS, "listener");
       for(Element listenerElement :listenerElements) {
-        String eventName = listenerElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "eventName");
+        String eventName = listenerElement.attribute("eventName");
         if(isValidEventNameForScope(eventName, listenerElement)) {
           EventListener listener = parseEventListener(listenerElement);
           if(listener != null) {
@@ -1431,8 +1431,8 @@ public class BpmnParse extends Parse {
   public EventListener parseEventListener(Element eventListenerElement) {
     EventListener eventListener = null;
     
-    String className = eventListenerElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "class");
-    String expression = eventListenerElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "expression");
+    String className = eventListenerElement.attribute("class");
+    String expression = eventListenerElement.attribute( "expression");
     
     List<FieldDeclaration> fieldDeclarations = parseFieldDeclarations(eventListenerElement);
     
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/DefaultFormHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/DefaultFormHandler.java
index 2c5e14b91d8122de16dbd56b3884d0653ca1124b..02486a31d9e77b4d61089af36b9398d718edaac0 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/DefaultFormHandler.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/DefaultFormHandler.java
@@ -57,19 +57,19 @@ public class DefaultFormHandler implements FormHandler {
       for (Element formPropertyElement : formPropertyElements) {
         FormPropertyHandler formPropertyHandler = new FormPropertyHandler();
         
-        String id = formPropertyElement.attribute("http://activiti.org/bpmn-extensions:id");
+        String id = formPropertyElement.attribute("id");
         if (id==null) {
           bpmnParse.addError("attribute 'id' is required", formPropertyElement);
         }
         formPropertyHandler.setId(id);
         
-        String name = formPropertyElement.attribute("http://activiti.org/bpmn-extensions:name");
+        String name = formPropertyElement.attribute("name");
         formPropertyHandler.setName(name);
         
         AbstractFormType type = formTypes.parseFormPropertyType(formPropertyElement, bpmnParse);
         formPropertyHandler.setType(type);
 
-        String requiredText = formPropertyElement.attribute("http://activiti.org/bpmn-extensions:required", "false");
+        String requiredText = formPropertyElement.attribute("required", "false");
         Boolean required = bpmnParse.parseBooleanAttribute(requiredText);
         if (required!=null) {
           formPropertyHandler.setRequired(required);
@@ -85,7 +85,7 @@ public class DefaultFormHandler implements FormHandler {
           bpmnParse.addError("attribute 'readable' must be one of {on|yes|true|enabled|active|off|no|false|disabled|inactive}", formPropertyElement);
         }
         
-        String writableText = formPropertyElement.attribute("http://activiti.org/bpmn-extensions:writable", "true");
+        String writableText = formPropertyElement.attribute("writable", "true");
         Boolean writable = bpmnParse.parseBooleanAttribute(writableText);
         if (writable!=null) {
           formPropertyHandler.setWritable(writable);
@@ -93,10 +93,10 @@ public class DefaultFormHandler implements FormHandler {
           bpmnParse.addError("attribute 'writable' must be one of {on|yes|true|enabled|active|off|no|false|disabled|inactive}", formPropertyElement);
         }
 
-        String variableName = formPropertyElement.attribute("http://activiti.org/bpmn-extensions:variable");
+        String variableName = formPropertyElement.attribute("variable");
         formPropertyHandler.setVariableName(variableName);
 
-        String expressionText = formPropertyElement.attribute("http://activiti.org/bpmn-extensions:expression");
+        String expressionText = formPropertyElement.attribute("expression");
         if (expressionText!=null) {
           Expression expression = expressionManager.createExpression(expressionText);
           formPropertyHandler.setVariableExpression(expression);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/FormTypes.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/FormTypes.java
index 4d2ab0d97b40d62bf11953348872aec1b48a3b4a..a4358b31f381840108e6c25c7b87a89572ef2feb 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/FormTypes.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/form/FormTypes.java
@@ -17,6 +17,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.activiti.engine.impl.bpmn.parser.BpmnParse;
+import org.activiti.engine.impl.bpmn.parser.BpmnParser;
 import org.activiti.engine.impl.util.xml.Element;
 
 
@@ -34,17 +35,17 @@ public class FormTypes {
   public AbstractFormType parseFormPropertyType(Element formPropertyElement, BpmnParse bpmnParse) {
     AbstractFormType formType = null;
 
-    String typeText = formPropertyElement.attribute("http://activiti.org/bpmn-extensions:type");
-    String datePatternText = formPropertyElement.attribute("http://activiti.org/bpmn-extensions:datePattern");
+    String typeText = formPropertyElement.attribute("type");
+    String datePatternText = formPropertyElement.attribute("datePattern");
     
     if ("date".equals(typeText) && datePatternText!=null) {
       formType = new DateFormType(datePatternText);
       
     } else if ("enum".equals(typeText)) {
       Map<String, String> values = new HashMap<String, String>();
-      for (Element valueElement: formPropertyElement.elementsNS("http://activiti.org/bpmn-extensions","value")) {
-        String valueId = valueElement.attribute("http://activiti.org/bpmn-extensions:id");
-        String valueName = valueElement.attribute("http://activiti.org/bpmn-extensions:name");
+      for (Element valueElement: formPropertyElement.elementsNS(BpmnParser.BPMN_EXTENSIONS_NS,"value")) {
+        String valueId = valueElement.attribute("id");
+        String valueName = valueElement.attribute("name");
         values.put(valueId, valueName);
       }
       formType = new EnumFormType(values);
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/oneTaskProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/oneTaskProcess.bpmn20.xml
index cfdb388099a9c0e2b8cdaf5e5e8f0d5eadd91eaa..11644b6c4aab8e06cd7d5c9c113155c91d236af8 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/oneTaskProcess.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/oneTaskProcess.bpmn20.xml
@@ -2,6 +2,7 @@
 <definitions
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   targetNamespace="http://www.activiti.org/bpmn2.0">
 
   <process id='oneTaskProcess' name="The One Task Process">
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/runtime/oneTaskProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/runtime/oneTaskProcess.bpmn20.xml
index 8312d0e4654fd9a4734e815dddfefdc01e8c8a71..315d704cf135e1bb57db7d76296852d74c361cb3 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/runtime/oneTaskProcess.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/runtime/oneTaskProcess.bpmn20.xml
@@ -2,6 +2,7 @@
 <definitions
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   targetNamespace="http://www.activiti.org/bpmn2.0">
 
   <process id='oneTaskProcess'>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/runtime/oneTaskProcess2.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/runtime/oneTaskProcess2.bpmn20.xml
index e74c90a656effbc0d5f5068a882bf46d8275d347..0f2543ba38764515924bc955fe3f06bec4160f34 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/runtime/oneTaskProcess2.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/runtime/oneTaskProcess2.bpmn20.xml
@@ -2,6 +2,7 @@
 <definitions
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   targetNamespace="http://www.activiti.org/bpmn2.0">
 
   <process id='oneTaskProcess2'>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/twoTasksProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/twoTasksProcess.bpmn20.xml
index f87fbb36ae6521f8ac7960ec9801a8173f55a8dc..36024e0a33777f9db1a96cf3bb5a15a2889f5351 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/twoTasksProcess.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/api/twoTasksProcess.bpmn20.xml
@@ -2,6 +2,7 @@
 <definitions
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   targetNamespace="http://www.activiti.org/bpmn2.0">
 
   <process id='twoTasksProcess'>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testCcAndBcc.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testCcAndBcc.bpmn20.xml
index c220ea07fa36df0e90f2b10e0f31c6d70bddf769..4c2557a9ca9bc2cd191e3ca5efb99a55a856dcad 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testCcAndBcc.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testCcAndBcc.bpmn20.xml
@@ -11,19 +11,19 @@
     
     <serviceTask id="sendMail" activiti:type="mail">
       <extensionElements>
-        <activiti:field activiti:name="to">
+        <activiti:field name="to">
           <activiti:string>kermit@activiti.org</activiti:string>
         </activiti:field>
-        <activiti:field activiti:name="subject">
+        <activiti:field name="subject">
           <activiti:string>Hello world</activiti:string>
         </activiti:field>
-        <activiti:field activiti:name="text">
+        <activiti:field name="text">
           <activiti:string>This is the content</activiti:string>
         </activiti:field>
-        <activiti:field activiti:name="cc">
+        <activiti:field name="cc">
           <activiti:string>fozzie@activiti.org</activiti:string>
         </activiti:field>
-        <activiti:field activiti:name="bcc">
+        <activiti:field name="bcc">
           <activiti:string>mispiggy@activiti.org</activiti:string>
         </activiti:field>
       </extensionElements>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testHtmlMail.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testHtmlMail.bpmn20.xml
index 6b1935026fed69f2ba964e2f2bbe23adcd56c85e..e10ef6c2904126ea859847fbd3e6c9c0df5bf1e1 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testHtmlMail.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testHtmlMail.bpmn20.xml
@@ -11,14 +11,14 @@
     
     <serviceTask id="sendMail" activiti:type="mail">
       <extensionElements>
-        <activiti:field activiti:name="to">
+        <activiti:field name="to">
           <activiti:string>kermit@activiti.org</activiti:string>
         </activiti:field>
-        <activiti:field activiti:name="subject">
+        <activiti:field name="subject">
           <activiti:string>Test</activiti:string>
         </activiti:field>
-        <activiti:field activiti:name="html">
-          <activiti:expression>
+        <activiti:field name="html">
+          <expression>
             <![CDATA[
               <html>
                 <body>
@@ -26,7 +26,7 @@
                 </body>
               </html>
             ]]>
-          </activiti:expression>
+          </expression>
         </activiti:field>      
       </extensionElements>
     </serviceTask>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testSimpleTextMail.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testSimpleTextMail.bpmn20.xml
index 699ee068c3da6dd58f30d639fc13ad899d832d21..191560ed17ccf91d5d016f044f9e61c4e627003a 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testSimpleTextMail.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testSimpleTextMail.bpmn20.xml
@@ -11,13 +11,13 @@
     
     <serviceTask id="sendMail" activiti:type="mail">
       <extensionElements>
-        <activiti:field activiti:name="to">
+        <activiti:field name="to">
           <activiti:string>kermit@activiti.org</activiti:string>
         </activiti:field>
-        <activiti:field activiti:name="subject">
+        <activiti:field name="subject">
           <activiti:string>Hello Kermit!</activiti:string>
         </activiti:field>
-        <activiti:field activiti:name="text">
+        <activiti:field name="text">
           <activiti:string>This a text only e-mail.</activiti:string>
         </activiti:field>      
       </extensionElements>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testSimpleTextMailMultipleRecipients.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testSimpleTextMailMultipleRecipients.bpmn20.xml
index 0408f1936ce8dfc1b93f50d0a0960eb16043cc04..dff08697f68f48d99047f359a7565bf482192108 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testSimpleTextMailMultipleRecipients.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testSimpleTextMailMultipleRecipients.bpmn20.xml
@@ -11,13 +11,13 @@
     
     <serviceTask id="sendMail" activiti:type="mail">
       <extensionElements>
-        <activiti:field activiti:name="to">
+        <activiti:field name="to">
           <activiti:string>kermit@activiti.org, fozzie@activiti.org,mispiggy@activiti.org</activiti:string>
         </activiti:field>
-        <activiti:field activiti:name="subject">
+        <activiti:field name="subject">
           <activiti:string>Hello Kermit!</activiti:string>
         </activiti:field>
-        <activiti:field activiti:name="text">
+        <activiti:field name="text">
           <activiti:string>This a text only e-mail.</activiti:string>
         </activiti:field>      
       </extensionElements>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testTextMailExpressions.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testTextMailExpressions.bpmn20.xml
index 69cf95da3f906920d3dadf1552c9db9fa3ced4ef..79d598cdc695dbdfcd96cc36e27b30fb1ddfe70e 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testTextMailExpressions.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/mail/EmailServiceTaskTest.testTextMailExpressions.bpmn20.xml
@@ -11,17 +11,17 @@
     
     <serviceTask id="sendMail" activiti:type="mail">
       <extensionElements>
-        <activiti:field activiti:name="from">
-          <activiti:expression>${sender}</activiti:expression>
+        <activiti:field name="from">
+          <expression>${sender}</expression>
         </activiti:field>
-        <activiti:field activiti:name="to">
-          <activiti:expression>${recipient}</activiti:expression>
+        <activiti:field name="to">
+          <expression>${recipient}</expression>
         </activiti:field>
-        <activiti:field activiti:name="subject">
-          <activiti:expression>${subject}</activiti:expression>
+        <activiti:field name="subject">
+          <expression>${subject}</expression>
         </activiti:field>
-        <activiti:field activiti:name="text">
-          <activiti:expression>Hello ${recipientName}, this is an e-mail</activiti:expression>
+        <activiti:field name="text">
+          <expression>Hello ${recipientName}, this is an e-mail</expression>
         </activiti:field>      
       </extensionElements>
     </serviceTask>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/parse/InvalidProcessTest.testInvalidProcessDefinition.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/parse/InvalidProcessTest.testInvalidProcessDefinition.bpmn20.xml
index 6b0b1e3cc6935524f8b657cb85b2bb723b7319d1..6717b0cce3f3f310aadfc61620716fbe2e125328 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/parse/InvalidProcessTest.testInvalidProcessDefinition.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/parse/InvalidProcessTest.testInvalidProcessDefinition.bpmn20.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 BPMN20.xsd" 
   targetNamespace="http://www.activiti.org/bpmn2.0">
 
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/db/EngineRebootProcessDefinitionCacheTest.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/db/EngineRebootProcessDefinitionCacheTest.bpmn20.xml
index cfdb388099a9c0e2b8cdaf5e5e8f0d5eadd91eaa..11644b6c4aab8e06cd7d5c9c113155c91d236af8 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/db/EngineRebootProcessDefinitionCacheTest.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/db/EngineRebootProcessDefinitionCacheTest.bpmn20.xml
@@ -2,6 +2,7 @@
 <definitions
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   targetNamespace="http://www.activiti.org/bpmn2.0">
 
   <process id='oneTaskProcess' name="The One Task Process">
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/forms/FormsTest.testFormPropertyDetails.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/forms/FormsTest.testFormPropertyDetails.bpmn20.xml
index 22b3eca56b3b3ba25aff2ff5415db61bb140826f..06a89c56a5508b3d9488505e4b8d62d938624a31 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/forms/FormsTest.testFormPropertyDetails.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/forms/FormsTest.testFormPropertyDetails.bpmn20.xml
@@ -4,29 +4,27 @@
              targetNamespace="http://activiti.org/bpmn20" 
              xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xmlns:a="http://activiti.org/bpmn-extensions">
+             xmlns:activiti="http://activiti.org/bpmn-extensions">
   
   <process id="FormPropertyDetails">
   
     <startEvent id="start">
       <extensionElements>
+        <activiti:formProperty id="speaker" 
+          name="Speaker"
+          variable="SpeakerName" 
+          type="string" />
 
-        <a:formProperty a:id="speaker" 
-                        a:name="Speaker"
-                        a:variable="SpeakerName" 
-                        a:type="string" />
+        <activiti:formProperty id="start" 
+          type="date" 
+          datePattern="dd-MMM-yyyy" />
 
-        <a:formProperty a:id="start" 
-                        a:type="date" 
-                        a:datePattern="dd-MMM-yyyy" />
-
-        <a:formProperty a:id="direction" 
-                        a:type="enum">
-          <a:value a:id="left" a:name="Go Left" />
-          <a:value a:id="right" a:name="Go Right" />
-          <a:value a:id="up" a:name="Go Up" />
-          <a:value a:id="down" a:name="Go Down" />
-        </a:formProperty>
+        <activiti:formProperty id="direction" type="enum">
+          <activiti:value id="left" name="Go Left" />
+          <activiti:value id="right" name="Go Right" />
+          <activiti:value id="up" name="Go Up" />
+          <activiti:value id="down" name="Go Down" />
+        </activiti:formProperty>
         
       </extensionElements>
     </startEvent>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/forms/FormsTest.testFormPropertyHandling.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/forms/FormsTest.testFormPropertyHandling.bpmn20.xml
index 75858578591dc456abf8815cd3edd8528b89a4e6..7423b5f02556597176c5c0a4d308badb30f88b6c 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/forms/FormsTest.testFormPropertyHandling.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/forms/FormsTest.testFormPropertyHandling.bpmn20.xml
@@ -10,8 +10,8 @@
   
     <startEvent id="start">
       <extensionElements>
-        <activiti:formProperty activiti:id="speaker" activiti:variable="SpeakerName"/>
-        <activiti:formProperty activiti:id="duration" activiti:type="long"/>
+        <activiti:formProperty id="speaker" variable="SpeakerName"/>
+        <activiti:formProperty id="duration" type="long"/>
       </extensionElements>
     </startEvent>
 
@@ -20,10 +20,10 @@
     <userTask id="task"
               activiti:assignee="kermit">
       <extensionElements>
-        <activiti:formProperty activiti:id="room" />
-        <activiti:formProperty activiti:id="duration" activiti:type="long"/>
-        <activiti:formProperty activiti:id="speaker" activiti:variable="SpeakerName" activiti:writable="false" />
-        <activiti:formProperty activiti:id="street" activiti:expression="#{address.street}" activiti:required="true" />
+        <activiti:formProperty id="room" />
+        <activiti:formProperty id="duration" type="long"/>
+        <activiti:formProperty id="speaker" variable="SpeakerName" writable="false" />
+        <activiti:formProperty id="street" expression="#{address.street}" required="true" />
       </extensionElements>
     </userTask>
 
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/HistoricActivityInstanceTest.testHistoricActivityInstanceAssignee.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/HistoricActivityInstanceTest.testHistoricActivityInstanceAssignee.bpmn20.xml
index 67a079b8452b0837de13a8e11f60ead8830fda13..3cf2d876804ceb15f6cecccc733d1b70fc0d686a 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/HistoricActivityInstanceTest.testHistoricActivityInstanceAssignee.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/HistoricActivityInstanceTest.testHistoricActivityInstanceAssignee.bpmn20.xml
@@ -2,7 +2,8 @@
 <definitions id="taskAssigneeExample" 
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	targetNamespace="http://www.activiti.org/bpmn2.0">
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
+  targetNamespace="http://www.activiti.org/bpmn2.0">
 	
 	<process id='taskAssigneeProcess' name="Task Assignee example">
 	
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/HistoricActivityInstanceTest.testSorting.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/HistoricActivityInstanceTest.testSorting.bpmn20.xml
index c6b2e54ca36dc0f85a747c8dd42fb9c82c4e2692..27baeff88e67fbcd20ce385e80730aebb1c2a222 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/HistoricActivityInstanceTest.testSorting.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/HistoricActivityInstanceTest.testSorting.bpmn20.xml
@@ -2,6 +2,7 @@
 <definitions id="taskAssigneeExample" 
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
 	targetNamespace="http://www.activiti.org/bpmn2.0">
 	
 	<process id='process' name="Task Assignee example">
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/oneTaskProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/oneTaskProcess.bpmn20.xml
index cfdb388099a9c0e2b8cdaf5e5e8f0d5eadd91eaa..11644b6c4aab8e06cd7d5c9c113155c91d236af8 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/oneTaskProcess.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/history/oneTaskProcess.bpmn20.xml
@@ -2,6 +2,7 @@
 <definitions
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   targetNamespace="http://www.activiti.org/bpmn2.0">
 
   <process id='oneTaskProcess' name="The One Task Process">
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/repository/one.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/repository/one.bpmn20.xml
index dc051718c736a99280c57f7d7416b2b2b87b2eaf..8cdce7d6c34c8cf636cbd566d7ff1516631ff871 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/repository/one.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/repository/one.bpmn20.xml
@@ -3,6 +3,7 @@
 <definitions
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   targetNamespace="http://www.activiti.org/bpmn2.0">
 
   <process id='one' name="One">
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/repository/two.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/repository/two.bpmn20.xml
index a22a443abd1d12579c2d4bb44eadc1392b08e526..7c806833d2bb6966dac48fce1288b281a375096d 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/repository/two.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/repository/two.bpmn20.xml
@@ -3,6 +3,7 @@
 <definitions
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   targetNamespace="http://www.activiti.org/bpmn2.0">
 
   <process id='two' name="Two">
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/service/oneTaskProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/service/oneTaskProcess.bpmn20.xml
index cfdb388099a9c0e2b8cdaf5e5e8f0d5eadd91eaa..11644b6c4aab8e06cd7d5c9c113155c91d236af8 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/service/oneTaskProcess.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/service/oneTaskProcess.bpmn20.xml
@@ -2,6 +2,7 @@
 <definitions
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   targetNamespace="http://www.activiti.org/bpmn2.0">
 
   <process id='oneTaskProcess' name="The One Task Process">
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/service/twoTasksProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/service/twoTasksProcess.bpmn20.xml
index f87fbb36ae6521f8ac7960ec9801a8173f55a8dc..36024e0a33777f9db1a96cf3bb5a15a2889f5351 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/service/twoTasksProcess.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/service/twoTasksProcess.bpmn20.xml
@@ -2,6 +2,7 @@
 <definitions
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   targetNamespace="http://www.activiti.org/bpmn2.0">
 
   <process id='twoTasksProcess'>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/eventlistener/EventListenersFieldInjectionProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/eventlistener/EventListenersFieldInjectionProcess.bpmn20.xml
index 22d4786ffbce74dab47320351a1ab5551eccdffc..0f76f9ab6e1635f2d5318e40e3407b93a2bc31e0 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/eventlistener/EventListenersFieldInjectionProcess.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/eventlistener/EventListenersFieldInjectionProcess.bpmn20.xml
@@ -6,9 +6,9 @@
   
   <process id="eventListenersProcess">
     <extensionElements>
-      <activiti:listener activiti:class="org.activiti.examples.bpmn.eventlistener.ExampleFieldInjectedEventListener" activiti:eventName="start">
-        <activiti:field activiti:name="fixedValue" activiti:stringValue="Yes, I am " />
-        <activiti:field activiti:name="dynamicValue" activiti:expression="${myVar}" />
+      <activiti:listener class="org.activiti.examples.bpmn.eventlistener.ExampleFieldInjectedEventListener" eventName="start">
+        <activiti:field name="fixedValue" stringValue="Yes, I am " />
+        <activiti:field name="dynamicValue" expression="${myVar}" />
       </activiti:listener>
     </extensionElements>
     
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/eventlistener/EventListenersProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/eventlistener/EventListenersProcess.bpmn20.xml
index 93aa01af5445d45619edf7d0b4ec1fa1a5bbef1f..1b66c166cbbe4c17051d48ff30dc6d7530146840 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/eventlistener/EventListenersProcess.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/eventlistener/EventListenersProcess.bpmn20.xml
@@ -7,7 +7,7 @@
   <process id="eventListenersProcess">
   
     <extensionElements>
-      <activiti:listener activiti:class="org.activiti.examples.bpmn.eventlistener.ExampleEventListenerOne" activiti:eventName="start" />
+      <activiti:listener class="org.activiti.examples.bpmn.eventlistener.ExampleEventListenerOne" eventName="start" />
     </extensionElements>
     
     <startEvent id="theStart" />
@@ -17,13 +17,13 @@
     <userTask id="firstTask" />
     <sequenceFlow sourceRef="firstTask" targetRef="secondTask">
        <extensionElements>
-        <activiti:listener activiti:class="org.activiti.examples.bpmn.eventlistener.ExampleEventListenerTwo" />
+        <activiti:listener class="org.activiti.examples.bpmn.eventlistener.ExampleEventListenerTwo" />
       </extensionElements>
     </sequenceFlow>
     
     <userTask id="secondTask" >
       <extensionElements>
-        <activiti:listener activiti:expression="${myPojo.myMethod(execution.eventName)}" activiti:eventName="end" />
+        <activiti:listener expression="${myPojo.myMethod(execution.eventName)}" eventName="end" />
       </extensionElements>
     </userTask>
     <sequenceFlow sourceRef="secondTask" targetRef="thirdTask" />
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/mail/EmailServiceTaskTest.testSendEmail.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/mail/EmailServiceTaskTest.testSendEmail.bpmn20.xml
index 7fb98a25293194ac24922e0650fa78fe22fa5196..d141925e6e10b8e1a93459c41a5dfeaa4cc00258 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/mail/EmailServiceTaskTest.testSendEmail.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/mail/EmailServiceTaskTest.testSendEmail.bpmn20.xml
@@ -11,11 +11,11 @@
     
     <serviceTask id="sendMail" activiti:type="mail">
       <extensionElements>
-        <activiti:field activiti:name="from" activiti:expression="${sender}" />
-        <activiti:field activiti:name="to" activiti:expression="${recipient}" />
-        <activiti:field activiti:name="subject" activiti:expression="Your order ${orderId} has been shipped" />
-        <activiti:field activiti:name="html">
-          <activiti:expression>
+        <activiti:field name="from" expression="${sender}" />
+        <activiti:field name="to" expression="${recipient}" />
+        <activiti:field name="subject" expression="Your order ${orderId} has been shipped" />
+        <activiti:field name="html">
+          <expression>
             <![CDATA[
               <html>
                 <body>
@@ -29,7 +29,7 @@
                 </body>
               </html>
             ]]>
-          </activiti:expression>
+          </expression>
         </activiti:field>      
       </extensionElements>
     </serviceTask>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/servicetask/JavaServiceTaskTest.testExpressionFieldInjection.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/servicetask/JavaServiceTaskTest.testExpressionFieldInjection.bpmn20.xml
index 75e28cf18584fcf9febae14aa4dbd13a1fe32b1e..01f907d7a62f2a89cb164b620909b2d83410ddd9 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/servicetask/JavaServiceTaskTest.testExpressionFieldInjection.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/servicetask/JavaServiceTaskTest.testExpressionFieldInjection.bpmn20.xml
@@ -15,11 +15,11 @@
                  name="Java service invocation" 
                  activiti:class="org.activiti.examples.bpmn.servicetask.ReverseStringsFieldInjected">
       <extensionElements>
-        <activiti:field activiti:name="text1">
-          <activiti:expression>${genderBean.getGenderString(gender)}</activiti:expression>
+        <activiti:field name="text1">
+          <expression>${genderBean.getGenderString(gender)}</expression>
         </activiti:field>
-        <activiti:field activiti:name="text2">
-          <activiti:expression>Hello ${gender == 'male' ? 'Mr.' : 'Mrs.'} ${name}</activiti:expression>
+        <activiti:field name="text2">
+          <expression>Hello ${gender == 'male' ? 'Mr.' : 'Mrs.'} ${name}</expression>
         </activiti:field>
       </extensionElements>             
     </serviceTask>
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/servicetask/JavaServiceTaskTest.testFieldInjection.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/servicetask/JavaServiceTaskTest.testFieldInjection.bpmn20.xml
index 2f84f389a5bd35fea586655b02fea72466c48d37..d1ea1afbe4638e930f332dac2560e93bd128fd80 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/servicetask/JavaServiceTaskTest.testFieldInjection.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/servicetask/JavaServiceTaskTest.testFieldInjection.bpmn20.xml
@@ -15,7 +15,7 @@
                  name="Java service invocation" 
                  activiti:class="org.activiti.examples.bpmn.servicetask.ToUpperCaseFieldInjected">
       <extensionElements>
-        <activiti:field activiti:name="text">
+        <activiti:field name="text">
           <activiti:string>Hello World</activiti:string>
         </activiti:field>
       </extensionElements>             
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/FinancialReportProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/FinancialReportProcess.bpmn20.xml
index a6095dbba40466e97914b425ca3a257f2e072460..5e05060ed7e9c673c22318e512706d1955405da9 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/FinancialReportProcess.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/FinancialReportProcess.bpmn20.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <definitions id="definitions"
 	targetNamespace="http://activiti.org/bpmn20" 
+    xmlns:activiti="http://activiti.org/bpmn-extensions"
 	xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL">
 	
 	<process id="financialReport" name="Monthly financial report">
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskassignee/TaskAssigneeTest.testTaskAssignee.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskassignee/TaskAssigneeTest.testTaskAssignee.bpmn20.xml
index 67a079b8452b0837de13a8e11f60ead8830fda13..17243e0cbaec515addb6e16476733aba1e380905 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskassignee/TaskAssigneeTest.testTaskAssignee.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskassignee/TaskAssigneeTest.testTaskAssignee.bpmn20.xml
@@ -2,6 +2,7 @@
 <definitions id="taskAssigneeExample" 
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
 	targetNamespace="http://www.activiti.org/bpmn2.0">
 	
 	<process id='taskAssigneeProcess' name="Task Assignee example">
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMixedCandidateUserAndGroup.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMixedCandidateUserAndGroup.bpmn20.xml
index cf41e82843301b58b20f2f346df8d111bc709195..4ca19863f8472171ca3de7b65635970920cf0c2d 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMixedCandidateUserAndGroup.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMixedCandidateUserAndGroup.bpmn20.xml
@@ -2,6 +2,7 @@
 <definitions id="taskAssigneeExample" 
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   xsi:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 BPMN20.xsd"
 	targetNamespace="http://www.activiti.org/bpmn2.0">
 	
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMultipleCandidateGroups.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMultipleCandidateGroups.bpmn20.xml
index 65b751414661029d05e94d05ff662a28daf68c87..96bf3c123617f5a9be6f46dc3633a6a09c9c0def 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMultipleCandidateGroups.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMultipleCandidateGroups.bpmn20.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions id="taskAssigneeExample" 
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	targetNamespace="http://www.activiti.org/bpmn2.0">
 	
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMultipleCandidateUsers.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMultipleCandidateUsers.bpmn20.xml
index bde429193039c6844be530bddfd222aae69296f6..6ab95d185b777fb8d38faec971f50c7064e806d1 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMultipleCandidateUsers.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testMultipleCandidateUsers.bpmn20.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions id="taskAssigneeExample" 
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	targetNamespace="http://www.activiti.org/bpmn2.0">
 	
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testSingleCandidateGroup.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testSingleCandidateGroup.bpmn20.xml
index 890428d696d8de57ffa921ffb29c7cc8afde419f..d638b264e27e873d09ca48e096caa1ba0a5a6651 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testSingleCandidateGroup.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.testSingleCandidateGroup.bpmn20.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions id="taskAssigneeExample" 
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	targetNamespace="http://www.activiti.org/bpmn2.0">
 	
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/VariablesTest.testBasicVariableOperations.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/VariablesTest.testBasicVariableOperations.bpmn20.xml
index 67a079b8452b0837de13a8e11f60ead8830fda13..3cf2d876804ceb15f6cecccc733d1b70fc0d686a 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/VariablesTest.testBasicVariableOperations.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/VariablesTest.testBasicVariableOperations.bpmn20.xml
@@ -2,7 +2,8 @@
 <definitions id="taskAssigneeExample" 
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	targetNamespace="http://www.activiti.org/bpmn2.0">
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
+  targetNamespace="http://www.activiti.org/bpmn2.0">
 	
 	<process id='taskAssigneeProcess' name="Task Assignee example">
 	
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testIllegalEntities.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testIllegalEntities.bpmn20.xml
index 8db71e16a59cccccd7ffb2d6e83f964e35fcb921..0372f9f1081e628d8d4ceb130cd50390d2e1c026 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testIllegalEntities.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testIllegalEntities.bpmn20.xml
@@ -2,7 +2,8 @@
 <definitions id="taskAssigneeExample" 
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	targetNamespace="http://www.activiti.org/bpmn2.0">
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
+  targetNamespace="http://www.activiti.org/bpmn2.0">
 	
   <process id="JPAVariableProcessExceptions" name="Process containing JPA varaibles">
   
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testQueryJPAVariable.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testQueryJPAVariable.bpmn20.xml
index d90e45c9ec2dd0bff28aa40bd915861a5e1c3893..29230c116cccd5272f5d17691b99d990f0baa711 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testQueryJPAVariable.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testQueryJPAVariable.bpmn20.xml
@@ -2,7 +2,8 @@
 <definitions id="taskAssigneeExample" 
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	targetNamespace="http://www.activiti.org/bpmn2.0">
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
+  targetNamespace="http://www.activiti.org/bpmn2.0">
 	
   <process id="JPAVariableProcess" name="Process containing JPA varaibles">
   
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testStoreJPAEntityAsVariable.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testStoreJPAEntityAsVariable.bpmn20.xml
index d90e45c9ec2dd0bff28aa40bd915861a5e1c3893..29230c116cccd5272f5d17691b99d990f0baa711 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testStoreJPAEntityAsVariable.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/variables/jpa/JPAVariableTest.testStoreJPAEntityAsVariable.bpmn20.xml
@@ -2,7 +2,8 @@
 <definitions id="taskAssigneeExample" 
   xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	targetNamespace="http://www.activiti.org/bpmn2.0">
+  xmlns:activiti="http://activiti.org/bpmn-extensions"
+  targetNamespace="http://www.activiti.org/bpmn2.0">
 	
   <process id="JPAVariableProcess" name="Process containing JPA varaibles">
   
diff --git a/userguide/src/en/chapters/ch07-BPMN.xml b/userguide/src/en/chapters/ch07-BPMN.xml
index 68da7d6fd17ec050bd5bd98a00b5b5b19ffeb172..0eebb98fce85792dddd9afdc4c58da8547df6b5f 100644
--- a/userguide/src/en/chapters/ch07-BPMN.xml
+++ b/userguide/src/en/chapters/ch07-BPMN.xml
@@ -1579,7 +1579,7 @@ public class ToUppercase extends BpmnJavaDelegation {
     name=&quot;Java service invocation&quot; 
     activiti:class=&quot;org.activiti.examples.bpmn.servicetask.ToUpperCaseFieldInjected&quot;&gt;
     <emphasis role="bold">&lt;extensionElements&gt;
-    &lt;activiti:field activiti:name=&quot;text&quot; activiti:stringValue=&quot;Hello World&quot; /&gt;
+    &lt;activiti:field name=&quot;text&quot; stringValue=&quot;Hello World&quot; /&gt;
   &lt;/extensionElements&gt;</emphasis>           
 &lt;/serviceTask&gt;        
           </programlisting>
@@ -1594,7 +1594,7 @@ public class ToUppercase extends BpmnJavaDelegation {
     name=&quot;Java service invocation&quot; 
     activiti:class=&quot;org.activiti.examples.bpmn.servicetask.ToUpperCaseFieldInjected&quot;&gt;
   &lt;extensionElements&gt;   
-    &lt;activiti:field activiti:name=&quot;text&quot;&gt;
+    &lt;activiti:field name=&quot;text&quot;&gt;
         <emphasis role="bold">&lt;activiti:string&gt;
         Hello World
       &lt;/activiti:string&gt;</emphasis>
@@ -1614,10 +1614,10 @@ public class ToUppercase extends BpmnJavaDelegation {
   activiti:class=&quot;org.activiti.examples.bpmn.servicetask.ReverseStringsFieldInjected&quot;&gt;
   
   &lt;extensionElements&gt;
-    &lt;activiti:field activiti:name=&quot;text1&quot;&gt;
+    &lt;activiti:field name=&quot;text1&quot;&gt;
       <emphasis role="bold">&lt;activiti:expression&gt;${genderBean.getGenderString(gender)}&lt;/activiti:expression&gt;</emphasis>
     &lt;/activiti:field&gt;
-    &lt;activiti:field activiti:name=&quot;text2&quot;&gt;
+    &lt;activiti:field name=&quot;text2&quot;&gt;
        <emphasis role="bold">&lt;activiti:expression&gt;Hello ${gender == 'male' ? 'Mr.' : 'Mrs.'} ${name}&lt;/activiti:expression&gt;</emphasis>
     &lt;/activiti:field&gt;
   &lt;/ extensionElements&gt;
@@ -1648,8 +1648,8 @@ public class ReverseStringsFieldInjected extends BpmnJavaDelegation {
   <para>
   Alternatively, you can also set the expressions as an attribute instead of a child-element, to make the XML less verbose.
 <programlisting>
-&lt;activiti:field activiti:name=&quot;text1&quot; <emphasis role="bold">activiti:expression=&quot;${genderBean.getGenderString(gender)}&quot;</emphasis> /&gt;
-&lt;activiti:field activiti:name=&quot;text1&quot; <emphasis role="bold">activiti:expression=&quot;Hello ${gender == 'male' ? 'Mr.' : 'Mrs.'} ${name}&quot;</emphasis> /&gt;
+&lt;activiti:field name=&quot;text1&quot; <emphasis role="bold">expression=&quot;${genderBean.getGenderString(gender)}&quot;</emphasis> /&gt;
+&lt;activiti:field name=&quot;text1&quot; <emphasis role="bold">expression=&quot;Hello ${gender == 'male' ? 'Mr.' : 'Mrs.'} ${name}&quot;</emphasis> /&gt;
 </programlisting>
         </para>
         <para>
@@ -1701,7 +1701,7 @@ public class ReverseStringsFieldInjected extends BpmnJavaDelegation {
   &lt;process id=&quot;eventListenersProcess&quot;&gt;
   
     <emphasis role="bold">&lt;extensionElements&gt;
-      &lt;activiti:listener activiti:class=&quot;org.activiti.examples.bpmn.eventlistener.ExampleEventListenerOne&quot; activiti:eventName=&quot;start&quot; /&gt;
+      &lt;activiti:listener class=&quot;org.activiti.examples.bpmn.eventlistener.ExampleEventListenerOne&quot; eventName=&quot;start&quot; /&gt;
     &lt;/extensionElements&gt;</emphasis>
     
     &lt;startEvent id=&quot;theStart&quot; /&gt;
@@ -1710,13 +1710,13 @@ public class ReverseStringsFieldInjected extends BpmnJavaDelegation {
     &lt;userTask id=&quot;firstTask&quot; /&gt;
     &lt;sequenceFlow sourceRef=&quot;firstTask&quot; targetRef=&quot;secondTask&quot;&gt;
        <emphasis role="bold">&lt;extensionElements&gt;
-        &lt;activiti:listener activiti:class=&quot;org.activiti.examples.bpmn.eventlistener.ExampleEventListenerTwo&quot; /&gt;
+        &lt;activiti:listener class=&quot;org.activiti.examples.bpmn.eventlistener.ExampleEventListenerTwo&quot; /&gt;
       &lt;/extensionElements&gt;</emphasis>
     &lt;/sequenceFlow&gt;
     
     &lt;userTask id=&quot;secondTask&quot; &gt;
       <emphasis role="bold">&lt;extensionElements&gt;
-        &lt;activiti:listener activiti:expression=&quot;${myPojo.myMethod(execution.eventName)}&quot; activiti:eventName=&quot;end&quot; /&gt;
+        &lt;activiti:listener expression=&quot;${myPojo.myMethod(execution.eventName)}&quot; eventName=&quot;end&quot; /&gt;
       &lt;/extensionElements&gt;</emphasis>
     &lt;/userTask&gt;
     &lt;sequenceFlow sourceRef=&quot;secondTask&quot; targetRef=&quot;thirdTask&quot; /&gt;
@@ -1751,7 +1751,7 @@ public class ExampleEventListenerOne implements <emphasis role="bold">EventListe
           a <literal>expression</literal> is defined instead which is evaluated/invoked when the event is fired. 
         </para>
         <programlisting>
-&lt;activiti:listener activiti:expression=&quot;<emphasis role="bold">${myPojo.myMethod(execution.eventName)}</emphasis>&quot; activiti:eventName=&quot;end&quot; /&gt;</programlisting>
+&lt;activiti:listener expression=&quot;<emphasis role="bold">${myPojo.myMethod(execution.eventName)}</emphasis>&quot; eventName=&quot;end&quot; /&gt;</programlisting>
         <para>
           As with other expressions, execution variables are resolved and can be used. Because an eventlistener gets a special kind of execution, an <literal>EventListenerExecution</literal> that is, it's
           possible to pass the event-name to your methods using <literal>execution.eventName</literal>.
@@ -1769,9 +1769,9 @@ public class ExampleEventListenerOne implements <emphasis role="bold">EventListe
         <programlisting>
  &lt;process id=&quot;eventListenersProcess&quot;&gt;
     <emphasis role="bold">&lt;extensionElements&gt;
-      &lt;activiti:listener activiti:class=&quot;org.activiti.examples.bpmn.eventlistener.ExampleFieldInjectedEventListener&quot; activiti:eventName=&quot;start&quot;&gt;
-        &lt;activiti:field activiti:name=&quot;fixedValue&quot; activiti:stringValue=&quot;Yes, I am &quot; /&gt;
-        &lt;activiti:field activiti:name=&quot;dynamicValue&quot; activiti:expression=&quot;${myVar}&quot; /&gt;
+      &lt;activiti:listener class=&quot;org.activiti.examples.bpmn.eventlistener.ExampleFieldInjectedEventListener&quot; eventName=&quot;start&quot;&gt;
+        &lt;activiti:field name=&quot;fixedValue&quot; stringValue=&quot;Yes, I am &quot; /&gt;
+        &lt;activiti:field name=&quot;dynamicValue&quot; expression=&quot;${myVar}&quot; /&gt;
       &lt;/activiti:listener&gt;
     &lt;/extensionElements&gt;</emphasis>
     
@@ -1969,10 +1969,10 @@ public void testEventListenerFieldInjection() {
 		      <programlisting>
 &lt;serviceTask id=&quot;sendMail&quot; activiti:type=&quot;mail&quot;&gt;
   &lt;extensionElements&gt;
-    &lt;activiti:field activiti:name=&quot;from&quot; activiti:stringValue=&quot;order-shipping@thecompany.com&quot; /&gt;
-    &lt;activiti:field activiti:name=&quot;to&quot; activiti:expression=&quot;${recipient}&quot; /&gt;
-    &lt;activiti:field activiti:name=&quot;subject&quot; activiti:expression=&quot;Your order ${orderId} has been shipped&quot; /&gt;
-    &lt;activiti:field activiti:name=&quot;html&quot;&gt;
+    &lt;activiti:field name=&quot;from&quot; stringValue=&quot;order-shipping@thecompany.com&quot; /&gt;
+    &lt;activiti:field name=&quot;to&quot; expression=&quot;${recipient}&quot; /&gt;
+    &lt;activiti:field name=&quot;subject&quot; expression=&quot;Your order ${orderId} has been shipped&quot; /&gt;
+    &lt;activiti:field name=&quot;html&quot;&gt;
       &lt;activiti:expression&gt;
         &lt;![CDATA[
           &lt;html&gt;