diff --git a/example/app.js b/example/app.js
index e0d155e2..2905883c 100644
--- a/example/app.js
+++ b/example/app.js
@@ -14,7 +14,7 @@
 
   var newDiagramXML =
 '<?xml version="1.0" encoding="UTF-8"?>' +
-'<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://activiti.org/bpmn">' +
+'<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn">' +
 '  <bpmn2:process id="Process_1" isExecutable="false">' +
 '    <bpmn2:startEvent id="StartEvent_1"/>' +
 '  </bpmn2:process>' +
diff --git a/test/fixtures/bpmn/collaboration-data-items.bpmn b/test/fixtures/bpmn/collaboration-data-items.bpmn
index 876fa3ba..8ca71f0b 100644
--- a/test/fixtures/bpmn/collaboration-data-items.bpmn
+++ b/test/fixtures/bpmn/collaboration-data-items.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_pHDz0KojEeOJhIBv1RySdg" targetNamespace="http://activiti.org/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_pHDz0KojEeOJhIBv1RySdg" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn2:collaboration id="_Collaboration_2">
     <bpmn2:participant id="Participant_2" name="Pool" processRef="Process_1"/>
     <bpmn2:participant id="Participant_1" name="Pool" processRef="Process_2"/>
diff --git a/test/fixtures/bpmn/collaboration-message-flows.bpmn b/test/fixtures/bpmn/collaboration-message-flows.bpmn
index 49e4c0e3..a8cba171 100644
--- a/test/fixtures/bpmn/collaboration-message-flows.bpmn
+++ b/test/fixtures/bpmn/collaboration-message-flows.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_pHDz0KojEeOJhIBv1RySdg" targetNamespace="http://activiti.org/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_pHDz0KojEeOJhIBv1RySdg" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn2:collaboration id="_Collaboration_2">
     <bpmn2:participant id="Participant_2" name="Pool" processRef="Process_1"/>
     <bpmn2:participant id="Participant_1" name="Pool" processRef="Process_2"/>
diff --git a/test/fixtures/bpmn/collaboration-sequence-flows.bpmn b/test/fixtures/bpmn/collaboration-sequence-flows.bpmn
index 97ace090..2a7bba00 100644
--- a/test/fixtures/bpmn/collaboration-sequence-flows.bpmn
+++ b/test/fixtures/bpmn/collaboration-sequence-flows.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_pHDz0KojEeOJhIBv1RySdg" targetNamespace="http://activiti.org/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_pHDz0KojEeOJhIBv1RySdg" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn2:collaboration id="_Collaboration_2">
     <bpmn2:participant id="Participant_2" name="Pool" processRef="Process_1"/>
   </bpmn2:collaboration>
diff --git a/test/fixtures/bpmn/collaboration.bpmn b/test/fixtures/bpmn/collaboration.bpmn
index 8edd916a..23c91f56 100644
--- a/test/fixtures/bpmn/collaboration.bpmn
+++ b/test/fixtures/bpmn/collaboration.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_pHDz0KojEeOJhIBv1RySdg" targetNamespace="http://activiti.org/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_pHDz0KojEeOJhIBv1RySdg" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn2:collaboration id="_Collaboration_2">
     <bpmn2:participant id="Participant_2" name="Pool" processRef="Process_1"/>
     <bpmn2:participant id="Participant_1" name="Pool" processRef="Process_2"/>
diff --git a/test/fixtures/bpmn/documentation.bpmn b/test/fixtures/bpmn/documentation.bpmn
index 0613e0ce..49c648f2 100644
--- a/test/fixtures/bpmn/documentation.bpmn
+++ b/test/fixtures/bpmn/documentation.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="documentation" targetNamespace="http://activiti.org/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="documentation" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn2:process id="Process_1">
     <bpmn2:documentation>THIS IS A PROCESS</bpmn2:documentation>
     <bpmn2:subProcess id="SubProcess_1" name="Sub Process 1">
diff --git a/test/fixtures/bpmn/empty-definitions-default-ns.bpmn b/test/fixtures/bpmn/empty-definitions-default-ns.bpmn
index 1b2ded25..fbdab2fd 100644
--- a/test/fixtures/bpmn/empty-definitions-default-ns.bpmn
+++ b/test/fixtures/bpmn/empty-definitions-default-ns.bpmn
@@ -1,4 +1,4 @@
 <?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:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="empty-definitions" targetNamespace="http://activiti.org/bpmn">
+<definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="empty-definitions" targetNamespace="http://bpmn.io/schema/bpmn">
   
 </definitions>
\ No newline at end of file
diff --git a/test/fixtures/bpmn/empty-definitions.bpmn b/test/fixtures/bpmn/empty-definitions.bpmn
index 612e177a..ec641f4d 100644
--- a/test/fixtures/bpmn/empty-definitions.bpmn
+++ b/test/fixtures/bpmn/empty-definitions.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
-  id="empty-definitions" targetNamespace="http://activiti.org/bpmn">
+  id="empty-definitions" targetNamespace="http://bpmn.io/schema/bpmn">
   
 </bpmn2:definitions>
\ No newline at end of file
diff --git a/test/fixtures/bpmn/event-references.part.bpmn b/test/fixtures/bpmn/event-references.part.bpmn
index fe7c13c9..78eb1448 100644
--- a/test/fixtures/bpmn/event-references.part.bpmn
+++ b/test/fixtures/bpmn/event-references.part.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:intermediateThrowEvent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" targetNamespace="http://activiti.org/bpmn" id="start">
+<bpmn2:intermediateThrowEvent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" targetNamespace="http://bpmn.io/schema/bpmn" id="start">
   <bpmn2:outgoing>sequenceFlow_1</bpmn2:outgoing>
   <bpmn2:outgoing>sequenceFlow_2</bpmn2:outgoing>
   <bpmn2:incoming>sequenceFlow_3</bpmn2:incoming>
diff --git a/test/fixtures/bpmn/process-associations.bpmn b/test/fixtures/bpmn/process-associations.bpmn
index 3885c74a..55e56441 100644
--- a/test/fixtures/bpmn/process-associations.bpmn
+++ b/test/fixtures/bpmn/process-associations.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="simple" targetNamespace="http://activiti.org/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="simple" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn2:process id="Process_1" isExecutable="false">
     <bpmn2:ioSpecification id="InputOutputSpecification_1">
       <bpmn2:dataInput id="DataInput_1"/>
diff --git a/test/fixtures/bpmn/process-elements.bpmn b/test/fixtures/bpmn/process-elements.bpmn
index e5e91828..f80f140f 100644
--- a/test/fixtures/bpmn/process-elements.bpmn
+++ b/test/fixtures/bpmn/process-elements.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="simple" targetNamespace="http://activiti.org/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="simple" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn2:process id="Process_1" isExecutable="false">
     <bpmn2:ioSpecification id="InputOutputSpecification_1"/>
     <bpmn2:parallelGateway id="ParallelGateway_1">
diff --git a/test/fixtures/bpmn/simple-default-ns.bpmn b/test/fixtures/bpmn/simple-default-ns.bpmn
index 29e2ce31..1dbbff1a 100644
--- a/test/fixtures/bpmn/simple-default-ns.bpmn
+++ b/test/fixtures/bpmn/simple-default-ns.bpmn
@@ -1,5 +1,5 @@
 <?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:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="simple" targetNamespace="http://activiti.org/bpmn">
+<definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="simple" targetNamespace="http://bpmn.io/schema/bpmn">
   <process id="Process_1">
     <subProcess id="SubProcess_1" name="Sub Process 1">
       <startEvent id="StartEvent_1" name="Start Event 1">
diff --git a/test/fixtures/bpmn/simple.bpmn b/test/fixtures/bpmn/simple.bpmn
index 57711e4f..0821952b 100644
--- a/test/fixtures/bpmn/simple.bpmn
+++ b/test/fixtures/bpmn/simple.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="simple" targetNamespace="http://activiti.org/bpmn">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="simple" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn2:process id="Process_1">
     <bpmn2:subProcess id="SubProcess_1" name="Sub Process 1">
       <bpmn2:startEvent id="StartEvent_1" name="Start Event 1">
diff --git a/test/fixtures/bpmn/simple/activities.bpmn b/test/fixtures/bpmn/simple/activities.bpmn
index 2b65bb21..f51828b1 100644
--- a/test/fixtures/bpmn/simple/activities.bpmn
+++ b/test/fixtures/bpmn/simple/activities.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://activiti.org/bpmn">
+<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn:process id="Process_1" isExecutable="false">
     <bpmn:task id="Task_1"/>
     <bpmn:userTask id="UserTask_1"/>
diff --git a/test/fixtures/bpmn/simple/data-items.bpmn b/test/fixtures/bpmn/simple/data-items.bpmn
index 8a1a8b35..4c9f5619 100644
--- a/test/fixtures/bpmn/simple/data-items.bpmn
+++ b/test/fixtures/bpmn/simple/data-items.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://activiti.org/bpmn">
+<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn:process id="Process_1" isExecutable="false">
     <bpmn:ioSpecification id="InputOutputSpecification_1">
       <bpmn:dataInput id="DataInput_1"/>
diff --git a/test/fixtures/bpmn/simple/events.bpmn b/test/fixtures/bpmn/simple/events.bpmn
index 61b45d8a..9324b003 100644
--- a/test/fixtures/bpmn/simple/events.bpmn
+++ b/test/fixtures/bpmn/simple/events.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://activiti.org/bpmn">
+<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn:process id="Process_1" isExecutable="false">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:timerEventDefinition id="TimerEventDefinition_1"/>
diff --git a/test/fixtures/bpmn/simple/gateways.bpmn b/test/fixtures/bpmn/simple/gateways.bpmn
index 7d35fe5f..379577bb 100644
--- a/test/fixtures/bpmn/simple/gateways.bpmn
+++ b/test/fixtures/bpmn/simple/gateways.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://activiti.org/bpmn">
+<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="sample-diagram" targetNamespace="http://bpmn.io/schema/bpmn">
   <bpmn:process id="Process_1" isExecutable="false">
     <bpmn:inclusiveGateway id="InclusiveGateway_1"/>
     <bpmn:exclusiveGateway id="ExclusiveGateway_1"/>
diff --git a/test/spec/browser/ModelSpec.js b/test/spec/browser/ModelSpec.js
index 667cbbd5..357686de 100644
--- a/test/spec/browser/ModelSpec.js
+++ b/test/spec/browser/ModelSpec.js
@@ -19,7 +19,7 @@ describe('Model - browser support', function() {
 
     var xml =
       '<?xml version="1.0" encoding="UTF-8"?>' +
-      '<bpmn2:definitions xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" id="simple" targetNamespace="http://activiti.org/bpmn">' +
+      '<bpmn2:definitions xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" id="simple" targetNamespace="http://bpmn.io/schema/bpmn">' +
         '<bpmn2:process id="Process_1">' +
         '</bpmn2:process>' +
       '</bpmn2:definitions>';
@@ -29,7 +29,7 @@ describe('Model - browser support', function() {
 
       // then
       expect(definitions.id).toBe('simple');
-      expect(definitions.targetNamespace).toBe('http://activiti.org/bpmn');
+      expect(definitions.targetNamespace).toBe('http://bpmn.io/schema/bpmn');
 
       expect(definitions.rootElements.length).toBe(1);
       expect(definitions.rootElements[0].id).toBe('Process_1');
diff --git a/test/spec/node/xml/ReadSpec.js b/test/spec/node/xml/ReadSpec.js
index 9cb72c41..aa6224ac 100644
--- a/test/spec/node/xml/ReadSpec.js
+++ b/test/spec/node/xml/ReadSpec.js
@@ -34,7 +34,7 @@ describe('Model', function() {
         expect(result).toDeepEqual({
           $type: 'bpmn:Definitions',
           id: 'documentation',
-          targetNamespace: 'http://activiti.org/bpmn',
+          targetNamespace: 'http://bpmn.io/schema/bpmn',
           rootElements: [
             {
               $type: 'bpmn:Process',
@@ -185,7 +185,7 @@ describe('Model', function() {
           var expected = {
             $type: 'bpmn:Definitions',
             id: 'empty-definitions',
-            targetNamespace: 'http://activiti.org/bpmn'
+            targetNamespace: 'http://bpmn.io/schema/bpmn'
           };
 
           // then
@@ -205,7 +205,7 @@ describe('Model', function() {
           var expected = {
             $type: 'bpmn:Definitions',
             id: 'empty-definitions',
-            targetNamespace: 'http://activiti.org/bpmn'
+            targetNamespace: 'http://bpmn.io/schema/bpmn'
           };
 
           // then