diff --git a/code/API_definitions/device-swap.yaml b/code/API_definitions/device-swap.yaml
index 45f1497..fb3a4bc 100644
--- a/code/API_definitions/device-swap.yaml
+++ b/code/API_definitions/device-swap.yaml
@@ -63,7 +63,7 @@ info:
   license:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0.html
-  version: 1.0.0-rc.1
+  version: wip
   x-camara-commonalities: 0.6
 
 externalDocs:
@@ -71,7 +71,7 @@ externalDocs:
   url: https://github.com/camaraproject/DeviceSwap
 
 servers:
-  - url: '{apiRoot}/device-swap/v1rc1'
+  - url: '{apiRoot}/device-swap/vwip'
     variables:
       apiRoot:
         default: http://localhost:9091
diff --git a/code/Test_definitions/checkDeviceSwap.feature b/code/Test_definitions/device-swap-checkDeviceSwap.feature
similarity index 98%
rename from code/Test_definitions/checkDeviceSwap.feature
rename to code/Test_definitions/device-swap-checkDeviceSwap.feature
index 144223b..059f3ff 100644
--- a/code/Test_definitions/checkDeviceSwap.feature
+++ b/code/Test_definitions/device-swap-checkDeviceSwap.feature
@@ -1,16 +1,16 @@
-Feature: CAMARA Device Swap API, 1.0.0-rc.1 - Operation checkDeviceSwap
+Feature: CAMARA Device Swap API, vwip - Operation checkDeviceSwap
 
   # Input to be provided by the implementation to the tester
   #
   # Testing assets:
   #
-  # References to OAS spec schemas refer to schemas specifies in device-swap.yaml, version 1.0.0-rc.1
+  # References to OAS spec schemas refer to schemas specifies in device-swap.yaml, version wip
   #
   # Check if device swap has been performed during a past period
 
 
     Background: Common checkDeviceSwap setup
-        Given the resource "device-swap/v1rc1/check"
+        Given the resource "device-swap/vwip/check"
         And the header "Content-Type" is set to "application/json"
         And the header "Authorization" is set to a valid access token
         And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator"
diff --git a/code/Test_definitions/retrieveDeviceSwapDate b/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature
similarity index 97%
rename from code/Test_definitions/retrieveDeviceSwapDate
rename to code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature
index 5073a0a..05ba6a8 100644
--- a/code/Test_definitions/retrieveDeviceSwapDate
+++ b/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature
@@ -1,15 +1,15 @@
-Feature: CAMARA Device Swap API, 1.0.0-rc.1 - Operation retrieveDeviceSwapDate
+Feature: CAMARA Device Swap API, vwip - Operation retrieveDeviceSwapDate
 
   # Input to be provided by the implementation to the tester
   #
   # Testing assets:
   #
-  # References to OAS spec schemas refer to schemas specifies in device-swap.yaml, version 1.0.0-rc.1
+  # References to OAS spec schemas refer to schemas specifies in device-swap.yaml, version wip
   #
   # Get timestamp of last device swap for a mobile user account provided with phone number.
 
     Background: Common retrieveDeviceSwapDate setup
-        Given the resource "device-swap/v1rc1/retrieve-date"
+        Given the resource "device-swap/vwip/retrieve-date"
         And the header "Content-Type" is set to "application/json"
         And the header "Authorization" is set to a valid access token
         And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator"
diff --git a/documentation/API_documentation/device-swap-API-Readiness-Checklist.md b/documentation/API_documentation/device-swap-API-Readiness-Checklist.md
index ee74897..7a0fde4 100644
--- a/documentation/API_documentation/device-swap-API-Readiness-Checklist.md
+++ b/documentation/API_documentation/device-swap-API-Readiness-Checklist.md
@@ -10,8 +10,8 @@ Checklist for device-swap v1.0.0-rc.1 in r3.1
 |  4 | API versioning convention applied            |   M   |         M         |    M    |    M   |   Y  |  v1.0.0-rc.1    |
 |  5 | API documentation                            |   M   |         M         |    M    |    M   |   Y  | Embedded documentation into API spec - [link](/code/API_definitions/device-swap.yaml) |
 |  6 | User stories                                 |   O   |         O         |    O    |    M   |   Y  | [check](/documentation/API_documentation/device-swap_check_User_Story.md) [retrieve](/documentation/API_documentation/device-swap_retrieve_User_Story.md) |
-|  7 | Basic API test cases & documentation         |   O   |         M         |    M    |    M   |   Y  | [check](/code/Test_definitions/checkDeviceSwap.feature) [retrieve](/code/Test_definitions/retrieveDeviceSwapDate.feature) |
-|  8 | Enhanced API test cases & documentation      |   O   |         O         |    O    |    M   |   Y  | [check](/code/Test_definitions/checkDeviceSwap.feature) [retrieve](/code/Test_definitions/retrieveDeviceSwapDate.feature) |
+|  7 | Basic API test cases & documentation         |   O   |         M         |    M    |    M   |   Y  | [check](/code/Test_definitions/device-swap-checkDeviceSwap.feature) [retrieve](/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature) |
+|  8 | Enhanced API test cases & documentation      |   O   |         O         |    O    |    M   |   Y  | [check](/code/Test_definitions/device-swap-checkDeviceSwap.feature) [retrieve](/code/Test_definitions/device-swap-retrieveDeviceSwapDate.feature) |
 |  9 | Test result statement                        |   O   |         O         |    O    |    M   |   N  |   To be provided     |
 | 10 | API release numbering convention applied     |   M   |         M         |    M    |    M   |   Y  |  r3.1    |
 | 11 | Change log updated                           |   M   |         M         |    M    |    M   |   Y  | [link](/CHANGELOG.md) |