diff --git a/docs/api/examples/controller_delete_projectsprojectid.txt b/docs/api/examples/controller_delete_projectsprojectid.txt
index fa284bbe..e15e6502 100644
--- a/docs/api/examples/controller_delete_projectsprojectid.txt
+++ b/docs/api/examples/controller_delete_projectsprojectid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:8000/v2/projects/6b927aaf-ecf2-435b-8fe9-95e96cdb670b'
+curl -i -X DELETE 'http://localhost:8000/v2/projects/c5149ad7-dc79-4459-ba67-b9c9d375c96b'
 
-DELETE /v2/projects/6b927aaf-ecf2-435b-8fe9-95e96cdb670b HTTP/1.1
+DELETE /v2/projects/c5149ad7-dc79-4459-ba67-b9c9d375c96b HTTP/1.1
 
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidclose.txt b/docs/api/examples/controller_post_projectsprojectidclose.txt
index ee1e0009..797884f2 100644
--- a/docs/api/examples/controller_post_projectsprojectidclose.txt
+++ b/docs/api/examples/controller_post_projectsprojectidclose.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/855edd35-6086-47d6-831e-0c552fded853/close' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/cfe07358-d459-4866-b3dd-8c4b620786e4/close' -d '{}'
 
-POST /v2/projects/855edd35-6086-47d6-831e-0c552fded853/close HTTP/1.1
+POST /v2/projects/cfe07358-d459-4866-b3dd-8c4b620786e4/close HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidcommit.txt b/docs/api/examples/controller_post_projectsprojectidcommit.txt
index e7325b29..f1a12433 100644
--- a/docs/api/examples/controller_post_projectsprojectidcommit.txt
+++ b/docs/api/examples/controller_post_projectsprojectidcommit.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/839c5602-66fa-4d35-aa3d-53e132a664cf/commit' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a76db5c7-ee1d-471d-919a-fae6a0c141f7/commit' -d '{}'
 
-POST /v2/projects/839c5602-66fa-4d35-aa3d-53e132a664cf/commit HTTP/1.1
+POST /v2/projects/a76db5c7-ee1d-471d-919a-fae6a0c141f7/commit HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/controller_post_projectsprojectidvms.txt b/docs/api/examples/controller_post_projectsprojectidvms.txt
index ae7c1417..181ab3ac 100644
--- a/docs/api/examples/controller_post_projectsprojectidvms.txt
+++ b/docs/api/examples/controller_post_projectsprojectidvms.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/566f5bce-2984-42db-a90b-542cf8a63836/vms' -d '{"hypervisor_id": "example.com", "name": "test", "properties": {"startup_script": "echo test"}, "vm_type": "vpcs"}'
+curl -i -X POST 'http://localhost:8000/v2/projects/f148a73c-257e-4722-ae59-66c6801d90b4/vms' -d '{"hypervisor_id": "example.com", "name": "test", "properties": {"startup_script": "echo test"}, "vm_type": "vpcs"}'
 
-POST /v2/projects/566f5bce-2984-42db-a90b-542cf8a63836/vms HTTP/1.1
+POST /v2/projects/f148a73c-257e-4722-ae59-66c6801d90b4/vms HTTP/1.1
 {
     "hypervisor_id": "example.com",
     "name": "test",
@@ -13,7 +13,7 @@ POST /v2/projects/566f5bce-2984-42db-a90b-542cf8a63836/vms HTTP/1.1
 
 HTTP/1.1 201
 ACCESS-CONTROL-ALLOW-ORIGIN: *
-CONTENT-LENGTH: 448
+CONTENT-LENGTH: 308
 CONTENT-TYPE: application/json
 DATE: Thu, 08 Jan 2015 16:09:15 GMT
 SERVER: Python/3.5 GNS3/1.5.0dev1
@@ -24,14 +24,10 @@ X-ROUTE: /v2/controller/projects/{project_id}/vms
     "console_type": "telnet",
     "hypervisor_id": "example.com",
     "name": "test",
-    "project_id": "566f5bce-2984-42db-a90b-542cf8a63836",
+    "project_id": "f148a73c-257e-4722-ae59-66c6801d90b4",
     "properties": {
-        "console": null,
-        "console_type": "telnet",
-        "name": "test",
-        "startup_script": "echo test",
-        "vm_id": "cfcff9e3-e326-4726-8e5e-5d158dff9c9c"
+        "startup_script": "echo test"
     },
-    "vm_id": "cfcff9e3-e326-4726-8e5e-5d158dff9c9c",
+    "vm_id": "53d0ca05-be36-46ee-894b-5eebdf358d50",
     "vm_type": "vpcs"
 }
diff --git a/docs/api/examples/hypervisor_delete_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_delete_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 13d37144..6980200e 100644
--- a/docs/api/examples/hypervisor_delete_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/hypervisor_delete_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/87b6e8f5-52f6-4968-862a-db9e45ad281c/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/27a3b355-5703-4043-ad45-717b1d3aaa78/adapters/0/ports/0/nio'
 
-DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/87b6e8f5-52f6-4968-862a-db9e45ad281c/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/27a3b355-5703-4043-ad45-717b1d3aaa78/adapters/0/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmid.txt b/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmid.txt
index a6162bd6..b5e618ab 100644
--- a/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmid.txt
+++ b/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/80d9e171-c7df-4edb-bcd3-a2f222a32c4a'
+curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/322f435d-aafe-425b-b7a8-5750facda064'
 
-DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/80d9e171-c7df-4edb-bcd3-a2f222a32c4a HTTP/1.1
+DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/322f435d-aafe-425b-b7a8-5750facda064 HTTP/1.1
 
 
 
diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index fa614f6c..67f7d362 100644
--- a/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/hypervisor_delete_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/7909df2b-0af8-4df8-a4fe-fcc31c981544/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/bb59426b-1a43-4601-81fd-f34ba9ad4298/adapters/1/ports/0/nio'
 
-DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/7909df2b-0af8-4df8-a4fe-fcc31c981544/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/bb59426b-1a43-4601-81fd-f34ba9ad4298/adapters/1/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmid.txt
index 3553f2df..b1225ada 100644
--- a/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmid.txt
+++ b/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/48a31452-829e-4303-87b6-cd1bfad1d01d'
+curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/cba6672f-4c33-4d10-af43-da8ef7ef601b'
 
-DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/48a31452-829e-4303-87b6-cd1bfad1d01d HTTP/1.1
+DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/cba6672f-4c33-4d10-af43-da8ef7ef601b HTTP/1.1
 
 
 
diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 6986acda..06787980 100644
--- a/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/hypervisor_delete_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/453114f8-2f36-4594-b0f2-ca7ac12eb502/adapters/1/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/1ae7f6ea-401a-4656-98de-46fb6023141c/adapters/1/ports/0/nio'
 
-DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/453114f8-2f36-4594-b0f2-ca7ac12eb502/adapters/1/ports/0/nio HTTP/1.1
+DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/1ae7f6ea-401a-4656-98de-46fb6023141c/adapters/1/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 9a275fc6..ecd6558a 100644
--- a/docs/api/examples/hypervisor_delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/hypervisor_delete_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/1091af1e-18a1-4cb5-beed-6837c1326273/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/5dfe3e7d-b7c0-4230-ae82-2b4049ac0758/adapters/0/ports/0/nio'
 
-DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/1091af1e-18a1-4cb5-beed-6837c1326273/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/5dfe3e7d-b7c0-4230-ae82-2b4049ac0758/adapters/0/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmid.txt
index 319ba007..b7612811 100644
--- a/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmid.txt
+++ b/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/dbb9505b-24ab-427f-b619-de233f2b43ba'
+curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/34919513-483a-41f6-92bb-c4c38b5c9d41'
 
-DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/dbb9505b-24ab-427f-b619-de233f2b43ba HTTP/1.1
+DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/34919513-483a-41f6-92bb-c4c38b5c9d41 HTTP/1.1
 
 
 
diff --git a/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index caed531c..bdbe5592 100644
--- a/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/hypervisor_delete_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/5913090e-942b-44b6-9774-8fe61e0741f8/adapters/0/ports/0/nio'
+curl -i -X DELETE 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/111a35fe-c1c9-4938-bef8-5e06d88d0d06/adapters/0/ports/0/nio'
 
-DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/5913090e-942b-44b6-9774-8fe61e0741f8/adapters/0/ports/0/nio HTTP/1.1
+DELETE /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/111a35fe-c1c9-4938-bef8-5e06d88d0d06/adapters/0/ports/0/nio HTTP/1.1
 
 
 
diff --git a/docs/api/examples/hypervisor_get_projects.txt b/docs/api/examples/hypervisor_get_projects.txt
index 5090b7ff..324a016f 100644
--- a/docs/api/examples/hypervisor_get_projects.txt
+++ b/docs/api/examples/hypervisor_get_projects.txt
@@ -15,12 +15,12 @@ X-ROUTE: /v2/hypervisor/projects
 [
     {
         "name": "test",
-        "project_id": "52010203-0405-0607-0809-0a0b0c0d0e0b",
+        "project_id": "51010203-0405-0607-0809-0a0b0c0d0e0f",
         "temporary": false
     },
     {
         "name": "test",
-        "project_id": "51010203-0405-0607-0809-0a0b0c0d0e0f",
+        "project_id": "52010203-0405-0607-0809-0a0b0c0d0e0b",
         "temporary": false
     }
 ]
diff --git a/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmid.txt b/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmid.txt
index d3051e56..61b94954 100644
--- a/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmid.txt
+++ b/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/f2a5ab74-903e-40ff-8c4b-4ffa90e3110a'
+curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/a3f93961-728d-48d1-8c69-21736d3f79af'
 
-GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/f2a5ab74-903e-40ff-8c4b-4ffa90e3110a HTTP/1.1
+GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/a3f93961-728d-48d1-8c69-21736d3f79af HTTP/1.1
 
 
 
@@ -28,6 +28,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}
     "serial_adapters": 2,
     "startup_config": null,
     "use_default_iou_values": true,
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpong6v0ku/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/f2a5ab74-903e-40ff-8c4b-4ffa90e3110a",
-    "vm_id": "f2a5ab74-903e-40ff-8c4b-4ffa90e3110a"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3892e7sw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/a3f93961-728d-48d1-8c69-21736d3f79af",
+    "vm_id": "a3f93961-728d-48d1-8c69-21736d3f79af"
 }
diff --git a/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmidconfigs.txt b/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmidconfigs.txt
index 4a4b12c1..16429e9c 100644
--- a/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmidconfigs.txt
+++ b/docs/api/examples/hypervisor_get_projectsprojectidiouvmsvmidconfigs.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/421ed22b-15a4-493e-a090-d25c6d016fa8/configs'
+curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/3409583e-9e0e-4826-ba8e-4a2e2780a2f2/configs'
 
-GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/421ed22b-15a4-493e-a090-d25c6d016fa8/configs HTTP/1.1
+GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/3409583e-9e0e-4826-ba8e-4a2e2780a2f2/configs HTTP/1.1
 
 
 
diff --git a/docs/api/examples/hypervisor_get_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/hypervisor_get_projectsprojectidqemuvmsvmid.txt
index 170de4d1..e357c25e 100644
--- a/docs/api/examples/hypervisor_get_projectsprojectidqemuvmsvmid.txt
+++ b/docs/api/examples/hypervisor_get_projectsprojectidqemuvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/807d1ab6-77c4-420c-9cef-e0ff8593335d'
+curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/28fd6e33-802a-48b3-8f35-f7bf6ef46223'
 
-GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/807d1ab6-77c4-420c-9cef-e0ff8593335d HTTP/1.1
+GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/28fd6e33-802a-48b3-8f35-f7bf6ef46223 HTTP/1.1
 
 
 
@@ -42,15 +42,15 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:00:ab:33:5d:00",
+    "mac_address": "00:00:ab:62:23:00",
     "name": "PC TEST 1",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprb55n51b/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzgyp4bar/qemu-system-x86_64",
     "ram": 256,
     "usage": "",
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpge9bdv6k/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/807d1ab6-77c4-420c-9cef-e0ff8593335d",
-    "vm_id": "807d1ab6-77c4-420c-9cef-e0ff8593335d"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwpxcihas/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/28fd6e33-802a-48b3-8f35-f7bf6ef46223",
+    "vm_id": "28fd6e33-802a-48b3-8f35-f7bf6ef46223"
 }
diff --git a/docs/api/examples/hypervisor_get_projectsprojectidvirtualboxvmsvmid.txt b/docs/api/examples/hypervisor_get_projectsprojectidvirtualboxvmsvmid.txt
index 7c78bdb4..32bccf64 100644
--- a/docs/api/examples/hypervisor_get_projectsprojectidvirtualboxvmsvmid.txt
+++ b/docs/api/examples/hypervisor_get_projectsprojectidvirtualboxvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/2b155a42-44ab-444a-b56a-8666c03cd52e'
+curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/782719f6-0702-4901-b7fd-2dd13ccdca85'
 
-GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/2b155a42-44ab-444a-b56a-8666c03cd52e HTTP/1.1
+GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/782719f6-0702-4901-b7fd-2dd13ccdca85 HTTP/1.1
 
 
 
@@ -24,6 +24,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}
     "ram": 0,
     "use_any_adapter": false,
     "vm_directory": null,
-    "vm_id": "2b155a42-44ab-444a-b56a-8666c03cd52e",
+    "vm_id": "782719f6-0702-4901-b7fd-2dd13ccdca85",
     "vmname": "VMTEST"
 }
diff --git a/docs/api/examples/hypervisor_get_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/hypervisor_get_projectsprojectidvpcsvmsvmid.txt
index 61273451..9de22f7c 100644
--- a/docs/api/examples/hypervisor_get_projectsprojectidvpcsvmsvmid.txt
+++ b/docs/api/examples/hypervisor_get_projectsprojectidvpcsvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/77ae4666-c2fa-47ab-811a-98c94f189851'
+curl -i -X GET 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/20957935-f2c1-4227-8e26-7a5dafe5262c'
 
-GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/77ae4666-c2fa-47ab-811a-98c94f189851 HTTP/1.1
+GET /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/20957935-f2c1-4227-8e26-7a5dafe5262c HTTP/1.1
 
 
 
@@ -21,6 +21,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}
     "startup_script": null,
     "startup_script_path": null,
     "status": "stopped",
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpge9bdv6k/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/77ae4666-c2fa-47ab-811a-98c94f189851",
-    "vm_id": "77ae4666-c2fa-47ab-811a-98c94f189851"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwpxcihas/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/20957935-f2c1-4227-8e26-7a5dafe5262c",
+    "vm_id": "20957935-f2c1-4227-8e26-7a5dafe5262c"
 }
diff --git a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 846d87a3..d0bbcb57 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/d5dfbcac-9674-4174-b8cc-2e0c18b9561c/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/7dcd5672-7370-4184-806f-3a56c8c7b126/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/d5dfbcac-9674-4174-b8cc-2e0c18b9561c/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/7dcd5672-7370-4184-806f-3a56c8c7b126/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
diff --git a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt
index 7c5907cd..f1d00b50 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/f8be7579-f78a-4354-b756-8b7a79b662fa/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/d7ef4cdc-8a55-4dd4-a7f8-6c870d87cd2c/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/f8be7579-f78a-4354-b756-8b7a79b662fa/adapters/0/ports/0/start_capture HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/d7ef4cdc-8a55-4dd4-a7f8-6c870d87cd2c/adapters/0/ports/0/start_capture HTTP/1.1
 {
     "capture_file_name": "test.pcap",
     "data_link_type": "DLT_EN10MB"
@@ -16,5 +16,5 @@ SERVER: Python/3.5 GNS3/1.5.0dev1
 X-ROUTE: /v2/hypervisor/projects/{project_id}/docker/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
 
 {
-    "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpong6v0ku/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap"
+    "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3892e7sw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap"
 }
diff --git a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt
index 0609958b..b9a33429 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/881fda5f-5042-4056-88dd-1645e92bb2be/adapters/0/ports/0/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/92513183-d868-49fa-99ff-70ca34e91aac/adapters/0/ports/0/stop_capture' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/881fda5f-5042-4056-88dd-1645e92bb2be/adapters/0/ports/0/stop_capture HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/92513183-d868-49fa-99ff-70ca34e91aac/adapters/0/ports/0/stop_capture HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvms.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvms.txt
index cf7f798b..e1f7f975 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidiouvms.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvms.txt
@@ -1,11 +1,11 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms' -d '{"name": "PC TEST 1", "path": "iou.bin", "startup_config_content": "hostname test", "vm_id": "86f8c1f6-6f82-4223-aadd-c217c459a71a"}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms' -d '{"name": "PC TEST 1", "path": "iou.bin", "startup_config_content": "hostname test", "vm_id": "978c5908-e8f3-4d4e-8013-07abfb7f49a7"}'
 
 POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms HTTP/1.1
 {
     "name": "PC TEST 1",
     "path": "iou.bin",
     "startup_config_content": "hostname test",
-    "vm_id": "86f8c1f6-6f82-4223-aadd-c217c459a71a"
+    "vm_id": "978c5908-e8f3-4d4e-8013-07abfb7f49a7"
 }
 
 
@@ -33,6 +33,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms
     "serial_adapters": 2,
     "startup_config": "startup-config.cfg",
     "use_default_iou_values": true,
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpong6v0ku/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/86f8c1f6-6f82-4223-aadd-c217c459a71a",
-    "vm_id": "86f8c1f6-6f82-4223-aadd-c217c459a71a"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3892e7sw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/978c5908-e8f3-4d4e-8013-07abfb7f49a7",
+    "vm_id": "978c5908-e8f3-4d4e-8013-07abfb7f49a7"
 }
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 4e8c2381..2ffebd22 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/1fd1feb1-9986-43d7-b00e-cf10d89f9462/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_generic_ethernet"}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b0f5aa35-9ed4-4955-850f-3fb2bfdac794/adapters/1/ports/0/nio' -d '{"ethernet_device": "bridge0", "type": "nio_generic_ethernet"}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/1fd1feb1-9986-43d7-b00e-cf10d89f9462/adapters/1/ports/0/nio HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b0f5aa35-9ed4-4955-850f-3fb2bfdac794/adapters/1/ports/0/nio HTTP/1.1
 {
     "ethernet_device": "bridge0",
     "type": "nio_generic_ethernet"
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt
index eba04f2d..8cf433ab 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstartcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/15309d2a-b197-4712-9ce8-121f87829548/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/319027e4-2f0b-4b68-91a1-bcf9300ae50b/adapters/0/ports/0/start_capture' -d '{"capture_file_name": "test.pcap", "data_link_type": "DLT_EN10MB"}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/15309d2a-b197-4712-9ce8-121f87829548/adapters/0/ports/0/start_capture HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/319027e4-2f0b-4b68-91a1-bcf9300ae50b/adapters/0/ports/0/start_capture HTTP/1.1
 {
     "capture_file_name": "test.pcap",
     "data_link_type": "DLT_EN10MB"
@@ -16,5 +16,5 @@ SERVER: Python/3.5 GNS3/1.5.0dev1
 X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/start_capture
 
 {
-    "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpong6v0ku/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap"
+    "pcap_file_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3892e7sw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/captures/test.pcap"
 }
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt
index 4a6837f6..1133701e 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidadaptersadapternumberdportsportnumberdstopcapture.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/406cbdd0-7e36-4202-8c6f-0dfdaec15a53/adapters/0/ports/0/stop_capture' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/a36a65d3-7249-4b1d-8ad6-abba742d67b5/adapters/0/ports/0/stop_capture' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/406cbdd0-7e36-4202-8c6f-0dfdaec15a53/adapters/0/ports/0/stop_capture HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/a36a65d3-7249-4b1d-8ad6-abba742d67b5/adapters/0/ports/0/stop_capture HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidreload.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidreload.txt
index c597e9cb..93731e91 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidreload.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidreload.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/e28b308f-c369-4844-8780-d21a472d5198/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/3ab5f6eb-f77f-4c63-b61b-0dcade61fa0e/reload' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/e28b308f-c369-4844-8780-d21a472d5198/reload HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/3ab5f6eb-f77f-4c63-b61b-0dcade61fa0e/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstart.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstart.txt
index 71fd22ab..159be436 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstart.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstart.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/5ed5c17a-5f52-4e55-89d5-f67365666b9f/start' -d '{"iourc_content": "test"}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b461a1a4-dd42-4753-9204-66578013cc02/start' -d '{"iourc_content": "test"}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/5ed5c17a-5f52-4e55-89d5-f67365666b9f/start HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/b461a1a4-dd42-4753-9204-66578013cc02/start HTTP/1.1
 {
     "iourc_content": "test"
 }
@@ -18,7 +18,7 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/start
     "command_line": "",
     "console": 2001,
     "ethernet_adapters": 2,
-    "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpbrzzmh2h/iourc",
+    "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpxo9kvejs/iourc",
     "l1_keepalives": false,
     "md5sum": null,
     "name": "PC TEST 1",
@@ -30,6 +30,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}/start
     "serial_adapters": 2,
     "startup_config": null,
     "use_default_iou_values": true,
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpong6v0ku/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/5ed5c17a-5f52-4e55-89d5-f67365666b9f",
-    "vm_id": "5ed5c17a-5f52-4e55-89d5-f67365666b9f"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3892e7sw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/b461a1a4-dd42-4753-9204-66578013cc02",
+    "vm_id": "b461a1a4-dd42-4753-9204-66578013cc02"
 }
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstop.txt b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstop.txt
index e40e0e51..204eab1e 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstop.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidiouvmsvmidstop.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/9ec8b27f-fb08-4632-9e1b-535879aee4d8/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/70c7c9f7-ad51-45b0-baff-c28b73104f7f/stop' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/9ec8b27f-fb08-4632-9e1b-535879aee4d8/stop HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/70c7c9f7-ad51-45b0-baff-c28b73104f7f/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvms.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvms.txt
index ed5213dc..2f54d22c 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvms.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvms.txt
@@ -1,10 +1,10 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms' -d '{"hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprb55n51b/qemu-system-x86_64", "ram": 1024}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms' -d '{"hda_disk_image": "linux\u8f7d.img", "name": "PC TEST 1", "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzgyp4bar/qemu-system-x86_64", "ram": 1024}'
 
 POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms HTTP/1.1
 {
     "hda_disk_image": "linux\u8f7d.img",
     "name": "PC TEST 1",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprb55n51b/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzgyp4bar/qemu-system-x86_64",
     "ram": 1024
 }
 
@@ -47,15 +47,15 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:00:ab:b2:75:00",
+    "mac_address": "00:00:ab:98:21:00",
     "name": "PC TEST 1",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprb55n51b/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzgyp4bar/qemu-system-x86_64",
     "ram": 1024,
     "usage": "",
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpge9bdv6k/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/2a562347-5729-4e7a-9e46-36708a09b275",
-    "vm_id": "2a562347-5729-4e7a-9e46-36708a09b275"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwpxcihas/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/9354f939-7df5-4b1f-b844-6b967bc49821",
+    "vm_id": "9354f939-7df5-4b1f-b844-6b967bc49821"
 }
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 2d5676bf..945dfb56 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/c71cd3af-a257-4e58-9996-5fef07d04a93/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_generic_ethernet"}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/8a47d387-f4b3-4d9e-a1d8-75b5b21480d5/adapters/1/ports/0/nio' -d '{"ethernet_device": "eth0", "type": "nio_generic_ethernet"}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/c71cd3af-a257-4e58-9996-5fef07d04a93/adapters/1/ports/0/nio HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/8a47d387-f4b3-4d9e-a1d8-75b5b21480d5/adapters/1/ports/0/nio HTTP/1.1
 {
     "ethernet_device": "eth0",
     "type": "nio_generic_ethernet"
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidreload.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidreload.txt
index 2d9ed3c7..81031b45 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidreload.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidreload.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/26508bc2-f2f1-4c93-884d-13eee107db82/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/b1bdef11-4e86-486d-ae9e-78c7e9de7a6a/reload' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/26508bc2-f2f1-4c93-884d-13eee107db82/reload HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/b1bdef11-4e86-486d-ae9e-78c7e9de7a6a/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidresume.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidresume.txt
index 928c77e1..d9f05b91 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidresume.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidresume.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/05e69885-44f7-4280-97ef-00783a699731/resume' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/ba90f457-3937-462e-9c84-cd75f4397920/resume' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/05e69885-44f7-4280-97ef-00783a699731/resume HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/ba90f457-3937-462e-9c84-cd75f4397920/resume HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstart.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstart.txt
index 362e2b2d..63e18762 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstart.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstart.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a94b06d4-21fb-4a06-8a27-ef4e02b5c928/start' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/f3b578c6-f46a-40bc-80c2-ba5d93bae6f2/start' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/a94b06d4-21fb-4a06-8a27-ef4e02b5c928/start HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/f3b578c6-f46a-40bc-80c2-ba5d93bae6f2/start HTTP/1.1
 {}
 
 
@@ -42,15 +42,15 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}/start
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:00:ab:c9:28:00",
+    "mac_address": "00:00:ab:e6:f2:00",
     "name": "PC TEST 1",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprb55n51b/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzgyp4bar/qemu-system-x86_64",
     "ram": 256,
     "usage": "",
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpge9bdv6k/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/a94b06d4-21fb-4a06-8a27-ef4e02b5c928",
-    "vm_id": "a94b06d4-21fb-4a06-8a27-ef4e02b5c928"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwpxcihas/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/f3b578c6-f46a-40bc-80c2-ba5d93bae6f2",
+    "vm_id": "f3b578c6-f46a-40bc-80c2-ba5d93bae6f2"
 }
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstop.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstop.txt
index 6cb702ac..f43673e1 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstop.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidstop.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/5fbd801d-133a-4add-8465-d5ae7cdcb933/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/525e6728-e35c-4355-b756-1dc0783aeacb/stop' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/5fbd801d-133a-4add-8465-d5ae7cdcb933/stop HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/525e6728-e35c-4355-b756-1dc0783aeacb/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidsuspend.txt b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidsuspend.txt
index 361da2f6..af9ab7de 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidsuspend.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidqemuvmsvmidsuspend.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/6d38eb85-1ab6-49e2-8cca-6df380fdc5d9/suspend' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/ee6d9557-df7e-4199-a732-9f9a6c972059/suspend' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/6d38eb85-1ab6-49e2-8cca-6df380fdc5d9/suspend HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/ee6d9557-df7e-4199-a732-9f9a6c972059/suspend HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvms.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvms.txt
index fbf560ec..01f849f9 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvms.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvms.txt
@@ -28,6 +28,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms
     "ram": 0,
     "use_any_adapter": false,
     "vm_directory": null,
-    "vm_id": "26b8e9d6-ab95-402b-b4de-71a58bf494ec",
+    "vm_id": "c7514ca3-c181-48f4-b654-59d1a6977c4e",
     "vmname": "VM1"
 }
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 0a3dd238..fab5d002 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/b04cf3a5-47d9-4774-bdd1-bbc2d1603b11/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/f821cce6-1766-4469-addc-7dc60b0d351d/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/b04cf3a5-47d9-4774-bdd1-bbc2d1603b11/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/f821cce6-1766-4469-addc-7dc60b0d351d/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidreload.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidreload.txt
index 58764ec4..ebe58a58 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidreload.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidreload.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/be93b199-0899-4a52-ad12-d4da5b91ce09/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/7314ec94-0252-4d7b-b0c8-bcb564f610d7/reload' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/be93b199-0899-4a52-ad12-d4da5b91ce09/reload HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/7314ec94-0252-4d7b-b0c8-bcb564f610d7/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidresume.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidresume.txt
index 53453d74..7a74a5ae 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidresume.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidresume.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c64da5ad-41cb-407e-9011-b202ae9d4357/resume' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/b01533e2-2a33-4e27-b4f3-221be5bdcfe7/resume' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c64da5ad-41cb-407e-9011-b202ae9d4357/resume HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/b01533e2-2a33-4e27-b4f3-221be5bdcfe7/resume HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstart.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstart.txt
index 781631f3..3fcfe397 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstart.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstart.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/64ea5509-f355-4ba9-a9f8-d55e89603ee1/start' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c0374b01-1241-47d5-b262-493ca900536e/start' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/64ea5509-f355-4ba9-a9f8-d55e89603ee1/start HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/c0374b01-1241-47d5-b262-493ca900536e/start HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstop.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstop.txt
index 53747c76..87e13cf8 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstop.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidstop.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/171b367d-9a55-4475-b2c1-b43a1702d3f8/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/4f3b33f3-5804-42dd-bba2-0869281427fb/stop' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/171b367d-9a55-4475-b2c1-b43a1702d3f8/stop HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/4f3b33f3-5804-42dd-bba2-0869281427fb/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidsuspend.txt b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidsuspend.txt
index 4ec184aa..2eeefcb1 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidsuspend.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvirtualboxvmsvmidsuspend.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/a8bba536-a839-4dea-a3d5-2a7a5eab414c/suspend' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/3d93b210-f1b4-4f3b-9e99-256e91f65d3c/suspend' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/a8bba536-a839-4dea-a3d5-2a7a5eab414c/suspend HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/3d93b210-f1b4-4f3b-9e99-256e91f65d3c/suspend HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvms.txt b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvms.txt
index 5e4087d0..3246c606 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvms.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvms.txt
@@ -23,6 +23,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms
     "startup_script": null,
     "startup_script_path": null,
     "status": "stopped",
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpge9bdv6k/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/7a52ca04-52bc-4c34-8d13-faec4ad986ba",
-    "vm_id": "7a52ca04-52bc-4c34-8d13-faec4ad986ba"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwpxcihas/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/38283e01-1edd-4b19-a8d3-4eebca4bb5dd",
+    "vm_id": "38283e01-1edd-4b19-a8d3-4eebca4bb5dd"
 }
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt
index 881a7b8b..6498adb8 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidadaptersadapternumberdportsportnumberdnio.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/7ace768d-7da0-43c2-adc3-d32612cb611d/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/ce08f66c-a777-49c5-9120-70b4d31022cc/adapters/0/ports/0/nio' -d '{"lport": 4242, "rhost": "127.0.0.1", "rport": 4343, "type": "nio_udp"}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/7ace768d-7da0-43c2-adc3-d32612cb611d/adapters/0/ports/0/nio HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/ce08f66c-a777-49c5-9120-70b4d31022cc/adapters/0/ports/0/nio HTTP/1.1
 {
     "lport": 4242,
     "rhost": "127.0.0.1",
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidreload.txt b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidreload.txt
index 3072e793..7a0cf4b3 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidreload.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidreload.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/2343b2eb-d3a3-4f40-b3d2-80ca7ea2d966/reload' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/9be53e38-2c7c-4a33-a911-59dc01094af1/reload' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/2343b2eb-d3a3-4f40-b3d2-80ca7ea2d966/reload HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/9be53e38-2c7c-4a33-a911-59dc01094af1/reload HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstart.txt b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstart.txt
index b6187677..1c1437ca 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstart.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstart.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/db79677d-d897-4332-827f-a81d4fcd0525/start' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/d4c125ad-b552-4143-bab9-72178d969e9f/start' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/db79677d-d897-4332-827f-a81d4fcd0525/start HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/d4c125ad-b552-4143-bab9-72178d969e9f/start HTTP/1.1
 {}
 
 
@@ -21,6 +21,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}/start
     "startup_script": null,
     "startup_script_path": null,
     "status": "stopped",
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpge9bdv6k/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/db79677d-d897-4332-827f-a81d4fcd0525",
-    "vm_id": "db79677d-d897-4332-827f-a81d4fcd0525"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwpxcihas/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/d4c125ad-b552-4143-bab9-72178d969e9f",
+    "vm_id": "d4c125ad-b552-4143-bab9-72178d969e9f"
 }
diff --git a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstop.txt b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstop.txt
index ff0799d6..f90894fb 100644
--- a/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstop.txt
+++ b/docs/api/examples/hypervisor_post_projectsprojectidvpcsvmsvmidstop.txt
@@ -1,6 +1,6 @@
-curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/09df4443-8748-4aad-974d-ea4e01ff639c/stop' -d '{}'
+curl -i -X POST 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/30a28372-08e1-4428-a1e4-60e5273fb195/stop' -d '{}'
 
-POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/09df4443-8748-4aad-974d-ea4e01ff639c/stop HTTP/1.1
+POST /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/30a28372-08e1-4428-a1e4-60e5273fb195/stop HTTP/1.1
 {}
 
 
diff --git a/docs/api/examples/hypervisor_put_projectsprojectid.txt b/docs/api/examples/hypervisor_put_projectsprojectid.txt
index 874f540c..2c754da7 100644
--- a/docs/api/examples/hypervisor_put_projectsprojectid.txt
+++ b/docs/api/examples/hypervisor_put_projectsprojectid.txt
@@ -1,9 +1,9 @@
-curl -i -X PUT 'http://localhost:8000/v2/projects/90010203-0405-0607-0809-0a0b0c0d0e0b' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-297/test_update_path_project_non_l0"}'
+curl -i -X PUT 'http://localhost:8000/v2/projects/90010203-0405-0607-0809-0a0b0c0d0e0b' -d '{"name": "second_name", "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-301/test_update_path_project_non_l0"}'
 
 PUT /v2/projects/90010203-0405-0607-0809-0a0b0c0d0e0b HTTP/1.1
 {
     "name": "second_name",
-    "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-297/test_update_path_project_non_l0"
+    "path": "/private/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/pytest-of-noplay/pytest-301/test_update_path_project_non_l0"
 }
 
 
diff --git a/docs/api/examples/hypervisor_put_projectsprojectiddockervmsvmid.txt b/docs/api/examples/hypervisor_put_projectsprojectiddockervmsvmid.txt
index 9ba3bed9..d9e819d8 100644
--- a/docs/api/examples/hypervisor_put_projectsprojectiddockervmsvmid.txt
+++ b/docs/api/examples/hypervisor_put_projectsprojectiddockervmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/00569de4-466d-4770-874a-c220c57098a9' -d '{"console": 2003, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}'
+curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/fa63fd04-e5e0-49ca-badd-6565381f5126' -d '{"console": 2003, "environment": "GNS3=1\nGNS4=0", "name": "test", "start_command": "yes"}'
 
-PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/00569de4-466d-4770-874a-c220c57098a9 HTTP/1.1
+PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/docker/vms/fa63fd04-e5e0-49ca-badd-6565381f5126 HTTP/1.1
 {
     "console": 2003,
     "environment": "GNS3=1\nGNS4=0",
@@ -28,6 +28,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/docker/vms/{vm_id}
     "name": "test",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
     "start_command": "yes",
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpong6v0ku/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/docker/00569de4-466d-4770-874a-c220c57098a9",
-    "vm_id": "00569de4-466d-4770-874a-c220c57098a9"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3892e7sw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/docker/fa63fd04-e5e0-49ca-badd-6565381f5126",
+    "vm_id": "fa63fd04-e5e0-49ca-badd-6565381f5126"
 }
diff --git a/docs/api/examples/hypervisor_put_projectsprojectidiouvmsvmid.txt b/docs/api/examples/hypervisor_put_projectsprojectidiouvmsvmid.txt
index 67b86917..d1c57d0f 100644
--- a/docs/api/examples/hypervisor_put_projectsprojectidiouvmsvmid.txt
+++ b/docs/api/examples/hypervisor_put_projectsprojectidiouvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/a3417300-12a5-4ae4-b208-0ff773a961d2' -d '{"console": 2002, "ethernet_adapters": 4, "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "startup_config_content": "hostname test", "use_default_iou_values": true}'
+curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/7356b23a-8c35-458c-b1f7-480d708d1028' -d '{"console": 2002, "ethernet_adapters": 4, "iourc_content": "test", "l1_keepalives": true, "name": "test", "nvram": 2048, "ram": 512, "serial_adapters": 0, "startup_config_content": "hostname test", "use_default_iou_values": true}'
 
-PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/a3417300-12a5-4ae4-b208-0ff773a961d2 HTTP/1.1
+PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/iou/vms/7356b23a-8c35-458c-b1f7-480d708d1028 HTTP/1.1
 {
     "console": 2002,
     "ethernet_adapters": 4,
@@ -27,7 +27,7 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}
     "command_line": "",
     "console": 2002,
     "ethernet_adapters": 4,
-    "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp9cd5ft6m/iourc",
+    "iourc_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzzq34lkn/iourc",
     "l1_keepalives": true,
     "md5sum": null,
     "name": "test",
@@ -39,6 +39,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/iou/vms/{vm_id}
     "serial_adapters": 0,
     "startup_config": "startup-config.cfg",
     "use_default_iou_values": true,
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpong6v0ku/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/a3417300-12a5-4ae4-b208-0ff773a961d2",
-    "vm_id": "a3417300-12a5-4ae4-b208-0ff773a961d2"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmp3892e7sw/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/iou/7356b23a-8c35-458c-b1f7-480d708d1028",
+    "vm_id": "7356b23a-8c35-458c-b1f7-480d708d1028"
 }
diff --git a/docs/api/examples/hypervisor_put_projectsprojectidqemuvmsvmid.txt b/docs/api/examples/hypervisor_put_projectsprojectidqemuvmsvmid.txt
index 4e2ff244..bce71feb 100644
--- a/docs/api/examples/hypervisor_put_projectsprojectidqemuvmsvmid.txt
+++ b/docs/api/examples/hypervisor_put_projectsprojectidqemuvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/1f6949d7-52ae-49b8-ba29-ddedc199f059' -d '{"console": 2002, "hdb_disk_image": "linux.img", "name": "test", "ram": 1024}'
+curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/798ce957-6223-400f-92f0-47c22e613e10' -d '{"console": 2002, "hdb_disk_image": "linux.img", "name": "test", "ram": 1024}'
 
-PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/1f6949d7-52ae-49b8-ba29-ddedc199f059 HTTP/1.1
+PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/qemu/vms/798ce957-6223-400f-92f0-47c22e613e10 HTTP/1.1
 {
     "console": 2002,
     "hdb_disk_image": "linux.img",
@@ -47,15 +47,15 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/qemu/vms/{vm_id}
     "kernel_image": "",
     "kernel_image_md5sum": null,
     "legacy_networking": false,
-    "mac_address": "00:00:ab:f0:59:00",
+    "mac_address": "00:00:ab:3e:10:00",
     "name": "test",
     "options": "",
     "platform": "x86_64",
     "process_priority": "low",
     "project_id": "a1e920ca-338a-4e9f-b363-aa607b09dd80",
-    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmprb55n51b/qemu-system-x86_64",
+    "qemu_path": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpzgyp4bar/qemu-system-x86_64",
     "ram": 1024,
     "usage": "",
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpge9bdv6k/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/1f6949d7-52ae-49b8-ba29-ddedc199f059",
-    "vm_id": "1f6949d7-52ae-49b8-ba29-ddedc199f059"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwpxcihas/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/qemu/798ce957-6223-400f-92f0-47c22e613e10",
+    "vm_id": "798ce957-6223-400f-92f0-47c22e613e10"
 }
diff --git a/docs/api/examples/hypervisor_put_projectsprojectidvirtualboxvmsvmid.txt b/docs/api/examples/hypervisor_put_projectsprojectidvirtualboxvmsvmid.txt
index ea22e17c..f4aeb935 100644
--- a/docs/api/examples/hypervisor_put_projectsprojectidvirtualboxvmsvmid.txt
+++ b/docs/api/examples/hypervisor_put_projectsprojectidvirtualboxvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/cfe3fc5d-7f24-4f0f-970b-eca30450e836' -d '{"console": 2011, "name": "test"}'
+curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/bc477676-992e-4e39-9caa-d28a91ea1b22' -d '{"console": 2011, "name": "test"}'
 
-PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/cfe3fc5d-7f24-4f0f-970b-eca30450e836 HTTP/1.1
+PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/virtualbox/vms/bc477676-992e-4e39-9caa-d28a91ea1b22 HTTP/1.1
 {
     "console": 2011,
     "name": "test"
@@ -27,6 +27,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/virtualbox/vms/{vm_id}
     "ram": 0,
     "use_any_adapter": false,
     "vm_directory": null,
-    "vm_id": "cfe3fc5d-7f24-4f0f-970b-eca30450e836",
+    "vm_id": "bc477676-992e-4e39-9caa-d28a91ea1b22",
     "vmname": "VMTEST"
 }
diff --git a/docs/api/examples/hypervisor_put_projectsprojectidvpcsvmsvmid.txt b/docs/api/examples/hypervisor_put_projectsprojectidvpcsvmsvmid.txt
index 73bb4885..2f8026d2 100644
--- a/docs/api/examples/hypervisor_put_projectsprojectidvpcsvmsvmid.txt
+++ b/docs/api/examples/hypervisor_put_projectsprojectidvpcsvmsvmid.txt
@@ -1,6 +1,6 @@
-curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/226440e0-9252-45be-b756-8618e4f7c499' -d '{"console": 2012, "name": "test", "startup_script": "ip 192.168.1.1"}'
+curl -i -X PUT 'http://localhost:8000/v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/15b3cc5d-cb8c-41d3-9637-68ac36185f34' -d '{"console": 2012, "name": "test", "startup_script": "ip 192.168.1.1"}'
 
-PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/226440e0-9252-45be-b756-8618e4f7c499 HTTP/1.1
+PUT /v2/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/vpcs/vms/15b3cc5d-cb8c-41d3-9637-68ac36185f34 HTTP/1.1
 {
     "console": 2012,
     "name": "test",
@@ -25,6 +25,6 @@ X-ROUTE: /v2/hypervisor/projects/{project_id}/vpcs/vms/{vm_id}
     "startup_script": "ip 192.168.1.1",
     "startup_script_path": "startup.vpc",
     "status": "stopped",
-    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpge9bdv6k/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/226440e0-9252-45be-b756-8618e4f7c499",
-    "vm_id": "226440e0-9252-45be-b756-8618e4f7c499"
+    "vm_directory": "/var/folders/3s/r2wbv07n7wg4vrsn874lmxxh0000gn/T/tmpwpxcihas/projects/a1e920ca-338a-4e9f-b363-aa607b09dd80/project-files/vpcs/15b3cc5d-cb8c-41d3-9637-68ac36185f34",
+    "vm_id": "15b3cc5d-cb8c-41d3-9637-68ac36185f34"
 }
diff --git a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsid.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsid.rst
index 51ce15bb..25f3afbf 100644
--- a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsid.rst
+++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsid.rst
@@ -9,8 +9,8 @@ Delete a Docker container
 
 Parameters
 **********
-- **project_id**: UUID for the project
 - **id**: ID for the container
+- **project_id**: UUID for the project
 
 Response status codes
 **********************
diff --git a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidreload.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidreload.rst
index 7ee62540..e47f6bb4 100644
--- a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidreload.rst
+++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidreload.rst
@@ -9,8 +9,8 @@ Restart a Docker container
 
 Parameters
 **********
-- **project_id**: UUID of the project
 - **id**: ID of the container
+- **project_id**: UUID of the project
 
 Response status codes
 **********************
diff --git a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstart.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstart.rst
index 3ec44fe7..730692bc 100644
--- a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstart.rst
+++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstart.rst
@@ -9,8 +9,8 @@ Start a Docker container
 
 Parameters
 **********
-- **project_id**: UUID of the project
 - **id**: ID of the container
+- **project_id**: UUID of the project
 
 Response status codes
 **********************
diff --git a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstop.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstop.rst
index 87de4a3b..58c1ca3c 100644
--- a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstop.rst
+++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidstop.rst
@@ -9,8 +9,8 @@ Stop a Docker container
 
 Parameters
 **********
-- **project_id**: UUID of the project
 - **id**: ID of the container
+- **project_id**: UUID of the project
 
 Response status codes
 **********************
diff --git a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidsuspend.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidsuspend.rst
index a5bb8678..120a7010 100644
--- a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidsuspend.rst
+++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsidsuspend.rst
@@ -9,8 +9,8 @@ Pause a Docker container
 
 Parameters
 **********
-- **project_id**: UUID of the project
 - **id**: ID of the container
+- **project_id**: UUID of the project
 
 Response status codes
 **********************
diff --git a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.rst b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.rst
index 6e12bb9b..98efdd4e 100644
--- a/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.rst
+++ b/docs/api/v2/hypervisor/docker/projectsprojectiddockervmsvmidadaptersadapternumberdportsportnumberdnio.rst
@@ -10,9 +10,9 @@ Add a NIO to a Docker container
 Parameters
 **********
 - **adapter_number**: Adapter where the nio should be added
+- **id**: ID of the container
 - **port_number**: Port on the adapter
 - **project_id**: UUID for the project
-- **id**: ID of the container
 
 Response status codes
 **********************
@@ -34,9 +34,9 @@ Remove a NIO from a Docker container
 Parameters
 **********
 - **adapter_number**: Adapter where the nio should be added
+- **id**: ID of the container
 - **port_number**: Port on the adapter
 - **project_id**: UUID for the project
-- **id**: ID of the container
 
 Response status codes
 **********************
diff --git a/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst
index 619ddea3..54a07e38 100644
--- a/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst
+++ b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdnio.rst
@@ -9,8 +9,8 @@ Add a NIO to a Dynamips device instance
 
 Parameters
 **********
-- **port_number**: Port on the device
 - **device_id**: UUID for the instance
+- **port_number**: Port on the device
 - **project_id**: UUID for the project
 
 Response status codes
@@ -139,8 +139,8 @@ Remove a NIO from a Dynamips device instance
 
 Parameters
 **********
-- **port_number**: Port on the device
 - **device_id**: UUID for the instance
+- **port_number**: Port on the device
 - **project_id**: UUID for the project
 
 Response status codes
diff --git a/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst
index e09d7552..708f70da 100644
--- a/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst
+++ b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstartcapture.rst
@@ -9,8 +9,8 @@ Start a packet capture on a Dynamips device instance
 
 Parameters
 **********
-- **port_number**: Port on the device
 - **device_id**: UUID for the instance
+- **port_number**: Port on the device
 - **project_id**: UUID for the project
 
 Response status codes
diff --git a/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst
index ab43d693..07685adc 100644
--- a/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst
+++ b/docs/api/v2/hypervisor/dynamips_device/projectsprojectiddynamipsdevicesdeviceidportsportnumberdstopcapture.rst
@@ -9,8 +9,8 @@ Stop a packet capture on a Dynamips device instance
 
 Parameters
 **********
-- **port_number**: Port on the device
 - **device_id**: UUID for the instance
+- **port_number**: Port on the device
 - **project_id**: UUID for the project
 
 Response status codes
diff --git a/gns3server/controller/vm.py b/gns3server/controller/vm.py
index 98413613..d869e935 100644
--- a/gns3server/controller/vm.py
+++ b/gns3server/controller/vm.py
@@ -17,6 +17,7 @@
 
 
 import asyncio
+import copy
 import uuid
 
 
@@ -73,7 +74,7 @@ class VM:
 
     @asyncio.coroutine
     def create(self):
-        data = self._properties
+        data = copy.copy(self._properties)
         data["vm_id"] = self._id
         data["name"] = self._name
         data["console"] = self._console
diff --git a/tests/handlers/api/controller/test_vm.py b/tests/handlers/api/controller/test_vm.py
index 29797ebb..bd69e0c2 100644
--- a/tests/handlers/api/controller/test_vm.py
+++ b/tests/handlers/api/controller/test_vm.py
@@ -57,3 +57,4 @@ def test_create_vm(http_controller, tmpdir, project, hypervisor):
     }, example=True)
     assert response.status == 201
     assert response.json["name"] == "test"
+    assert "name" not in response.json["properties"]