diff --git a/docs/src/docbkx/samples/reqCreateOrder.json b/docs/src/docbkx/samples/reqCreateOrder.json
index ee6f022df..1b66d519b 100644
--- a/docs/src/docbkx/samples/reqCreateOrder.json
+++ b/docs/src/docbkx/samples/reqCreateOrder.json
@@ -1,13 +1,13 @@
-curl -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' -d \
+curl -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'X-Project-Id:12345' -d\
  '{
-   "secret":
-	   {
+    "secret":
+      {
         "mode": "cbc",
         "bit_length": 256,
         "name": "secretname",
         "algorithm": "aes",
         "payload_content_type": "application/octet-stream"
-        }
-    }
+      }
+  }
 }'\
-https://endpointURL/v1/tenantID/orders
\ No newline at end of file
+    https://endpointURL/v1/orders
\ No newline at end of file
diff --git a/docs/src/docbkx/samples/reqCreateSecret.json b/docs/src/docbkx/samples/reqCreateSecret.json
index 36977a689..60de4351b 100644
--- a/docs/src/docbkx/samples/reqCreateSecret.json
+++ b/docs/src/docbkx/samples/reqCreateSecret.json
@@ -1,4 +1,4 @@
-curl -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' -d\
+curl -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'X-Project-Id:12345' -d\
    '{
       "name": "AES key",
       "expiration": "2014-02-28T19:14:44.180394",
@@ -9,4 +9,4 @@ curl -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' -
       "payload_content_type": "application/octet-stream",
       "payload_content_encoding": "base64"
     }'\
-        https://endpointURL/v1/tenantID/secrets
\ No newline at end of file
+        https://endpointURL/v1/secrets
\ No newline at end of file
diff --git a/docs/src/docbkx/samples/reqUpdateSecret.json b/docs/src/docbkx/samples/reqUpdateSecret.json
index 64f0bff07..5da5cd7d6 100644
--- a/docs/src/docbkx/samples/reqUpdateSecret.json
+++ b/docs/src/docbkx/samples/reqUpdateSecret.json
@@ -1,7 +1,7 @@
-curl -X PUT -H 'Content-Type: application/json' -H 'Accept: application/json' -d\
+curl -X PUT -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'X-Project-Id:12345' -d\
    '{
       "payload": "this is my secret",
       "payload_content_type": "application/octet-stream",
       "payload_content_encoding": "base64"
     }'\
-        https://endpointURL/v1/tenantID/secrets/secretID
\ No newline at end of file
+        https://endpointURL/v1/secrets/secretID
\ No newline at end of file
diff --git a/docs/src/docbkx/samples/resCreateSecret.json b/docs/src/docbkx/samples/resCreateSecret.json
index af88228d9..93d1f23ec 100644
--- a/docs/src/docbkx/samples/resCreateSecret.json
+++ b/docs/src/docbkx/samples/resCreateSecret.json
@@ -1,6 +1,6 @@
 {
     "status": "ACTIVE",
-    "secret_ref": "http://endpointURL/v1/123456/secrets/6c3ccd7d-46b6-4ece-9a58-a1be26b2758a",
+    "secret_ref": "http://endpointURL/v1/secrets/6c3ccd7d-46b6-4ece-9a58-a1be26b2758a",
     "updated": "2014-04-28T15:14:39.025761",
     "created": "2014-04-28T15:14:38.947844",
     "secret": {
@@ -11,5 +11,5 @@
         "bit_length": 256,
         "mode": "cbc"
         },
-    "order_ref": "https://endpointURL/v1/123456/orders/4a20549c-b418-4548-b2d1-33016d88822d"
+    "order_ref": "https://endpointURL/v1/orders/4a20549c-b418-4548-b2d1-33016d88822d"
 }
\ No newline at end of file
diff --git a/docs/src/docbkx/samples/resRetrieveSecret.json b/docs/src/docbkx/samples/resRetrieveSecret.json
index f7fcb2e7e..d8d74a4e3 100644
--- a/docs/src/docbkx/samples/resRetrieveSecret.json
+++ b/docs/src/docbkx/samples/resRetrieveSecret.json
@@ -1,6 +1,6 @@
 {
     "status": "ACTIVE",
-    "secret_ref": "https://endpointURL/v1/tenantID/secrets/2df8d196-76b6-4f89-a6d2-c9e764900791",
+    "secret_ref": "https://endpointURL/v1/secrets/2df8d196-76b6-4f89-a6d2-c9e764900791",
     "updated": "2013-11-04T16:39:13.593962",
     "name": "secretname",
     "algorithm": "aes",
diff --git a/docs/src/wadl/samples/reqCreateOrder.json b/docs/src/wadl/samples/reqCreateOrder.json
index 8d9b681ec..8c1499447 100644
--- a/docs/src/wadl/samples/reqCreateOrder.json
+++ b/docs/src/wadl/samples/reqCreateOrder.json
@@ -1,13 +1,13 @@
-curl -X POST -d \
+curl -X POST -H 'X-Project-Id:12345' -d\
  '{
-   "secret": 
-	       {
-		"name": "secretname",
-		 "algorithm": "aes",
-		 "bit_length": 256,
-		 "mode": "cbc",
-		 "payload_content_type": "application/octet-stream"
-		}
+    "secret":
+        {
+         "name": "secretname",
+         "algorithm": "aes",
+         "bit_length": 256,
+         "mode": "cbc",
+         "payload_content_type": "application/octet-stream"
+         }
 }'\
-https://endpointURL/v1/12345/orders
+    https://endpointURL/v1/orders
 
diff --git a/docs/src/wadl/samples/reqGetOrderinfo.json b/docs/src/wadl/samples/reqGetOrderinfo.json
index 88353e9cc..2069481b5 100644
--- a/docs/src/wadl/samples/reqGetOrderinfo.json
+++ b/docs/src/wadl/samples/reqGetOrderinfo.json
@@ -1,2 +1,2 @@
-curl -H 'Accept: application/json'\
-https://endpointURL/v1/12345/orders/62d57f53-ecfe-4ae4-87bd-fab2f24e29bc
\ No newline at end of file
+curl -H 'Accept: application/json' -H 'X-Project-Id:12345'\
+https://endpointURL/v1/orders/62d57f53-ecfe-4ae4-87bd-fab2f24e29bc
\ No newline at end of file
diff --git a/docs/src/wadl/samples/reqGetSecretinfo.json b/docs/src/wadl/samples/reqGetSecretinfo.json
index ae1e01dbb..91c024d14 100644
--- a/docs/src/wadl/samples/reqGetSecretinfo.json
+++ b/docs/src/wadl/samples/reqGetSecretinfo.json
@@ -1,2 +1,2 @@
-curl -H 'Accept: application/json' \
-https://endpointURL/v1/12345/secrets/secretID/888b29a4-c7cf-49d0-bfdf-bd9e6f26d718
\ No newline at end of file
+curl -H 'Accept: application/json' -H 'X-Project-Id:12345'\
+https://endpointURL/v1/secrets/secretID/888b29a4-c7cf-49d0-bfdf-bd9e6f26d718
\ No newline at end of file
diff --git a/docs/src/wadl/samples/reqUpdateSecret.json b/docs/src/wadl/samples/reqUpdateSecret.json
index d1e0213b5..dabbca9fb 100644
--- a/docs/src/wadl/samples/reqUpdateSecret.json
+++ b/docs/src/wadl/samples/reqUpdateSecret.json
@@ -1,2 +1,2 @@
-curl -i -X PUT -H 'Content-Type: application/octet-stream' \
-     -T ./secret_key_file http://endpointURL/v1/12345/secrets/a83018d1-e657-4957-9ddd-42a479753e6b
+curl -i -X PUT -H 'Content-Type: application/octet-stream' -H 'X-Project-Id:12345'\
+     -T ./secret_key_file http://endpointURL/v1/secrets/a83018d1-e657-4957-9ddd-42a479753e6b
diff --git a/docs/src/wadl/samples/resCreateOrder.json b/docs/src/wadl/samples/resCreateOrder.json
index 19c81448f..ef2fb1769 100644
--- a/docs/src/wadl/samples/resCreateOrder.json
+++ b/docs/src/wadl/samples/resCreateOrder.json
@@ -1,3 +1,3 @@
 {
- "order_ref": "http://endpointURL/v1/12345/orders/62d57f53-ecfe-4ae4-87bd-fab2f24e29bc"
+ "order_ref": "http://endpointURL/v1/orders/62d57f53-ecfe-4ae4-87bd-fab2f24e29bc"
 }
\ No newline at end of file
diff --git a/docs/src/wadl/samples/resGetOrderinfo.json b/docs/src/wadl/samples/resGetOrderinfo.json
index d7f9c0786..de67433a4 100644
--- a/docs/src/wadl/samples/resGetOrderinfo.json
+++ b/docs/src/wadl/samples/resGetOrderinfo.json
@@ -1,6 +1,6 @@
 {
     "status": "ACTIVE",
-    "secret_ref": "endpointURL/v1/12345/secrets/8a78d5e4-524a-4e81-96cc-c7d16ed85515",
+    "secret_ref": "endpointURL/v1/secrets/8a78d5e4-524a-4e81-96cc-c7d16ed85515",
     "updated": "2014-04-02T14:52:26.987458",
     "created": "2014-04-02T14:52:26.921043",
     "secret": {
@@ -11,4 +11,4 @@
         "bit_length": 256,
         "mode": "cbc"
          },
-    "order_ref": "https://endpointURL/v1/12345/orders/b63d2c05-5d53-4db6-af06-4e388044deb8"
\ No newline at end of file
+    "order_ref": "https://endpointURL/v1/orders/b63d2c05-5d53-4db6-af06-4e388044deb8"
\ No newline at end of file