diff --git a/add-ons/lookups/payfone-tcpa-compliance/payfone-tcpa-compliance.7.x.java b/add-ons/lookups/payfone-tcpa-compliance/payfone-tcpa-compliance.8.x.java
similarity index 100%
rename from add-ons/lookups/payfone-tcpa-compliance/payfone-tcpa-compliance.7.x.java
rename to add-ons/lookups/payfone-tcpa-compliance/payfone-tcpa-compliance.8.x.java
diff --git a/api-auth/api-auth.7.x.java b/api-auth/api-auth.8.x.java
similarity index 100%
rename from api-auth/api-auth.7.x.java
rename to api-auth/api-auth.8.x.java
diff --git a/client/capability-token-2way/capability-token.8.x.java b/client/capability-token-2way/capability-token.8.x.java
new file mode 100644
index 0000000000..8269d4b0f7
--- /dev/null
+++ b/client/capability-token-2way/capability-token.8.x.java
@@ -0,0 +1,38 @@
+import java.io.IOException;
+import java.util.List;
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.twilio.jwt.client.ClientCapability;
+import com.twilio.jwt.client.IncomingClientScope;
+import com.twilio.jwt.client.OutgoingClientScope;
+import com.twilio.jwt.client.Scope;
+
+public class TwilioServlet extends HttpServlet {
+
+  // Get your Account SID and Auth Token from https://twilio.com/console
+  // To set up environment variables, see http://twil.io/secure
+  public static final String ACCOUNT_SID = System.getenv("TWILIO_ACCOUNT_SID");
+  public static final String AUTH_TOKEN = System.getenv("TWILIO_AUTH_TOKEN");
+  // Find an application Sid from twilio.com/user/account/apps
+  public static final String APP_SID = System.getenv("TWILIO_APP_SID");
+
+  public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    OutgoingClientScope outgoingScope = new OutgoingClientScope.Builder(APP_SID).build();
+    IncomingClientScope incomingScope = new IncomingClientScope(request.getParameter("ClientName"));
+
+    List<Scope> scopes = Arrays.asList(outgoingScope, incomingScope);
+
+    ClientCapability capability = new ClientCapability.Builder(ACCOUNT_SID, AUTH_TOKEN)
+        .scopes(scopes)
+        .build();
+
+    String token = capability.toJwt();
+
+    response.setContentType("application/jwt");
+    response.getWriter().print(token);
+  }
+}
diff --git a/client/capability-token-expires/capability-token-expires.7.x.java b/client/capability-token-expires/capability-token-expires.8.x.java
similarity index 100%
rename from client/capability-token-expires/capability-token-expires.7.x.java
rename to client/capability-token-expires/capability-token-expires.8.x.java
diff --git a/client/capability-token-incoming/capability-token.8.x.java b/client/capability-token-incoming/capability-token.8.x.java
new file mode 100644
index 0000000000..82b058f9b9
--- /dev/null
+++ b/client/capability-token-incoming/capability-token.8.x.java
@@ -0,0 +1,32 @@
+import java.io.IOException;
+import java.util.List;
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.twilio.jwt.client.ClientCapability;
+import com.twilio.jwt.client.IncomingClientScope;
+import com.twilio.jwt.client.Scope;
+
+public class TwilioServlet extends HttpServlet {
+
+  // Get your Account SID and Auth Token from https://twilio.com/console
+  // To set up environment variables, see http://twil.io/secure
+  public static final String ACCOUNT_SID = System.getenv("TWILIO_ACCOUNT_SID");
+  public static final String AUTH_TOKEN = System.getenv("TWILIO_AUTH_TOKEN");
+
+  public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    List<Scope> scopes = Arrays.asList(new IncomingClientScope("joey"));
+
+    ClientCapability capability = new ClientCapability.Builder(ACCOUNT_SID, AUTH_TOKEN)
+      .scopes(scopes)
+      .build();
+
+    String token = capability.toJwt();
+
+    response.setContentType("application/jwt");
+    response.getWriter().print(token);
+  }
+}
diff --git a/client/capability-token-outgoing/capability-token.8.x.java b/client/capability-token-outgoing/capability-token.8.x.java
new file mode 100644
index 0000000000..bc315cba1e
--- /dev/null
+++ b/client/capability-token-outgoing/capability-token.8.x.java
@@ -0,0 +1,34 @@
+import java.io.IOException;
+import java.util.List;
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.twilio.jwt.client.ClientCapability;
+import com.twilio.jwt.client.OutgoingClientScope;
+import com.twilio.jwt.client.Scope;
+
+public class TwilioServlet extends HttpServlet {
+
+  // Get your Account SID and Auth Token from https://twilio.com/console
+  // To set up environment variables, see http://twil.io/secure
+  public static final String ACCOUNT_SID = System.getenv("TWILIO_ACCOUNT_SID");
+  public static final String AUTH_TOKEN = System.getenv("TWILIO_AUTH_TOKEN");
+  // Find an application Sid from twilio.com/user/account/apps
+  public static final String APP_SID = System.getenv("TWILIO_APP_SID");]
+
+  public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    List<Scope> scopes =
+        Arrays.asList(new OutgoingClientScope.Builder(APP_SID).build());
+
+    ClientCapability capability =
+        new ClientCapability.Builder(ACCOUNT_SID, AUTH_TOKEN).scopes(scopes).build();
+
+    String token = capability.toJwt();
+
+    response.setContentType("application/jwt");
+    response.getWriter().print(token);
+  }
+}
diff --git a/client/capability-token/capability-token.8.x.java b/client/capability-token/capability-token.8.x.java
new file mode 100644
index 0000000000..1600d89661
--- /dev/null
+++ b/client/capability-token/capability-token.8.x.java
@@ -0,0 +1,38 @@
+import java.io.IOException;
+import java.util.List;
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.twilio.jwt.client.ClientCapability;
+import com.twilio.jwt.client.IncomingClientScope;
+import com.twilio.jwt.client.OutgoingClientScope;
+import com.twilio.jwt.client.Scope;
+
+public class TwilioServlet extends HttpServlet {
+
+  // Get your Account SID and Auth Token from https://twilio.com/console
+  // To set up environment variables, see http://twil.io/secure
+  public static final String ACCOUNT_SID = System.getenv("TWILIO_ACCOUNT_SID");
+  public static final String AUTH_TOKEN = System.getenv("TWILIO_AUTH_TOKEN");
+  // Find an application Sid from twilio.com/user/account/apps
+  public static final String APP_SID = System.getenv("TWILIO_APP_SID");
+
+  public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    OutgoingClientScope outgoingScope = new OutgoingClientScope.Builder(APP_SID).build();
+    IncomingClientScope incomingScope = new IncomingClientScope("joey");
+
+    List<Scope> scopes = Arrays.asList(outgoingScope, incomingScope);
+
+    ClientCapability capability = new ClientCapability.Builder(ACCOUNT_SID, AUTH_TOKEN)
+        .scopes(scopes)
+        .build();
+
+    String token = capability.toJwt();
+
+    response.setContentType("application/jwt");
+    response.getWriter().print(token);
+  }
+}
diff --git a/client/response-twiml-client/response-twiml-client.7.x.java b/client/response-twiml-client/response-twiml-client.8.x.java
similarity index 100%
rename from client/response-twiml-client/response-twiml-client.7.x.java
rename to client/response-twiml-client/response-twiml-client.8.x.java
diff --git a/client/response-twiml-dial/response-twiml-dial.7.x.java b/client/response-twiml-dial/response-twiml-dial.8.x.java
similarity index 100%
rename from client/response-twiml-dial/response-twiml-dial.7.x.java
rename to client/response-twiml-dial/response-twiml-dial.8.x.java
diff --git a/client/response-twiml/response-twiml.7.x.java b/client/response-twiml/response-twiml.8.x.java
similarity index 100%
rename from client/response-twiml/response-twiml.7.x.java
rename to client/response-twiml/response-twiml.8.x.java
diff --git a/deployed-devices/quickstarts/sync-boardled/create-document/create-document.7.x.java b/deployed-devices/quickstarts/sync-boardled/create-document/create-document.8.x.java
similarity index 100%
rename from deployed-devices/quickstarts/sync-boardled/create-document/create-document.7.x.java
rename to deployed-devices/quickstarts/sync-boardled/create-document/create-document.8.x.java
diff --git a/deployed-devices/quickstarts/sync-boardled/update-document/update-document.7.x.java b/deployed-devices/quickstarts/sync-boardled/update-document/update-document.8.x.java
similarity index 100%
rename from deployed-devices/quickstarts/sync-boardled/update-document/update-document.7.x.java
rename to deployed-devices/quickstarts/sync-boardled/update-document/update-document.8.x.java
diff --git a/deployed-devices/rest/certificates/create-certificate/create-certificate.7.x.java b/deployed-devices/rest/certificates/create-certificate/create-certificate.8.x.java
similarity index 100%
rename from deployed-devices/rest/certificates/create-certificate/create-certificate.7.x.java
rename to deployed-devices/rest/certificates/create-certificate/create-certificate.8.x.java
diff --git a/deployed-devices/rest/certificates/delete-certificate/delete-certificate.7.x.java b/deployed-devices/rest/certificates/delete-certificate/delete-certificate.8.x.java
similarity index 100%
rename from deployed-devices/rest/certificates/delete-certificate/delete-certificate.7.x.java
rename to deployed-devices/rest/certificates/delete-certificate/delete-certificate.8.x.java
diff --git a/deployed-devices/rest/certificates/list-certificates/list-certificates.7.x.java b/deployed-devices/rest/certificates/list-certificates/list-certificates.8.x.java
similarity index 100%
rename from deployed-devices/rest/certificates/list-certificates/list-certificates.7.x.java
rename to deployed-devices/rest/certificates/list-certificates/list-certificates.8.x.java
diff --git a/deployed-devices/rest/certificates/retrieve-certificate/retrieve-certificate.7.x.java b/deployed-devices/rest/certificates/retrieve-certificate/retrieve-certificate.8.x.java
similarity index 100%
rename from deployed-devices/rest/certificates/retrieve-certificate/retrieve-certificate.7.x.java
rename to deployed-devices/rest/certificates/retrieve-certificate/retrieve-certificate.8.x.java
diff --git a/deployed-devices/rest/certificates/update-certificate/update-certificate.7.x.java b/deployed-devices/rest/certificates/update-certificate/update-certificate.8.x.java
similarity index 100%
rename from deployed-devices/rest/certificates/update-certificate/update-certificate.7.x.java
rename to deployed-devices/rest/certificates/update-certificate/update-certificate.8.x.java
diff --git a/deployed-devices/rest/deployments/create-deployment/create-deployment.7.x.java b/deployed-devices/rest/deployments/create-deployment/create-deployment.8.x.java
similarity index 100%
rename from deployed-devices/rest/deployments/create-deployment/create-deployment.7.x.java
rename to deployed-devices/rest/deployments/create-deployment/create-deployment.8.x.java
diff --git a/deployed-devices/rest/deployments/delete-deployment/delete-deployment.7.x.java b/deployed-devices/rest/deployments/delete-deployment/delete-deployment.8.x.java
similarity index 100%
rename from deployed-devices/rest/deployments/delete-deployment/delete-deployment.7.x.java
rename to deployed-devices/rest/deployments/delete-deployment/delete-deployment.8.x.java
diff --git a/deployed-devices/rest/deployments/list-deployments/list-deployments.7.x.java b/deployed-devices/rest/deployments/list-deployments/list-deployments.8.x.java
similarity index 100%
rename from deployed-devices/rest/deployments/list-deployments/list-deployments.7.x.java
rename to deployed-devices/rest/deployments/list-deployments/list-deployments.8.x.java
diff --git a/deployed-devices/rest/deployments/retrieve-deployment/retrieve-deployment.7.x.java b/deployed-devices/rest/deployments/retrieve-deployment/retrieve-deployment.8.x.java
similarity index 100%
rename from deployed-devices/rest/deployments/retrieve-deployment/retrieve-deployment.7.x.java
rename to deployed-devices/rest/deployments/retrieve-deployment/retrieve-deployment.8.x.java
diff --git a/deployed-devices/rest/deployments/update-deployment/update-deployment.7.x.java b/deployed-devices/rest/deployments/update-deployment/update-deployment.8.x.java
similarity index 100%
rename from deployed-devices/rest/deployments/update-deployment/update-deployment.7.x.java
rename to deployed-devices/rest/deployments/update-deployment/update-deployment.8.x.java
diff --git a/deployed-devices/rest/devices/create-device/create-device.7.x.java b/deployed-devices/rest/devices/create-device/create-device.8.x.java
similarity index 100%
rename from deployed-devices/rest/devices/create-device/create-device.7.x.java
rename to deployed-devices/rest/devices/create-device/create-device.8.x.java
diff --git a/deployed-devices/rest/devices/delete-device/delete-device.7.x.java b/deployed-devices/rest/devices/delete-device/delete-device.8.x.java
similarity index 100%
rename from deployed-devices/rest/devices/delete-device/delete-device.7.x.java
rename to deployed-devices/rest/devices/delete-device/delete-device.8.x.java
diff --git a/deployed-devices/rest/devices/list-devices/list-devices.7.x.java b/deployed-devices/rest/devices/list-devices/list-devices.8.x.java
similarity index 100%
rename from deployed-devices/rest/devices/list-devices/list-devices.7.x.java
rename to deployed-devices/rest/devices/list-devices/list-devices.8.x.java
diff --git a/deployed-devices/rest/devices/retrieve-device/retrieve-device.7.x.java b/deployed-devices/rest/devices/retrieve-device/retrieve-device.8.x.java
similarity index 100%
rename from deployed-devices/rest/devices/retrieve-device/retrieve-device.7.x.java
rename to deployed-devices/rest/devices/retrieve-device/retrieve-device.8.x.java
diff --git a/deployed-devices/rest/devices/update-device/update-device.7.x.java b/deployed-devices/rest/devices/update-device/update-device.8.x.java
similarity index 100%
rename from deployed-devices/rest/devices/update-device/update-device.7.x.java
rename to deployed-devices/rest/devices/update-device/update-device.8.x.java
diff --git a/deployed-devices/rest/fleets/create-fleet/create-fleet.7.x.java b/deployed-devices/rest/fleets/create-fleet/create-fleet.8.x.java
similarity index 100%
rename from deployed-devices/rest/fleets/create-fleet/create-fleet.7.x.java
rename to deployed-devices/rest/fleets/create-fleet/create-fleet.8.x.java
diff --git a/deployed-devices/rest/fleets/delete-fleet/delete-fleet.7.x.java b/deployed-devices/rest/fleets/delete-fleet/delete-fleet.8.x.java
similarity index 100%
rename from deployed-devices/rest/fleets/delete-fleet/delete-fleet.7.x.java
rename to deployed-devices/rest/fleets/delete-fleet/delete-fleet.8.x.java
diff --git a/deployed-devices/rest/fleets/list-fleets/list-fleets.7.x.java b/deployed-devices/rest/fleets/list-fleets/list-fleets.8.x.java
similarity index 100%
rename from deployed-devices/rest/fleets/list-fleets/list-fleets.7.x.java
rename to deployed-devices/rest/fleets/list-fleets/list-fleets.8.x.java
diff --git a/deployed-devices/rest/fleets/retrieve-fleet/retrieve-fleet.7.x.java b/deployed-devices/rest/fleets/retrieve-fleet/retrieve-fleet.8.x.java
similarity index 100%
rename from deployed-devices/rest/fleets/retrieve-fleet/retrieve-fleet.7.x.java
rename to deployed-devices/rest/fleets/retrieve-fleet/retrieve-fleet.8.x.java
diff --git a/deployed-devices/rest/fleets/update-fleet/update-fleet.7.x.java b/deployed-devices/rest/fleets/update-fleet/update-fleet.8.x.java
similarity index 100%
rename from deployed-devices/rest/fleets/update-fleet/update-fleet.7.x.java
rename to deployed-devices/rest/fleets/update-fleet/update-fleet.8.x.java
diff --git a/deployed-devices/rest/keys/create-key/create-key.7.x.java b/deployed-devices/rest/keys/create-key/create-key.8.x.java
similarity index 100%
rename from deployed-devices/rest/keys/create-key/create-key.7.x.java
rename to deployed-devices/rest/keys/create-key/create-key.8.x.java
diff --git a/deployed-devices/rest/keys/delete-key/delete-key.7.x.java b/deployed-devices/rest/keys/delete-key/delete-key.8.x.java
similarity index 100%
rename from deployed-devices/rest/keys/delete-key/delete-key.7.x.java
rename to deployed-devices/rest/keys/delete-key/delete-key.8.x.java
diff --git a/deployed-devices/rest/keys/list-keys/list-key.7.x.java b/deployed-devices/rest/keys/list-keys/list-key.8.x.java
similarity index 100%
rename from deployed-devices/rest/keys/list-keys/list-key.7.x.java
rename to deployed-devices/rest/keys/list-keys/list-key.8.x.java
diff --git a/deployed-devices/rest/keys/retrieve-key/retrieve-key.7.x.java b/deployed-devices/rest/keys/retrieve-key/retrieve-key.8.x.java
similarity index 100%
rename from deployed-devices/rest/keys/retrieve-key/retrieve-key.7.x.java
rename to deployed-devices/rest/keys/retrieve-key/retrieve-key.8.x.java
diff --git a/deployed-devices/rest/keys/update-key/update-key.7.x.java b/deployed-devices/rest/keys/update-key/update-key.8.x.java
similarity index 100%
rename from deployed-devices/rest/keys/update-key/update-key.7.x.java
rename to deployed-devices/rest/keys/update-key/update-key.8.x.java
diff --git a/fax/basic-receive/basic-receive.7.x.java b/fax/basic-receive/basic-receive.8.x.java
similarity index 100%
rename from fax/basic-receive/basic-receive.7.x.java
rename to fax/basic-receive/basic-receive.8.x.java
diff --git a/fax/basic-send/basic-send.7.x.java b/fax/basic-send/basic-send.8.x.java
similarity index 100%
rename from fax/basic-send/basic-send.7.x.java
rename to fax/basic-send/basic-send.8.x.java
diff --git a/fax/instance-get-example/instance-get-example.7.x.java b/fax/instance-get-example/instance-get-example.8.x.java
similarity index 100%
rename from fax/instance-get-example/instance-get-example.7.x.java
rename to fax/instance-get-example/instance-get-example.8.x.java
diff --git a/fax/instance-post-example/instance-post-example.7.x.java b/fax/instance-post-example/instance-post-example.8.x.java
similarity index 100%
rename from fax/instance-post-example/instance-post-example.7.x.java
rename to fax/instance-post-example/instance-post-example.8.x.java
diff --git a/fax/list-get-example/list-get-example.7.x.java b/fax/list-get-example/list-get-example.8.x.java
similarity index 100%
rename from fax/list-get-example/list-get-example.7.x.java
rename to fax/list-get-example/list-get-example.8.x.java
diff --git a/fax/sip-send/example-1/example-1.7.x.java b/fax/sip-send/example-1/example-1.8.x.java
similarity index 100%
rename from fax/sip-send/example-1/example-1.7.x.java
rename to fax/sip-send/example-1/example-1.8.x.java
diff --git a/fax/sip-send/example-2/example-2.7.x.java b/fax/sip-send/example-2/example-2.8.x.java
similarity index 100%
rename from fax/sip-send/example-2/example-2.7.x.java
rename to fax/sip-send/example-2/example-2.8.x.java
diff --git a/fax/sip-send/example-3/example-3.7.x.java b/fax/sip-send/example-3/example-3.8.x.java
similarity index 100%
rename from fax/sip-send/example-3/example-3.7.x.java
rename to fax/sip-send/example-3/example-3.8.x.java
diff --git a/ip-messaging/push-config/new-message-push-config/new-message-push-config.7.x.java b/ip-messaging/push-config/new-message-push-config/new-message-push-config.8.x.java
similarity index 100%
rename from ip-messaging/push-config/new-message-push-config/new-message-push-config.7.x.java
rename to ip-messaging/push-config/new-message-push-config/new-message-push-config.8.x.java
diff --git a/ip-messaging/reachability-indicator/disable-indicator/disable-indicator.7.x.java b/ip-messaging/reachability-indicator/disable-indicator/disable-indicator.8.x.java
similarity index 100%
rename from ip-messaging/reachability-indicator/disable-indicator/disable-indicator.7.x.java
rename to ip-messaging/reachability-indicator/disable-indicator/disable-indicator.8.x.java
diff --git a/ip-messaging/reachability-indicator/enable-indicator/enable-indicator.7.x.java b/ip-messaging/reachability-indicator/enable-indicator/enable-indicator.8.x.java
similarity index 100%
rename from ip-messaging/reachability-indicator/enable-indicator/enable-indicator.7.x.java
rename to ip-messaging/reachability-indicator/enable-indicator/enable-indicator.8.x.java
diff --git a/ip-messaging/rest/channels/create-channels/create-channels.7.x.java b/ip-messaging/rest/channels/create-channels/create-channels.8.x.java
similarity index 100%
rename from ip-messaging/rest/channels/create-channels/create-channels.7.x.java
rename to ip-messaging/rest/channels/create-channels/create-channels.8.x.java
diff --git a/ip-messaging/rest/channels/delete-channels/delete-channels.7.x.java b/ip-messaging/rest/channels/delete-channels/delete-channels.8.x.java
similarity index 100%
rename from ip-messaging/rest/channels/delete-channels/delete-channels.7.x.java
rename to ip-messaging/rest/channels/delete-channels/delete-channels.8.x.java
diff --git a/ip-messaging/rest/channels/list-channels/list-channels.7.x.java b/ip-messaging/rest/channels/list-channels/list-channels.8.x.java
similarity index 100%
rename from ip-messaging/rest/channels/list-channels/list-channels.7.x.java
rename to ip-messaging/rest/channels/list-channels/list-channels.8.x.java
diff --git a/ip-messaging/rest/channels/retrieve-channels/retrieve-channels.7.x.java b/ip-messaging/rest/channels/retrieve-channels/retrieve-channels.8.x.java
similarity index 100%
rename from ip-messaging/rest/channels/retrieve-channels/retrieve-channels.7.x.java
rename to ip-messaging/rest/channels/retrieve-channels/retrieve-channels.8.x.java
diff --git a/ip-messaging/rest/channels/update-channels/update-channels.7.x.java b/ip-messaging/rest/channels/update-channels/update-channels.8.x.java
similarity index 100%
rename from ip-messaging/rest/channels/update-channels/update-channels.7.x.java
rename to ip-messaging/rest/channels/update-channels/update-channels.8.x.java
diff --git a/ip-messaging/rest/credentials/create-credentials/create-credentials.7.x.java b/ip-messaging/rest/credentials/create-credentials/create-credentials.8.x.java
similarity index 100%
rename from ip-messaging/rest/credentials/create-credentials/create-credentials.7.x.java
rename to ip-messaging/rest/credentials/create-credentials/create-credentials.8.x.java
diff --git a/ip-messaging/rest/credentials/delete-credentials/delete-credentials.7.x.java b/ip-messaging/rest/credentials/delete-credentials/delete-credentials.8.x.java
similarity index 100%
rename from ip-messaging/rest/credentials/delete-credentials/delete-credentials.7.x.java
rename to ip-messaging/rest/credentials/delete-credentials/delete-credentials.8.x.java
diff --git a/ip-messaging/rest/credentials/list-credentials/list-credentials.7.x.java b/ip-messaging/rest/credentials/list-credentials/list-credentials.8.x.java
similarity index 100%
rename from ip-messaging/rest/credentials/list-credentials/list-credentials.7.x.java
rename to ip-messaging/rest/credentials/list-credentials/list-credentials.8.x.java
diff --git a/ip-messaging/rest/credentials/retrieve-credentials/retrieve-credentials.7.x.java b/ip-messaging/rest/credentials/retrieve-credentials/retrieve-credentials.8.x.java
similarity index 100%
rename from ip-messaging/rest/credentials/retrieve-credentials/retrieve-credentials.7.x.java
rename to ip-messaging/rest/credentials/retrieve-credentials/retrieve-credentials.8.x.java
diff --git a/ip-messaging/rest/credentials/update-credentials/update-credentials.7.x.java b/ip-messaging/rest/credentials/update-credentials/update-credentials.8.x.java
similarity index 100%
rename from ip-messaging/rest/credentials/update-credentials/update-credentials.7.x.java
rename to ip-messaging/rest/credentials/update-credentials/update-credentials.8.x.java
diff --git a/ip-messaging/rest/members/add-member/add-member.7.x.java b/ip-messaging/rest/members/add-member/add-member.8.x.java
similarity index 100%
rename from ip-messaging/rest/members/add-member/add-member.7.x.java
rename to ip-messaging/rest/members/add-member/add-member.8.x.java
diff --git a/ip-messaging/rest/members/list-members/list-members.7.x.java b/ip-messaging/rest/members/list-members/list-members.8.x.java
similarity index 100%
rename from ip-messaging/rest/members/list-members/list-members.7.x.java
rename to ip-messaging/rest/members/list-members/list-members.8.x.java
diff --git a/ip-messaging/rest/members/remove-member/remove-member.7.x.java b/ip-messaging/rest/members/remove-member/remove-member.8.x.java
similarity index 100%
rename from ip-messaging/rest/members/remove-member/remove-member.7.x.java
rename to ip-messaging/rest/members/remove-member/remove-member.8.x.java
diff --git a/ip-messaging/rest/members/retrieve-member/retrieve-member.7.x.java b/ip-messaging/rest/members/retrieve-member/retrieve-member.8.x.java
similarity index 100%
rename from ip-messaging/rest/members/retrieve-member/retrieve-member.7.x.java
rename to ip-messaging/rest/members/retrieve-member/retrieve-member.8.x.java
diff --git a/ip-messaging/rest/messages/delete-messages/delete-messages.7.x.java b/ip-messaging/rest/messages/delete-messages/delete-messages.8.x.java
similarity index 100%
rename from ip-messaging/rest/messages/delete-messages/delete-messages.7.x.java
rename to ip-messaging/rest/messages/delete-messages/delete-messages.8.x.java
diff --git a/ip-messaging/rest/messages/list-messages/list-messages.7.x.java b/ip-messaging/rest/messages/list-messages/list-messages.8.x.java
similarity index 100%
rename from ip-messaging/rest/messages/list-messages/list-messages.7.x.java
rename to ip-messaging/rest/messages/list-messages/list-messages.8.x.java
diff --git a/ip-messaging/rest/messages/retrieve-messages/retrieve-messages.7.x.java b/ip-messaging/rest/messages/retrieve-messages/retrieve-messages.8.x.java
similarity index 100%
rename from ip-messaging/rest/messages/retrieve-messages/retrieve-messages.7.x.java
rename to ip-messaging/rest/messages/retrieve-messages/retrieve-messages.8.x.java
diff --git a/ip-messaging/rest/messages/send-messages/send-messages.7.x.java b/ip-messaging/rest/messages/send-messages/send-messages.8.x.java
similarity index 100%
rename from ip-messaging/rest/messages/send-messages/send-messages.7.x.java
rename to ip-messaging/rest/messages/send-messages/send-messages.8.x.java
diff --git a/ip-messaging/rest/messages/update-messages/update-messages.7.x.java b/ip-messaging/rest/messages/update-messages/update-messages.8.x.java
similarity index 100%
rename from ip-messaging/rest/messages/update-messages/update-messages.7.x.java
rename to ip-messaging/rest/messages/update-messages/update-messages.8.x.java
diff --git a/ip-messaging/rest/roles/create-role/create-role.7.x.java b/ip-messaging/rest/roles/create-role/create-role.8.x.java
similarity index 100%
rename from ip-messaging/rest/roles/create-role/create-role.7.x.java
rename to ip-messaging/rest/roles/create-role/create-role.8.x.java
diff --git a/ip-messaging/rest/roles/delete-role/delete-role.7.x.java b/ip-messaging/rest/roles/delete-role/delete-role.8.x.java
similarity index 100%
rename from ip-messaging/rest/roles/delete-role/delete-role.7.x.java
rename to ip-messaging/rest/roles/delete-role/delete-role.8.x.java
diff --git a/ip-messaging/rest/roles/list-roles/list-roles.7.x.java b/ip-messaging/rest/roles/list-roles/list-roles.8.x.java
similarity index 100%
rename from ip-messaging/rest/roles/list-roles/list-roles.7.x.java
rename to ip-messaging/rest/roles/list-roles/list-roles.8.x.java
diff --git a/ip-messaging/rest/roles/retrieve-role/retrieve-role.7.x.java b/ip-messaging/rest/roles/retrieve-role/retrieve-role.8.x.java
similarity index 100%
rename from ip-messaging/rest/roles/retrieve-role/retrieve-role.7.x.java
rename to ip-messaging/rest/roles/retrieve-role/retrieve-role.8.x.java
diff --git a/ip-messaging/rest/roles/update-role/update-role.7.x.java b/ip-messaging/rest/roles/update-role/update-role.8.x.java
similarity index 100%
rename from ip-messaging/rest/roles/update-role/update-role.7.x.java
rename to ip-messaging/rest/roles/update-role/update-role.8.x.java
diff --git a/ip-messaging/rest/services/create-service/create-service.7.x.java b/ip-messaging/rest/services/create-service/create-service.8.x.java
similarity index 100%
rename from ip-messaging/rest/services/create-service/create-service.7.x.java
rename to ip-messaging/rest/services/create-service/create-service.8.x.java
diff --git a/ip-messaging/rest/services/delete-service/delete-service.7.x.java b/ip-messaging/rest/services/delete-service/delete-service.8.x.java
similarity index 100%
rename from ip-messaging/rest/services/delete-service/delete-service.7.x.java
rename to ip-messaging/rest/services/delete-service/delete-service.8.x.java
diff --git a/ip-messaging/rest/services/list-service/list-service.7.x.java b/ip-messaging/rest/services/list-service/list-service.8.x.java
similarity index 100%
rename from ip-messaging/rest/services/list-service/list-service.7.x.java
rename to ip-messaging/rest/services/list-service/list-service.8.x.java
diff --git a/ip-messaging/rest/services/retrieve-service/retrieve-service.7.x.java b/ip-messaging/rest/services/retrieve-service/retrieve-service.8.x.java
similarity index 100%
rename from ip-messaging/rest/services/retrieve-service/retrieve-service.7.x.java
rename to ip-messaging/rest/services/retrieve-service/retrieve-service.8.x.java
diff --git a/ip-messaging/rest/services/update-service/update-service.7.x.java b/ip-messaging/rest/services/update-service/update-service.8.x.java
similarity index 100%
rename from ip-messaging/rest/services/update-service/update-service.7.x.java
rename to ip-messaging/rest/services/update-service/update-service.8.x.java
diff --git a/ip-messaging/rest/users/create-user/create-user.7.x.java b/ip-messaging/rest/users/create-user/create-user.8.x.java
similarity index 100%
rename from ip-messaging/rest/users/create-user/create-user.7.x.java
rename to ip-messaging/rest/users/create-user/create-user.8.x.java
diff --git a/ip-messaging/rest/users/delete-user/delete-user.7.x.java b/ip-messaging/rest/users/delete-user/delete-user.8.x.java
similarity index 100%
rename from ip-messaging/rest/users/delete-user/delete-user.7.x.java
rename to ip-messaging/rest/users/delete-user/delete-user.8.x.java
diff --git a/ip-messaging/rest/users/list-users/list-users.7.x.java b/ip-messaging/rest/users/list-users/list-users.8.x.java
similarity index 100%
rename from ip-messaging/rest/users/list-users/list-users.7.x.java
rename to ip-messaging/rest/users/list-users/list-users.8.x.java
diff --git a/ip-messaging/rest/users/retrieve-user/retrieve-user.7.x.java b/ip-messaging/rest/users/retrieve-user/retrieve-user.8.x.java
similarity index 100%
rename from ip-messaging/rest/users/retrieve-user/retrieve-user.7.x.java
rename to ip-messaging/rest/users/retrieve-user/retrieve-user.8.x.java
diff --git a/ip-messaging/rest/users/update-user/update-user.7.x.java b/ip-messaging/rest/users/update-user/update-user.8.x.java
similarity index 100%
rename from ip-messaging/rest/users/update-user/update-user.7.x.java
rename to ip-messaging/rest/users/update-user/update-user.8.x.java
diff --git a/ip-messaging/users/token-gen-server-push/token-gen-server-push.7.x.java b/ip-messaging/users/token-gen-server-push/token-gen-server-push.8.x.java
similarity index 100%
rename from ip-messaging/users/token-gen-server-push/token-gen-server-push.7.x.java
rename to ip-messaging/users/token-gen-server-push/token-gen-server-push.8.x.java
diff --git a/ip-messaging/users/token-generation-server/token-generation-server.7.x.java b/ip-messaging/users/token-generation-server/token-generation-server.8.x.java
similarity index 100%
rename from ip-messaging/users/token-generation-server/token-generation-server.7.x.java
rename to ip-messaging/users/token-generation-server/token-generation-server.8.x.java
diff --git a/lookups/lookup-get-addon-example-1/lookup-get-addon-examples-1.7.x.java b/lookups/lookup-get-addon-example-1/lookup-get-addon-examples-1.8.x.java
similarity index 100%
rename from lookups/lookup-get-addon-example-1/lookup-get-addon-examples-1.7.x.java
rename to lookups/lookup-get-addon-example-1/lookup-get-addon-examples-1.8.x.java
diff --git a/lookups/lookup-get-addon-payfone-example-1/lookup-get-addon-payfone-1.7.x.java b/lookups/lookup-get-addon-payfone-example-1/lookup-get-addon-payfone-1.8.x.java
similarity index 100%
rename from lookups/lookup-get-addon-payfone-example-1/lookup-get-addon-payfone-1.7.x.java
rename to lookups/lookup-get-addon-payfone-example-1/lookup-get-addon-payfone-1.8.x.java
diff --git a/lookups/lookup-get-basic-example-1/lookup-get-basic-example-1.7.x.java b/lookups/lookup-get-basic-example-1/lookup-get-basic-example-1.8.x.java
similarity index 100%
rename from lookups/lookup-get-basic-example-1/lookup-get-basic-example-1.7.x.java
rename to lookups/lookup-get-basic-example-1/lookup-get-basic-example-1.8.x.java
diff --git a/lookups/lookup-get-basic-example-2/lookup-get-basic-example-2.7.x.java b/lookups/lookup-get-basic-example-2/lookup-get-basic-example-2.8.x.java
similarity index 100%
rename from lookups/lookup-get-basic-example-2/lookup-get-basic-example-2.7.x.java
rename to lookups/lookup-get-basic-example-2/lookup-get-basic-example-2.8.x.java
diff --git a/lookups/lookup-get-carrier-cname-example-1/lookup-get-carrier-cname-example-1.7.x.java b/lookups/lookup-get-carrier-cname-example-1/lookup-get-carrier-cname-example-1.8.x.java
similarity index 100%
rename from lookups/lookup-get-carrier-cname-example-1/lookup-get-carrier-cname-example-1.7.x.java
rename to lookups/lookup-get-carrier-cname-example-1/lookup-get-carrier-cname-example-1.8.x.java
diff --git a/lookups/lookup-get-cname-example-1/lookup-get-cname-example-1.7.x.java b/lookups/lookup-get-cname-example-1/lookup-get-cname-example-1.8.x.java
similarity index 100%
rename from lookups/lookup-get-cname-example-1/lookup-get-cname-example-1.7.x.java
rename to lookups/lookup-get-cname-example-1/lookup-get-cname-example-1.8.x.java
diff --git a/lookups/lookup-international-basic/lookup-international-basic.7.x.java b/lookups/lookup-international-basic/lookup-international-basic.8.x.java
similarity index 100%
rename from lookups/lookup-international-basic/lookup-international-basic.7.x.java
rename to lookups/lookup-international-basic/lookup-international-basic.8.x.java
diff --git a/lookups/lookup-national-basic/lookup-national-basic.7.x.java b/lookups/lookup-national-basic/lookup-national-basic.8.x.java
similarity index 100%
rename from lookups/lookup-national-basic/lookup-national-basic.7.x.java
rename to lookups/lookup-national-basic/lookup-national-basic.8.x.java
diff --git a/messaging/services/service-alpha-add/service-alpha-add.7.x.java b/messaging/services/service-alpha-add/service-alpha-add.8.x.java
similarity index 100%
rename from messaging/services/service-alpha-add/service-alpha-add.7.x.java
rename to messaging/services/service-alpha-add/service-alpha-add.8.x.java
diff --git a/messaging/services/service-alpha-delete/service-alpha-delete.7.x.java b/messaging/services/service-alpha-delete/service-alpha-delete.8.x.java
similarity index 100%
rename from messaging/services/service-alpha-delete/service-alpha-delete.7.x.java
rename to messaging/services/service-alpha-delete/service-alpha-delete.8.x.java
diff --git a/messaging/services/service-alpha-get/service-alpha-get.7.x.java b/messaging/services/service-alpha-get/service-alpha-get.8.x.java
similarity index 100%
rename from messaging/services/service-alpha-get/service-alpha-get.7.x.java
rename to messaging/services/service-alpha-get/service-alpha-get.8.x.java
diff --git a/messaging/services/service-alpha-list/service-alpha-list.7.x.java b/messaging/services/service-alpha-list/service-alpha-list.8.x.java
similarity index 100%
rename from messaging/services/service-alpha-list/service-alpha-list.7.x.java
rename to messaging/services/service-alpha-list/service-alpha-list.8.x.java
diff --git a/messaging/services/service-create/service-create.7.x.java b/messaging/services/service-create/service-create.8.x.java
similarity index 100%
rename from messaging/services/service-create/service-create.7.x.java
rename to messaging/services/service-create/service-create.8.x.java
diff --git a/messaging/services/service-delete/service-delete.7.x.java b/messaging/services/service-delete/service-delete.8.x.java
similarity index 100%
rename from messaging/services/service-delete/service-delete.7.x.java
rename to messaging/services/service-delete/service-delete.8.x.java
diff --git a/messaging/services/service-get/service-get.7.x.java b/messaging/services/service-get/service-get.8.x.java
similarity index 100%
rename from messaging/services/service-get/service-get.7.x.java
rename to messaging/services/service-get/service-get.8.x.java
diff --git a/messaging/services/service-list/service-list.7.x.java b/messaging/services/service-list/service-list.8.x.java
similarity index 100%
rename from messaging/services/service-list/service-list.7.x.java
rename to messaging/services/service-list/service-list.8.x.java
diff --git a/messaging/services/service-multiple-number-add/service-multiple-number-add.7.x.java b/messaging/services/service-multiple-number-add/service-multiple-number-add.8.x.java
similarity index 100%
rename from messaging/services/service-multiple-number-add/service-multiple-number-add.7.x.java
rename to messaging/services/service-multiple-number-add/service-multiple-number-add.8.x.java
diff --git a/messaging/services/service-number-add/service-number-add.7.x.java b/messaging/services/service-number-add/service-number-add.8.x.java
similarity index 100%
rename from messaging/services/service-number-add/service-number-add.7.x.java
rename to messaging/services/service-number-add/service-number-add.8.x.java
diff --git a/messaging/services/service-number-delete/service-number-delete.7.x.java b/messaging/services/service-number-delete/service-number-delete.8.x.java
similarity index 100%
rename from messaging/services/service-number-delete/service-number-delete.7.x.java
rename to messaging/services/service-number-delete/service-number-delete.8.x.java
diff --git a/messaging/services/service-number-get/service-number-get.7.x.java b/messaging/services/service-number-get/service-number-get.8.x.java
similarity index 100%
rename from messaging/services/service-number-get/service-number-get.7.x.java
rename to messaging/services/service-number-get/service-number-get.8.x.java
diff --git a/messaging/services/service-number-list/service-number-list.7.x.java b/messaging/services/service-number-list/service-number-list.8.x.java
similarity index 100%
rename from messaging/services/service-number-list/service-number-list.7.x.java
rename to messaging/services/service-number-list/service-number-list.8.x.java
diff --git a/messaging/services/service-shortcode-add/service-shortcode-add.7.x.java b/messaging/services/service-shortcode-add/service-shortcode-add.8.x.java
similarity index 100%
rename from messaging/services/service-shortcode-add/service-shortcode-add.7.x.java
rename to messaging/services/service-shortcode-add/service-shortcode-add.8.x.java
diff --git a/messaging/services/service-shortcode-delete/service-shortcode-delete.7.x.java b/messaging/services/service-shortcode-delete/service-shortcode-delete.8.x.java
similarity index 100%
rename from messaging/services/service-shortcode-delete/service-shortcode-delete.7.x.java
rename to messaging/services/service-shortcode-delete/service-shortcode-delete.8.x.java
diff --git a/messaging/services/service-shortcode-get/service-shortcode-get.7.x.java b/messaging/services/service-shortcode-get/service-shortcode-get.8.x.java
similarity index 100%
rename from messaging/services/service-shortcode-get/service-shortcode-get.7.x.java
rename to messaging/services/service-shortcode-get/service-shortcode-get.8.x.java
diff --git a/messaging/services/service-shortcode-list/service-shortcode-list.7.x.java b/messaging/services/service-shortcode-list/service-shortcode-list.8.x.java
similarity index 100%
rename from messaging/services/service-shortcode-list/service-shortcode-list.7.x.java
rename to messaging/services/service-shortcode-list/service-shortcode-list.8.x.java
diff --git a/messaging/services/service-update/service-update.7.x.java b/messaging/services/service-update/service-update.8.x.java
similarity index 100%
rename from messaging/services/service-update/service-update.7.x.java
rename to messaging/services/service-update/service-update.8.x.java
diff --git a/monitor/alerts/instance-delete-example/instance-delete-example.7.x.java b/monitor/alerts/instance-delete-example/instance-delete-example.8.x.java
similarity index 100%
rename from monitor/alerts/instance-delete-example/instance-delete-example.7.x.java
rename to monitor/alerts/instance-delete-example/instance-delete-example.8.x.java
diff --git a/monitor/alerts/instance-get-example/instance-get-example.7.x.java b/monitor/alerts/instance-get-example/instance-get-example.8.x.java
similarity index 100%
rename from monitor/alerts/instance-get-example/instance-get-example.7.x.java
rename to monitor/alerts/instance-get-example/instance-get-example.8.x.java
diff --git a/monitor/alerts/list-get-example-all/list-get-example-all.7.x.java b/monitor/alerts/list-get-example-all/list-get-example-all.8.x.java
similarity index 100%
rename from monitor/alerts/list-get-example-all/list-get-example-all.7.x.java
rename to monitor/alerts/list-get-example-all/list-get-example-all.8.x.java
diff --git a/monitor/events/instance-get-example-phone-number/instance-get-example-phone-number.7.x.java b/monitor/events/instance-get-example-phone-number/instance-get-example-phone-number.8.x.java
similarity index 100%
rename from monitor/events/instance-get-example-phone-number/instance-get-example-phone-number.7.x.java
rename to monitor/events/instance-get-example-phone-number/instance-get-example-phone-number.8.x.java
diff --git a/monitor/events/list-get-example-actorsid-resourcesid-error/list-get-example-actorsid-resourcesid-error.7.x.java b/monitor/events/list-get-example-actorsid-resourcesid-error/list-get-example-actorsid-resourcesid-error.8.x.java
similarity index 100%
rename from monitor/events/list-get-example-actorsid-resourcesid-error/list-get-example-actorsid-resourcesid-error.7.x.java
rename to monitor/events/list-get-example-actorsid-resourcesid-error/list-get-example-actorsid-resourcesid-error.8.x.java
diff --git a/monitor/events/list-get-example-resourcesid-filter/list-get-example-resourcesid-filter.7.x.java b/monitor/events/list-get-example-resourcesid-filter/list-get-example-resourcesid-filter.8.x.java
similarity index 100%
rename from monitor/events/list-get-example-resourcesid-filter/list-get-example-resourcesid-filter.7.x.java
rename to monitor/events/list-get-example-resourcesid-filter/list-get-example-resourcesid-filter.8.x.java
diff --git a/notifications/rest/bindings/create-binding/create-binding.7.x.java b/notifications/rest/bindings/create-binding/create-binding.8.x.java
similarity index 100%
rename from notifications/rest/bindings/create-binding/create-binding.7.x.java
rename to notifications/rest/bindings/create-binding/create-binding.8.x.java
diff --git a/notifications/rest/bindings/delete-binding/delete-binding.7.x.java b/notifications/rest/bindings/delete-binding/delete-binding.8.x.java
similarity index 100%
rename from notifications/rest/bindings/delete-binding/delete-binding.7.x.java
rename to notifications/rest/bindings/delete-binding/delete-binding.8.x.java
diff --git a/notifications/rest/bindings/retrieve-binding/retrieve-binding.7.x.java b/notifications/rest/bindings/retrieve-binding/retrieve-binding.8.x.java
similarity index 100%
rename from notifications/rest/bindings/retrieve-binding/retrieve-binding.7.x.java
rename to notifications/rest/bindings/retrieve-binding/retrieve-binding.8.x.java
diff --git a/notifications/rest/credentials/create-apn-credential/create-apn-credential.7.x.java b/notifications/rest/credentials/create-apn-credential/create-apn-credential.8.x.java
similarity index 100%
rename from notifications/rest/credentials/create-apn-credential/create-apn-credential.7.x.java
rename to notifications/rest/credentials/create-apn-credential/create-apn-credential.8.x.java
diff --git a/notifications/rest/credentials/create-fcm-credential/create-fcm-credential.7.x.java b/notifications/rest/credentials/create-fcm-credential/create-fcm-credential.8.x.java
similarity index 100%
rename from notifications/rest/credentials/create-fcm-credential/create-fcm-credential.7.x.java
rename to notifications/rest/credentials/create-fcm-credential/create-fcm-credential.8.x.java
diff --git a/notifications/rest/credentials/create-gcm-credential/create-gcm-credential.7.x.java b/notifications/rest/credentials/create-gcm-credential/create-gcm-credential.8.x.java
similarity index 100%
rename from notifications/rest/credentials/create-gcm-credential/create-gcm-credential.7.x.java
rename to notifications/rest/credentials/create-gcm-credential/create-gcm-credential.8.x.java
diff --git a/notifications/rest/credentials/delete-credential/delete-credential.7.x.java b/notifications/rest/credentials/delete-credential/delete-credential.8.x.java
similarity index 100%
rename from notifications/rest/credentials/delete-credential/delete-credential.7.x.java
rename to notifications/rest/credentials/delete-credential/delete-credential.8.x.java
diff --git a/notifications/rest/credentials/list-credential/list-credential.7.x.java b/notifications/rest/credentials/list-credential/list-credential.8.x.java
similarity index 100%
rename from notifications/rest/credentials/list-credential/list-credential.7.x.java
rename to notifications/rest/credentials/list-credential/list-credential.8.x.java
diff --git a/notifications/rest/credentials/retrieve-credential/retrieve-credential.7.x.java b/notifications/rest/credentials/retrieve-credential/retrieve-credential.8.x.java
similarity index 100%
rename from notifications/rest/credentials/retrieve-credential/retrieve-credential.7.x.java
rename to notifications/rest/credentials/retrieve-credential/retrieve-credential.8.x.java
diff --git a/notifications/rest/credentials/update-credential/update-credential.7.x.java b/notifications/rest/credentials/update-credential/update-credential.8.x.java
similarity index 100%
rename from notifications/rest/credentials/update-credential/update-credential.7.x.java
rename to notifications/rest/credentials/update-credential/update-credential.8.x.java
diff --git a/notifications/rest/notifications/send-notification-detailed/send-notification-detailed.7.x.java b/notifications/rest/notifications/send-notification-detailed/send-notification-detailed.8.x.java
similarity index 100%
rename from notifications/rest/notifications/send-notification-detailed/send-notification-detailed.7.x.java
rename to notifications/rest/notifications/send-notification-detailed/send-notification-detailed.8.x.java
diff --git a/notifications/rest/notifications/send-notification-with-badge/send-notification-with-badge.7.x.java b/notifications/rest/notifications/send-notification-with-badge/send-notification-with-badge.8.x.java
similarity index 100%
rename from notifications/rest/notifications/send-notification-with-badge/send-notification-with-badge.7.x.java
rename to notifications/rest/notifications/send-notification-with-badge/send-notification-with-badge.8.x.java
diff --git a/notifications/rest/notifications/send-notification/send-notification.7.x.java b/notifications/rest/notifications/send-notification/send-notification.8.x.java
similarity index 100%
rename from notifications/rest/notifications/send-notification/send-notification.7.x.java
rename to notifications/rest/notifications/send-notification/send-notification.8.x.java
diff --git a/notifications/rest/notifications/send-passthrough-notification/send-passthrough-notification.7.x.java b/notifications/rest/notifications/send-passthrough-notification/send-passthrough-notification.8.x.java
similarity index 100%
rename from notifications/rest/notifications/send-passthrough-notification/send-passthrough-notification.7.x.java
rename to notifications/rest/notifications/send-passthrough-notification/send-passthrough-notification.8.x.java
diff --git a/notifications/rest/segments/list-segment/list-segment.7.x.java b/notifications/rest/segments/list-segment/list-segment.8.x.java
similarity index 100%
rename from notifications/rest/segments/list-segment/list-segment.7.x.java
rename to notifications/rest/segments/list-segment/list-segment.8.x.java
diff --git a/notifications/rest/services/create-service/create-service.7.x.java b/notifications/rest/services/create-service/create-service.8.x.java
similarity index 100%
rename from notifications/rest/services/create-service/create-service.7.x.java
rename to notifications/rest/services/create-service/create-service.8.x.java
diff --git a/notifications/rest/services/delete-service/delete-service.7.x.java b/notifications/rest/services/delete-service/delete-service.8.x.java
similarity index 100%
rename from notifications/rest/services/delete-service/delete-service.7.x.java
rename to notifications/rest/services/delete-service/delete-service.8.x.java
diff --git a/notifications/rest/services/list-service/list-service.7.x.java b/notifications/rest/services/list-service/list-service.8.x.java
similarity index 100%
rename from notifications/rest/services/list-service/list-service.7.x.java
rename to notifications/rest/services/list-service/list-service.8.x.java
diff --git a/notifications/rest/services/retrieve-service/retrieve-service.7.x.java b/notifications/rest/services/retrieve-service/retrieve-service.8.x.java
similarity index 100%
rename from notifications/rest/services/retrieve-service/retrieve-service.7.x.java
rename to notifications/rest/services/retrieve-service/retrieve-service.8.x.java
diff --git a/notifications/rest/services/update-service/update-service.7.x.java b/notifications/rest/services/update-service/update-service.8.x.java
similarity index 100%
rename from notifications/rest/services/update-service/update-service.7.x.java
rename to notifications/rest/services/update-service/update-service.8.x.java
diff --git a/notifications/rest/users/add-user-to-segment/add-user-to-segment.7.x.java b/notifications/rest/users/add-user-to-segment/add-user-to-segment.8.x.java
similarity index 100%
rename from notifications/rest/users/add-user-to-segment/add-user-to-segment.7.x.java
rename to notifications/rest/users/add-user-to-segment/add-user-to-segment.8.x.java
diff --git a/notifications/rest/users/create-user/create-user.7.x.java b/notifications/rest/users/create-user/create-user.8.x.java
similarity index 100%
rename from notifications/rest/users/create-user/create-user.7.x.java
rename to notifications/rest/users/create-user/create-user.8.x.java
diff --git a/notifications/rest/users/delete-user/delete-user.7.x.java b/notifications/rest/users/delete-user/delete-user.8.x.java
similarity index 100%
rename from notifications/rest/users/delete-user/delete-user.7.x.java
rename to notifications/rest/users/delete-user/delete-user.8.x.java
diff --git a/notifications/rest/users/list-binding-of-user/list-binding-of-user.7.x.java b/notifications/rest/users/list-binding-of-user/list-binding-of-user.8.x.java
similarity index 100%
rename from notifications/rest/users/list-binding-of-user/list-binding-of-user.7.x.java
rename to notifications/rest/users/list-binding-of-user/list-binding-of-user.8.x.java
diff --git a/notifications/rest/users/list-users/list-users.7.x.java b/notifications/rest/users/list-users/list-users.8.x.java
similarity index 100%
rename from notifications/rest/users/list-users/list-users.7.x.java
rename to notifications/rest/users/list-users/list-users.8.x.java
diff --git a/notifications/rest/users/remove-user-from-segment/remove-user-from-segment.7.x.java b/notifications/rest/users/remove-user-from-segment/remove-user-from-segment.8.x.java
similarity index 100%
rename from notifications/rest/users/remove-user-from-segment/remove-user-from-segment.7.x.java
rename to notifications/rest/users/remove-user-from-segment/remove-user-from-segment.8.x.java
diff --git a/notifications/rest/users/retrieve-user/retrieve-user.7.x.java b/notifications/rest/users/retrieve-user/retrieve-user.8.x.java
similarity index 100%
rename from notifications/rest/users/retrieve-user/retrieve-user.7.x.java
rename to notifications/rest/users/retrieve-user/retrieve-user.8.x.java
diff --git a/notifications/sms-quickstart/create-binding/create-binding.7.x.java b/notifications/sms-quickstart/create-binding/create-binding.8.x.java
similarity index 100%
rename from notifications/sms-quickstart/create-binding/create-binding.7.x.java
rename to notifications/sms-quickstart/create-binding/create-binding.8.x.java
diff --git a/notifications/sms-quickstart/send-notification-to-number/send-notification-to-number.7.x.java b/notifications/sms-quickstart/send-notification-to-number/send-notification-to-number.8.x.java
similarity index 100%
rename from notifications/sms-quickstart/send-notification-to-number/send-notification-to-number.7.x.java
rename to notifications/sms-quickstart/send-notification-to-number/send-notification-to-number.8.x.java
diff --git a/notifications/sms-quickstart/send-notification/send-notification.7.x.java b/notifications/sms-quickstart/send-notification/send-notification.8.x.java
similarity index 100%
rename from notifications/sms-quickstart/send-notification/send-notification.7.x.java
rename to notifications/sms-quickstart/send-notification/send-notification.8.x.java
diff --git a/pricing/get-messaging-country/get-messaging-country.7.x.java b/pricing/get-messaging-country/get-messaging-country.8.x.java
similarity index 100%
rename from pricing/get-messaging-country/get-messaging-country.7.x.java
rename to pricing/get-messaging-country/get-messaging-country.8.x.java
diff --git a/pricing/get-phone-number-country/get-phone-number-country.7.x.java b/pricing/get-phone-number-country/get-phone-number-country.8.x.java
similarity index 100%
rename from pricing/get-phone-number-country/get-phone-number-country.7.x.java
rename to pricing/get-phone-number-country/get-phone-number-country.8.x.java
diff --git a/pricing/get-voice-country/get-voice-country.7.x.java b/pricing/get-voice-country/get-voice-country.8.x.java
similarity index 100%
rename from pricing/get-voice-country/get-voice-country.7.x.java
rename to pricing/get-voice-country/get-voice-country.8.x.java
diff --git a/pricing/get-voice-number-with-origination-number/get-voice-number-with-origination-number.7.x.java b/pricing/get-voice-number-with-origination-number/get-voice-number-with-origination-number.8.x.java
similarity index 100%
rename from pricing/get-voice-number-with-origination-number/get-voice-number-with-origination-number.7.x.java
rename to pricing/get-voice-number-with-origination-number/get-voice-number-with-origination-number.8.x.java
diff --git a/pricing/get-voice-number/get-voice-number.7.x.java b/pricing/get-voice-number/get-voice-number.8.x.java
similarity index 100%
rename from pricing/get-voice-number/get-voice-number.7.x.java
rename to pricing/get-voice-number/get-voice-number.8.x.java
diff --git a/pricing/list-messaging-countries/list-messaging-countries.7.x.java b/pricing/list-messaging-countries/list-messaging-countries.8.x.java
similarity index 100%
rename from pricing/list-messaging-countries/list-messaging-countries.7.x.java
rename to pricing/list-messaging-countries/list-messaging-countries.8.x.java
diff --git a/pricing/list-phone-number-countries/list-phone-number-countries.7.x.java b/pricing/list-phone-number-countries/list-phone-number-countries.8.x.java
similarity index 100%
rename from pricing/list-phone-number-countries/list-phone-number-countries.7.x.java
rename to pricing/list-phone-number-countries/list-phone-number-countries.8.x.java
diff --git a/pricing/list-voice-countries/list-voice-countries.7.x.java b/pricing/list-voice-countries/list-voice-countries.8.x.java
similarity index 100%
rename from pricing/list-voice-countries/list-voice-countries.7.x.java
rename to pricing/list-voice-countries/list-voice-countries.8.x.java
diff --git a/proxy/quickstart/add-phone-number/add-phone-number.7.x.java b/proxy/quickstart/add-phone-number/add-phone-number.8.x.java
similarity index 100%
rename from proxy/quickstart/add-phone-number/add-phone-number.7.x.java
rename to proxy/quickstart/add-phone-number/add-phone-number.8.x.java
diff --git a/proxy/quickstart/create-participant/create-participant.7.x.java b/proxy/quickstart/create-participant/create-participant.8.x.java
similarity index 100%
rename from proxy/quickstart/create-participant/create-participant.7.x.java
rename to proxy/quickstart/create-participant/create-participant.8.x.java
diff --git a/proxy/quickstart/create-service/create-service.7.x.java b/proxy/quickstart/create-service/create-service.8.x.java
similarity index 100%
rename from proxy/quickstart/create-service/create-service.7.x.java
rename to proxy/quickstart/create-service/create-service.8.x.java
diff --git a/proxy/quickstart/create-session/create-session.7.x.java b/proxy/quickstart/create-session/create-session.8.x.java
similarity index 100%
rename from proxy/quickstart/create-session/create-session.7.x.java
rename to proxy/quickstart/create-session/create-session.8.x.java
diff --git a/proxy/quickstart/send-message/send-message.7.x.java b/proxy/quickstart/send-message/send-message.8.x.java
similarity index 100%
rename from proxy/quickstart/send-message/send-message.7.x.java
rename to proxy/quickstart/send-message/send-message.8.x.java
diff --git a/quickstart/java/autopilot/create-first-task/create_hello_world_task.7.x.java b/quickstart/java/autopilot/create-first-task/create_hello_world_task.8.x.java
similarity index 100%
rename from quickstart/java/autopilot/create-first-task/create_hello_world_task.7.x.java
rename to quickstart/java/autopilot/create-first-task/create_hello_world_task.8.x.java
diff --git a/quickstart/java/autopilot/create-hello-world-samples/create_hello_world_samples.7.x.java b/quickstart/java/autopilot/create-hello-world-samples/create_hello_world_samples.8.x.java
similarity index 100%
rename from quickstart/java/autopilot/create-hello-world-samples/create_hello_world_samples.7.x.java
rename to quickstart/java/autopilot/create-hello-world-samples/create_hello_world_samples.8.x.java
diff --git a/quickstart/java/autopilot/create-joke-samples/create_joke_samples.7.x.java b/quickstart/java/autopilot/create-joke-samples/create_joke_samples.8.x.java
similarity index 100%
rename from quickstart/java/autopilot/create-joke-samples/create_joke_samples.7.x.java
rename to quickstart/java/autopilot/create-joke-samples/create_joke_samples.8.x.java
diff --git a/quickstart/java/autopilot/create-joke-task/create_joke_task.7.x.java b/quickstart/java/autopilot/create-joke-task/create_joke_task.8.x.java
similarity index 100%
rename from quickstart/java/autopilot/create-joke-task/create_joke_task.7.x.java
rename to quickstart/java/autopilot/create-joke-task/create_joke_task.8.x.java
diff --git a/quickstart/java/autopilot/query-task/query_task.7.x.java b/quickstart/java/autopilot/query-task/query_task.8.x.java
similarity index 100%
rename from quickstart/java/autopilot/query-task/query_task.7.x.java
rename to quickstart/java/autopilot/query-task/query_task.8.x.java
diff --git a/quickstart/java/sms/example-1/example-1.7.x.java b/quickstart/java/sms/example-1/example-1.8.x.java
similarity index 100%
rename from quickstart/java/sms/example-1/example-1.7.x.java
rename to quickstart/java/sms/example-1/example-1.8.x.java
diff --git a/quickstart/java/sms/example-2/MmsSender.7.x.java b/quickstart/java/sms/example-2/MmsSender.8.x.java
similarity index 100%
rename from quickstart/java/sms/example-2/MmsSender.7.x.java
rename to quickstart/java/sms/example-2/MmsSender.8.x.java
diff --git a/quickstart/java/sms/example-3/SmsHelloMonkey.7.x.java b/quickstart/java/sms/example-3/SmsHelloMonkey.8.x.java
similarity index 100%
rename from quickstart/java/sms/example-3/SmsHelloMonkey.7.x.java
rename to quickstart/java/sms/example-3/SmsHelloMonkey.8.x.java
diff --git a/quickstart/java/sms/example-4/MmsHelloMonkey.7.x.java b/quickstart/java/sms/example-4/MmsHelloMonkey.8.x.java
similarity index 100%
rename from quickstart/java/sms/example-4/MmsHelloMonkey.7.x.java
rename to quickstart/java/sms/example-4/MmsHelloMonkey.8.x.java
diff --git a/quickstart/java/sms/example-5/ReplyByName.7.x.java b/quickstart/java/sms/example-5/ReplyByName.8.x.java
similarity index 100%
rename from quickstart/java/sms/example-5/ReplyByName.7.x.java
rename to quickstart/java/sms/example-5/ReplyByName.8.x.java
diff --git a/quickstart/java/sms/example-6/TrackingSmsConversations.7.x.java b/quickstart/java/sms/example-6/TrackingSmsConversations.8.x.java
similarity index 100%
rename from quickstart/java/sms/example-6/TrackingSmsConversations.7.x.java
rename to quickstart/java/sms/example-6/TrackingSmsConversations.8.x.java
diff --git a/quickstart/java/sms/example-7/SendSmsDuringCall.7.x.java b/quickstart/java/sms/example-7/SendSmsDuringCall.8.x.java
similarity index 100%
rename from quickstart/java/sms/example-7/SendSmsDuringCall.7.x.java
rename to quickstart/java/sms/example-7/SendSmsDuringCall.8.x.java
diff --git a/quickstart/java/voice/example-1/MakePhoneCall.7.x.java b/quickstart/java/voice/example-1/MakePhoneCall.8.x.java
similarity index 100%
rename from quickstart/java/voice/example-1/MakePhoneCall.7.x.java
rename to quickstart/java/voice/example-1/MakePhoneCall.8.x.java
diff --git a/rest/access-tokens/ip-messaging-example/ip-messaging-example.7.x.java b/rest/access-tokens/ip-messaging-example/ip-messaging-example.8.x.java
similarity index 100%
rename from rest/access-tokens/ip-messaging-example/ip-messaging-example.7.x.java
rename to rest/access-tokens/ip-messaging-example/ip-messaging-example.8.x.java
diff --git a/rest/access-tokens/video-example/video-example.7.x.java b/rest/access-tokens/video-example/video-example.8.x.java
similarity index 100%
rename from rest/access-tokens/video-example/video-example.7.x.java
rename to rest/access-tokens/video-example/video-example.8.x.java
diff --git a/rest/access-tokens/voice-example/voice-example.7.x.java b/rest/access-tokens/voice-example/voice-example.8.x.java
similarity index 100%
rename from rest/access-tokens/voice-example/voice-example.7.x.java
rename to rest/access-tokens/voice-example/voice-example.8.x.java
diff --git a/rest/accounts/instance-get-example-1/instance-get-example-1.7.x.java b/rest/accounts/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/accounts/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/accounts/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/accounts/instance-post-example-1/instance-post-example-1.7.x.java b/rest/accounts/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/accounts/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/accounts/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/accounts/instance-post-example-2/instance-post-example-2.7.x.java b/rest/accounts/instance-post-example-2/instance-post-example-2.8.x.java
similarity index 100%
rename from rest/accounts/instance-post-example-2/instance-post-example-2.7.x.java
rename to rest/accounts/instance-post-example-2/instance-post-example-2.8.x.java
diff --git a/rest/accounts/instance-post-example-3/instance-post-example-3.7.x.java b/rest/accounts/instance-post-example-3/instance-post-example-3.8.x.java
similarity index 100%
rename from rest/accounts/instance-post-example-3/instance-post-example-3.7.x.java
rename to rest/accounts/instance-post-example-3/instance-post-example-3.8.x.java
diff --git a/rest/accounts/list-get-example-1/list-get-example-1.7.x.java b/rest/accounts/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/accounts/list-get-example-1/list-get-example-1.7.x.java
rename to rest/accounts/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/accounts/list-get-example-2/list-get-example-2.7.x.java b/rest/accounts/list-get-example-2/list-get-example-2.8.x.java
similarity index 100%
rename from rest/accounts/list-get-example-2/list-get-example-2.7.x.java
rename to rest/accounts/list-get-example-2/list-get-example-2.8.x.java
diff --git a/rest/addresses/instance-create-example/instance-create-example.7.x.java b/rest/addresses/instance-create-example/instance-create-example.8.x.java
similarity index 100%
rename from rest/addresses/instance-create-example/instance-create-example.7.x.java
rename to rest/addresses/instance-create-example/instance-create-example.8.x.java
diff --git a/rest/addresses/instance-get-example-1/instance-get-example-1.7.x.java b/rest/addresses/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/addresses/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/addresses/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/addresses/instance-post-example-1/instance-post-example-1.7.x.java b/rest/addresses/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/addresses/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/addresses/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/addresses/list-dependent-pns-example-1/list-dependent-pns-example-1.7.x.java b/rest/addresses/list-dependent-pns-example-1/list-dependent-pns-example-1.8.x.java
similarity index 100%
rename from rest/addresses/list-dependent-pns-example-1/list-dependent-pns-example-1.7.x.java
rename to rest/addresses/list-dependent-pns-example-1/list-dependent-pns-example-1.8.x.java
diff --git a/rest/addresses/list-get-example-1/list-get-example-1.7.x.java b/rest/addresses/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/addresses/list-get-example-1/list-get-example-1.7.x.java
rename to rest/addresses/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/addresses/list-get-example-2/list-get-example-2.7.x.java b/rest/addresses/list-get-example-2/list-get-example-2.8.x.java
similarity index 100%
rename from rest/addresses/list-get-example-2/list-get-example-2.7.x.java
rename to rest/addresses/list-get-example-2/list-get-example-2.8.x.java
diff --git a/rest/addresses/list-post-example-1/list-post-example-1.7.x.java b/rest/addresses/list-post-example-1/list-post-example-1.8.x.java
similarity index 100%
rename from rest/addresses/list-post-example-1/list-post-example-1.7.x.java
rename to rest/addresses/list-post-example-1/list-post-example-1.8.x.java
diff --git a/rest/answering-machine-detection/outgoing-call/outgoing-call-1.7.x.java b/rest/answering-machine-detection/outgoing-call/outgoing-call-1.8.x.java
similarity index 100%
rename from rest/answering-machine-detection/outgoing-call/outgoing-call-1.7.x.java
rename to rest/answering-machine-detection/outgoing-call/outgoing-call-1.8.x.java
diff --git a/rest/applications/instance-get-example-1/instance-get-example-1.7.x.java b/rest/applications/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/applications/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/applications/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/applications/instance-post-example-1/instance-post-example-1.7.x.java b/rest/applications/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/applications/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/applications/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/applications/list-get-example-1/list-get-example-1.7.x.java b/rest/applications/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/applications/list-get-example-1/list-get-example-1.7.x.java
rename to rest/applications/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/applications/list-get-example-2/list-get-example-2.7.x.java b/rest/applications/list-get-example-2/list-get-example-2.8.x.java
similarity index 100%
rename from rest/applications/list-get-example-2/list-get-example-2.7.x.java
rename to rest/applications/list-get-example-2/list-get-example-2.8.x.java
diff --git a/rest/applications/list-post-example-1/list-post-example-1.7.x.java b/rest/applications/list-post-example-1/list-post-example-1.8.x.java
similarity index 100%
rename from rest/applications/list-post-example-1/list-post-example-1.7.x.java
rename to rest/applications/list-post-example-1/list-post-example-1.8.x.java
diff --git a/rest/authorized-connect-apps/instance-get-example-1/instance-get-example-1.7.x.java b/rest/authorized-connect-apps/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/authorized-connect-apps/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/authorized-connect-apps/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/authorized-connect-apps/list-get-example-1/list-get-example-1.7.x.java b/rest/authorized-connect-apps/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/authorized-connect-apps/list-get-example-1/list-get-example-1.7.x.java
rename to rest/authorized-connect-apps/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/available-phone-numbers/local-advanced-example-1/local-get-advanced-example-1.7.x.java b/rest/available-phone-numbers/local-advanced-example-1/local-get-advanced-example-1.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/local-advanced-example-1/local-get-advanced-example-1.7.x.java
rename to rest/available-phone-numbers/local-advanced-example-1/local-get-advanced-example-1.8.x.java
diff --git a/rest/available-phone-numbers/local-basic-example-1/local-get-basic-example-1.7.x.java b/rest/available-phone-numbers/local-basic-example-1/local-get-basic-example-1.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/local-basic-example-1/local-get-basic-example-1.7.x.java
rename to rest/available-phone-numbers/local-basic-example-1/local-get-basic-example-1.8.x.java
diff --git a/rest/available-phone-numbers/local-basic-example-2/local-get-basic-example-2.7.x.java b/rest/available-phone-numbers/local-basic-example-2/local-get-basic-example-2.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/local-basic-example-2/local-get-basic-example-2.7.x.java
rename to rest/available-phone-numbers/local-basic-example-2/local-get-basic-example-2.8.x.java
diff --git a/rest/available-phone-numbers/local-basic-example-3/local-get-basic-example-3.7.x.java b/rest/available-phone-numbers/local-basic-example-3/local-get-basic-example-3.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/local-basic-example-3/local-get-basic-example-3.7.x.java
rename to rest/available-phone-numbers/local-basic-example-3/local-get-basic-example-3.8.x.java
diff --git a/rest/available-phone-numbers/local-basic-example-4/local-get-basic-example-4.7.x.java b/rest/available-phone-numbers/local-basic-example-4/local-get-basic-example-4.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/local-basic-example-4/local-get-basic-example-4.7.x.java
rename to rest/available-phone-numbers/local-basic-example-4/local-get-basic-example-4.8.x.java
diff --git a/rest/available-phone-numbers/local-basic-example-5/local-get-basic-example-5.7.x.java b/rest/available-phone-numbers/local-basic-example-5/local-get-basic-example-5.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/local-basic-example-5/local-get-basic-example-5.7.x.java
rename to rest/available-phone-numbers/local-basic-example-5/local-get-basic-example-5.8.x.java
diff --git a/rest/available-phone-numbers/local-basic-example-6/local-get-basic-example-6.7.x.java b/rest/available-phone-numbers/local-basic-example-6/local-get-basic-example-6.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/local-basic-example-6/local-get-basic-example-6.7.x.java
rename to rest/available-phone-numbers/local-basic-example-6/local-get-basic-example-6.8.x.java
diff --git a/rest/available-phone-numbers/local-basic-example-7/local-get-basic-example-7.7.x.java b/rest/available-phone-numbers/local-basic-example-7/local-get-basic-example-7.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/local-basic-example-7/local-get-basic-example-7.7.x.java
rename to rest/available-phone-numbers/local-basic-example-7/local-get-basic-example-7.8.x.java
diff --git a/rest/available-phone-numbers/local-basic-example-8/local-get-basic-example-8.7.x.java b/rest/available-phone-numbers/local-basic-example-8/local-get-basic-example-8.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/local-basic-example-8/local-get-basic-example-8.7.x.java
rename to rest/available-phone-numbers/local-basic-example-8/local-get-basic-example-8.8.x.java
diff --git a/rest/available-phone-numbers/mobile-example/mobile-get-example-1.7.x.java b/rest/available-phone-numbers/mobile-example/mobile-get-example-1.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/mobile-example/mobile-get-example-1.7.x.java
rename to rest/available-phone-numbers/mobile-example/mobile-get-example-1.8.x.java
diff --git a/rest/available-phone-numbers/toll-free-example-1/toll-free-get-example-1.7.x.java b/rest/available-phone-numbers/toll-free-example-1/toll-free-get-example-1.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/toll-free-example-1/toll-free-get-example-1.7.x.java
rename to rest/available-phone-numbers/toll-free-example-1/toll-free-get-example-1.8.x.java
diff --git a/rest/available-phone-numbers/toll-free-example-2/toll-free-get-example-2.7.x.java b/rest/available-phone-numbers/toll-free-example-2/toll-free-get-example-2.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/toll-free-example-2/toll-free-get-example-2.7.x.java
rename to rest/available-phone-numbers/toll-free-example-2/toll-free-get-example-2.8.x.java
diff --git a/rest/available-phone-numbers/toll-free-example-3/toll-free-get-example-3.7.x.java b/rest/available-phone-numbers/toll-free-example-3/toll-free-get-example-3.8.x.java
similarity index 100%
rename from rest/available-phone-numbers/toll-free-example-3/toll-free-get-example-3.7.x.java
rename to rest/available-phone-numbers/toll-free-example-3/toll-free-get-example-3.8.x.java
diff --git a/rest/call-feedback/instance-get-example-1/instance-get-example-1.7.x.java b/rest/call-feedback/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/call-feedback/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/call-feedback/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/call-feedback/instance-post-example-1/instance-post-example-1.7.x.java b/rest/call-feedback/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/call-feedback/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/call-feedback/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/call-feedback/summary-instance-delete-example-1/summary-instance-delete-example-1.7.x.java b/rest/call-feedback/summary-instance-delete-example-1/summary-instance-delete-example-1.8.x.java
similarity index 100%
rename from rest/call-feedback/summary-instance-delete-example-1/summary-instance-delete-example-1.7.x.java
rename to rest/call-feedback/summary-instance-delete-example-1/summary-instance-delete-example-1.8.x.java
diff --git a/rest/call-feedback/summary-instance-get-example-1/summary-instance-get-example-1.7.x.java b/rest/call-feedback/summary-instance-get-example-1/summary-instance-get-example-1.8.x.java
similarity index 100%
rename from rest/call-feedback/summary-instance-get-example-1/summary-instance-get-example-1.7.x.java
rename to rest/call-feedback/summary-instance-get-example-1/summary-instance-get-example-1.8.x.java
diff --git a/rest/call-feedback/summary-instance-get-example-2/summary-instance-get-example-2.7.x.java b/rest/call-feedback/summary-instance-get-example-2/summary-instance-get-example-2.8.x.java
similarity index 100%
rename from rest/call-feedback/summary-instance-get-example-2/summary-instance-get-example-2.7.x.java
rename to rest/call-feedback/summary-instance-get-example-2/summary-instance-get-example-2.8.x.java
diff --git a/rest/call/instance-get-example-1/instance-get-example-1.7.x.java b/rest/call/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/call/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/call/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/call/list-get-example-1/list-get-example-1.7.x.java b/rest/call/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/call/list-get-example-1/list-get-example-1.7.x.java
rename to rest/call/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/call/list-get-example-6/list-get-example-6.7.x.java b/rest/call/list-get-example-6/list-get-example-6.8.x.java
similarity index 100%
rename from rest/call/list-get-example-6/list-get-example-6.7.x.java
rename to rest/call/list-get-example-6/list-get-example-6.8.x.java
diff --git a/rest/call/list-get-example-6/local-get-advanced-example-6.7.x.java b/rest/call/list-get-example-6/local-get-advanced-example-6.8.x.java
similarity index 100%
rename from rest/call/list-get-example-6/local-get-advanced-example-6.7.x.java
rename to rest/call/list-get-example-6/local-get-advanced-example-6.8.x.java
diff --git a/rest/call/list-get-example-7/list-get-example-7.7.x.java b/rest/call/list-get-example-7/list-get-example-7.8.x.java
similarity index 100%
rename from rest/call/list-get-example-7/list-get-example-7.7.x.java
rename to rest/call/list-get-example-7/list-get-example-7.8.x.java
diff --git a/rest/change-call-state/example-1/example-1.7.x.java b/rest/change-call-state/example-1/example-1.8.x.java
similarity index 100%
rename from rest/change-call-state/example-1/example-1.7.x.java
rename to rest/change-call-state/example-1/example-1.8.x.java
diff --git a/rest/change-call-state/list-get-example-2/list-get-example-2.7.x.java b/rest/change-call-state/list-get-example-2/list-get-example-2.8.x.java
similarity index 100%
rename from rest/change-call-state/list-get-example-2/list-get-example-2.7.x.java
rename to rest/change-call-state/list-get-example-2/list-get-example-2.8.x.java
diff --git a/rest/conference/instance-get-example-1/instance-get-example-1.7.x.java b/rest/conference/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/conference/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/conference/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/conference/list-get-example-1/list-get-example-1.7.x.java b/rest/conference/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/conference/list-get-example-1/list-get-example-1.7.x.java
rename to rest/conference/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/conference/list-get-example-2/list-get-example-2.7.x.java b/rest/conference/list-get-example-2/list-get-example-2.8.x.java
similarity index 100%
rename from rest/conference/list-get-example-2/list-get-example-2.7.x.java
rename to rest/conference/list-get-example-2/list-get-example-2.8.x.java
diff --git a/rest/connect-apps/instance-get-example-1/instance-get-example-1.7.x.java b/rest/connect-apps/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/connect-apps/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/connect-apps/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/connect-apps/list-get-example-1/list-get-example-1.7.x.java b/rest/connect-apps/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/connect-apps/list-get-example-1/list-get-example-1.7.x.java
rename to rest/connect-apps/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/incoming-phone-numbers/instance-get-example-1/instance-get-example-1.7.x.java b/rest/incoming-phone-numbers/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/incoming-phone-numbers/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/incoming-phone-numbers/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/incoming-phone-numbers/instance-post-example-1/instance-post-example-1.7.x.java b/rest/incoming-phone-numbers/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/incoming-phone-numbers/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/incoming-phone-numbers/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/incoming-phone-numbers/list-get-example-1/list-get-example-1.7.x.java b/rest/incoming-phone-numbers/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/incoming-phone-numbers/list-get-example-1/list-get-example-1.7.x.java
rename to rest/incoming-phone-numbers/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/incoming-phone-numbers/list-get-example-2/list-get-example-2.7.x.java b/rest/incoming-phone-numbers/list-get-example-2/list-get-example-2.8.x.java
similarity index 100%
rename from rest/incoming-phone-numbers/list-get-example-2/list-get-example-2.7.x.java
rename to rest/incoming-phone-numbers/list-get-example-2/list-get-example-2.8.x.java
diff --git a/rest/incoming-phone-numbers/list-get-example-3/list-get-example-3.7.x.java b/rest/incoming-phone-numbers/list-get-example-3/list-get-example-3.8.x.java
similarity index 100%
rename from rest/incoming-phone-numbers/list-get-example-3/list-get-example-3.7.x.java
rename to rest/incoming-phone-numbers/list-get-example-3/list-get-example-3.8.x.java
diff --git a/rest/incoming-phone-numbers/list-post-example-1/list-post-example-1.7.x.java b/rest/incoming-phone-numbers/list-post-example-1/list-post-example-1.8.x.java
similarity index 100%
rename from rest/incoming-phone-numbers/list-post-example-1/list-post-example-1.7.x.java
rename to rest/incoming-phone-numbers/list-post-example-1/list-post-example-1.8.x.java
diff --git a/rest/keys/instance-get-example/instance-get-example.7.x.java b/rest/keys/instance-get-example/instance-get-example.8.x.java
similarity index 100%
rename from rest/keys/instance-get-example/instance-get-example.7.x.java
rename to rest/keys/instance-get-example/instance-get-example.8.x.java
diff --git a/rest/keys/list-get-example/list-get-example.7.x.java b/rest/keys/list-get-example/list-get-example.8.x.java
similarity index 100%
rename from rest/keys/list-get-example/list-get-example.7.x.java
rename to rest/keys/list-get-example/list-get-example.8.x.java
diff --git a/rest/keys/list-post-example/list-post-example.7.x.java b/rest/keys/list-post-example/list-post-example.8.x.java
similarity index 100%
rename from rest/keys/list-post-example/list-post-example.7.x.java
rename to rest/keys/list-post-example/list-post-example.8.x.java
diff --git a/rest/keys/using-keys-example/example.7.x.java b/rest/keys/using-keys-example/example.8.x.java
similarity index 100%
rename from rest/keys/using-keys-example/example.7.x.java
rename to rest/keys/using-keys-example/example.8.x.java
diff --git a/rest/making-calls-sip/example-1/example-1.7.x.java b/rest/making-calls-sip/example-1/example-1.8.x.java
similarity index 100%
rename from rest/making-calls-sip/example-1/example-1.7.x.java
rename to rest/making-calls-sip/example-1/example-1.8.x.java
diff --git a/rest/making-calls-sip/example-2/example-2.7.x.java b/rest/making-calls-sip/example-2/example-2.8.x.java
similarity index 100%
rename from rest/making-calls-sip/example-2/example-2.7.x.java
rename to rest/making-calls-sip/example-2/example-2.8.x.java
diff --git a/rest/making-calls-sip/example-3/example-3.7.x.java b/rest/making-calls-sip/example-3/example-3.8.x.java
similarity index 100%
rename from rest/making-calls-sip/example-3/example-3.7.x.java
rename to rest/making-calls-sip/example-3/example-3.8.x.java
diff --git a/rest/making-calls/example-1/example-1.7.x.java b/rest/making-calls/example-1/example-1.8.x.java
similarity index 100%
rename from rest/making-calls/example-1/example-1.7.x.java
rename to rest/making-calls/example-1/example-1.8.x.java
diff --git a/rest/making-calls/example-2/example-2.7.x.java b/rest/making-calls/example-2/example-2.8.x.java
similarity index 100%
rename from rest/making-calls/example-2/example-2.7.x.java
rename to rest/making-calls/example-2/example-2.8.x.java
diff --git a/rest/making-calls/example-3/example-3.7.x.java b/rest/making-calls/example-3/example-3.8.x.java
similarity index 100%
rename from rest/making-calls/example-3/example-3.7.x.java
rename to rest/making-calls/example-3/example-3.8.x.java
diff --git a/rest/making-calls/example-4/example-4.7.x.java b/rest/making-calls/example-4/example-4.8.x.java
similarity index 100%
rename from rest/making-calls/example-4/example-4.7.x.java
rename to rest/making-calls/example-4/example-4.8.x.java
diff --git a/rest/media/instance-delete-example-1/instance-delete-example-1.7.x.java b/rest/media/instance-delete-example-1/instance-delete-example-1.8.x.java
similarity index 100%
rename from rest/media/instance-delete-example-1/instance-delete-example-1.7.x.java
rename to rest/media/instance-delete-example-1/instance-delete-example-1.8.x.java
diff --git a/rest/media/list-get-example-1/list-get-example-1.7.x.java b/rest/media/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/media/list-get-example-1/list-get-example-1.7.x.java
rename to rest/media/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/member/instance-get-example-1/instance-get-example-1.7.x.java b/rest/member/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/member/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/member/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/member/instance-post-example-1/instance-post-example-1.7.x.java b/rest/member/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/member/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/member/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/member/instance-post-example-2/instance-post-example-2.7.x.java b/rest/member/instance-post-example-2/instance-post-example-2.8.x.java
similarity index 100%
rename from rest/member/instance-post-example-2/instance-post-example-2.7.x.java
rename to rest/member/instance-post-example-2/instance-post-example-2.8.x.java
diff --git a/rest/member/list-get-example-1/list-get-example-1.7.x.java b/rest/member/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/member/list-get-example-1/list-get-example-1.7.x.java
rename to rest/member/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/message/instance-delete/example-1.7.x.java b/rest/message/instance-delete/example-1.8.x.java
similarity index 100%
rename from rest/message/instance-delete/example-1.7.x.java
rename to rest/message/instance-delete/example-1.8.x.java
diff --git a/rest/message/instance-get-example-1/instance-get-example-1.7.x.java b/rest/message/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/message/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/message/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/message/instance-post-example-1/instance-post-example-1.7.x.java b/rest/message/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/message/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/message/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/message/list-get-example-1/list-get-example-1.7.x.java b/rest/message/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/message/list-get-example-1/list-get-example-1.7.x.java
rename to rest/message/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/messages/feedback-confirm/feedback-confirm.7.x.java b/rest/messages/feedback-confirm/feedback-confirm.8.x.java
similarity index 100%
rename from rest/messages/feedback-confirm/feedback-confirm.7.x.java
rename to rest/messages/feedback-confirm/feedback-confirm.8.x.java
diff --git a/rest/messages/feedback-send-sms/feedback-send-sms.7.x.java b/rest/messages/feedback-send-sms/feedback-send-sms.8.x.java
similarity index 100%
rename from rest/messages/feedback-send-sms/feedback-send-sms.7.x.java
rename to rest/messages/feedback-send-sms/feedback-send-sms.8.x.java
diff --git a/rest/messages/generate-twiml-dynamic-sms/generate-twiml-dynamic-sms.7.x.java b/rest/messages/generate-twiml-dynamic-sms/generate-twiml-dynamic-sms.8.x.java
similarity index 100%
rename from rest/messages/generate-twiml-dynamic-sms/generate-twiml-dynamic-sms.7.x.java
rename to rest/messages/generate-twiml-dynamic-sms/generate-twiml-dynamic-sms.8.x.java
diff --git a/rest/messages/generate-twiml-mms/generate-twiml-mms.7.x.java b/rest/messages/generate-twiml-mms/generate-twiml-mms.8.x.java
similarity index 100%
rename from rest/messages/generate-twiml-mms/generate-twiml-mms.7.x.java
rename to rest/messages/generate-twiml-mms/generate-twiml-mms.8.x.java
diff --git a/rest/messages/generate-twiml-sms-voice/example-1.7.x.java b/rest/messages/generate-twiml-sms-voice/example-1.8.x.java
similarity index 100%
rename from rest/messages/generate-twiml-sms-voice/example-1.7.x.java
rename to rest/messages/generate-twiml-sms-voice/example-1.8.x.java
diff --git a/rest/messages/generate-twiml-sms/generate-twiml-sms.7.x.java b/rest/messages/generate-twiml-sms/generate-twiml-sms.8.x.java
similarity index 100%
rename from rest/messages/generate-twiml-sms/generate-twiml-sms.7.x.java
rename to rest/messages/generate-twiml-sms/generate-twiml-sms.8.x.java
diff --git a/rest/messages/send-message/example-1.7.x.java b/rest/messages/send-message/example-1.8.x.java
similarity index 100%
rename from rest/messages/send-message/example-1.7.x.java
rename to rest/messages/send-message/example-1.8.x.java
diff --git a/rest/messages/send-messages-copilot/send-messages-copilot.7.x.java b/rest/messages/send-messages-copilot/send-messages-copilot.8.x.java
similarity index 100%
rename from rest/messages/send-messages-copilot/send-messages-copilot.7.x.java
rename to rest/messages/send-messages-copilot/send-messages-copilot.8.x.java
diff --git a/rest/messages/send-sms-callback/send-sms-callback.7.x.java b/rest/messages/send-sms-callback/send-sms-callback.8.x.java
similarity index 100%
rename from rest/messages/send-sms-callback/send-sms-callback.7.x.java
rename to rest/messages/send-sms-callback/send-sms-callback.8.x.java
diff --git a/rest/messages/send-sms/send-sms.7.x.java b/rest/messages/send-sms/send-sms.8.x.java
similarity index 100%
rename from rest/messages/send-sms/send-sms.7.x.java
rename to rest/messages/send-sms/send-sms.8.x.java
diff --git a/rest/messages/sms-conversation-tracking/sms-conversation-tracking.7.x.java b/rest/messages/sms-conversation-tracking/sms-conversation-tracking.8.x.java
similarity index 100%
rename from rest/messages/sms-conversation-tracking/sms-conversation-tracking.7.x.java
rename to rest/messages/sms-conversation-tracking/sms-conversation-tracking.8.x.java
diff --git a/rest/notification/instance-delete-examples/instance-delete-examples.7.x.java b/rest/notification/instance-delete-examples/instance-delete-examples.8.x.java
similarity index 100%
rename from rest/notification/instance-delete-examples/instance-delete-examples.7.x.java
rename to rest/notification/instance-delete-examples/instance-delete-examples.8.x.java
diff --git a/rest/notification/instance-get-example-1/instance-get-example-1.7.x.java b/rest/notification/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/notification/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/notification/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/notification/list-get-example-1/list-get-example-1.7.x.java b/rest/notification/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/notification/list-get-example-1/list-get-example-1.7.x.java
rename to rest/notification/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/outgoing-caller-ids/instance-delete/instance-delete.7.x.java b/rest/outgoing-caller-ids/instance-delete/instance-delete.8.x.java
similarity index 100%
rename from rest/outgoing-caller-ids/instance-delete/instance-delete.7.x.java
rename to rest/outgoing-caller-ids/instance-delete/instance-delete.8.x.java
diff --git a/rest/outgoing-caller-ids/instance-get-example-1/instance-get-example-1.7.x.java b/rest/outgoing-caller-ids/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/outgoing-caller-ids/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/outgoing-caller-ids/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/outgoing-caller-ids/instance-post-example-1/instance-post-example-1.7.x.java b/rest/outgoing-caller-ids/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/outgoing-caller-ids/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/outgoing-caller-ids/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/outgoing-caller-ids/list-get-example-1/list-get-example-1.7.x.java b/rest/outgoing-caller-ids/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/outgoing-caller-ids/list-get-example-1/list-get-example-1.7.x.java
rename to rest/outgoing-caller-ids/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/outgoing-caller-ids/list-get-example-2/list-get-example-2.7.x.java b/rest/outgoing-caller-ids/list-get-example-2/list-get-example-2.8.x.java
similarity index 100%
rename from rest/outgoing-caller-ids/list-get-example-2/list-get-example-2.7.x.java
rename to rest/outgoing-caller-ids/list-get-example-2/list-get-example-2.8.x.java
diff --git a/rest/outgoing-caller-ids/list-post-example-1/list-post-example-1.7.x.java b/rest/outgoing-caller-ids/list-post-example-1/list-post-example-1.8.x.java
similarity index 100%
rename from rest/outgoing-caller-ids/list-post-example-1/list-post-example-1.7.x.java
rename to rest/outgoing-caller-ids/list-post-example-1/list-post-example-1.8.x.java
diff --git a/rest/participant/instance-delete-example-1/instance-delete-example-1.7.x.java b/rest/participant/instance-delete-example-1/instance-delete-example-1.8.x.java
similarity index 100%
rename from rest/participant/instance-delete-example-1/instance-delete-example-1.7.x.java
rename to rest/participant/instance-delete-example-1/instance-delete-example-1.8.x.java
diff --git a/rest/participant/instance-get-example-1/instance-get-example-1.7.x.java b/rest/participant/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/participant/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/participant/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/participant/instance-post-example-1/instance-post-example-1.7.x.java b/rest/participant/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/participant/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/participant/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/participant/instance-post-example-2/instance-post-example-2.7.x.java b/rest/participant/instance-post-example-2/instance-post-example-2.8.x.java
similarity index 100%
rename from rest/participant/instance-post-example-2/instance-post-example-2.7.x.java
rename to rest/participant/instance-post-example-2/instance-post-example-2.8.x.java
diff --git a/rest/participant/list-get-example-1/list-get-example-1.7.x.java b/rest/participant/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/participant/list-get-example-1/list-get-example-1.7.x.java
rename to rest/participant/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/participant/list-post-example-1/list-post-example-1.7.x.java b/rest/participant/list-post-example-1/list-post-example-1.8.x.java
similarity index 100%
rename from rest/participant/list-post-example-1/list-post-example-1.7.x.java
rename to rest/participant/list-post-example-1/list-post-example-1.8.x.java
diff --git a/rest/queue/instance-get-example-1/instance-get-example-1.7.x.java b/rest/queue/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/queue/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/queue/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/queue/instance-post-example-1/instance-post-example-1.7.x.java b/rest/queue/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/queue/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/queue/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/queue/list-get-example-1/list-get-example-1.7.x.java b/rest/queue/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/queue/list-get-example-1/list-get-example-1.7.x.java
rename to rest/queue/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/queue/list-post-example-1/list-post-example-1.7.x.java b/rest/queue/list-post-example-1/list-post-example-1.8.x.java
similarity index 100%
rename from rest/queue/list-post-example-1/list-post-example-1.7.x.java
rename to rest/queue/list-post-example-1/list-post-example-1.8.x.java
diff --git a/rest/recording/get-recording-xml/get-recording-xml.7.x.java b/rest/recording/get-recording-xml/get-recording-xml.8.x.java
similarity index 100%
rename from rest/recording/get-recording-xml/get-recording-xml.7.x.java
rename to rest/recording/get-recording-xml/get-recording-xml.8.x.java
diff --git a/rest/recording/instance-delete-examples/instance-delete-examples.7.x.java b/rest/recording/instance-delete-examples/instance-delete-examples.8.x.java
similarity index 100%
rename from rest/recording/instance-delete-examples/instance-delete-examples.7.x.java
rename to rest/recording/instance-delete-examples/instance-delete-examples.8.x.java
diff --git a/rest/recording/list-get-example-1/list-get-example-1.7.x.java b/rest/recording/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/recording/list-get-example-1/list-get-example-1.7.x.java
rename to rest/recording/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/recording/list-recording-transcriptions/list-recording-transcriptions-7.x.java b/rest/recording/list-recording-transcriptions/list-recording-transcriptions-8.x.java
similarity index 100%
rename from rest/recording/list-recording-transcriptions/list-recording-transcriptions-7.x.java
rename to rest/recording/list-recording-transcriptions/list-recording-transcriptions-8.x.java
diff --git a/rest/sending-messages/example-1/example-1.7.x.java b/rest/sending-messages/example-1/example-1.8.x.java
similarity index 100%
rename from rest/sending-messages/example-1/example-1.7.x.java
rename to rest/sending-messages/example-1/example-1.8.x.java
diff --git a/rest/short-codes/instance-get-example-1/instance-get-example-1.7.x.java b/rest/short-codes/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/short-codes/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/short-codes/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/short-codes/instance-post-example-1/instance-post-example-1.7.x.java b/rest/short-codes/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/short-codes/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/short-codes/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/short-codes/list-get-example-1/list-get-example-1.7.x.java b/rest/short-codes/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/short-codes/list-get-example-1/list-get-example-1.7.x.java
rename to rest/short-codes/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/short-codes/list-get-example-2/list-get-example-2.7.x.java b/rest/short-codes/list-get-example-2/list-get-example-2.8.x.java
similarity index 100%
rename from rest/short-codes/list-get-example-2/list-get-example-2.7.x.java
rename to rest/short-codes/list-get-example-2/list-get-example-2.8.x.java
diff --git a/rest/short-codes/list-get-example-3/list-get-example-3.7.x.java b/rest/short-codes/list-get-example-3/list-get-example-3.8.x.java
similarity index 100%
rename from rest/short-codes/list-get-example-3/list-get-example-3.7.x.java
rename to rest/short-codes/list-get-example-3/list-get-example-3.8.x.java
diff --git a/rest/sip-in/associate-control-domain/associate-control-domain.7.x.java b/rest/sip-in/associate-control-domain/associate-control-domain.8.x.java
similarity index 100%
rename from rest/sip-in/associate-control-domain/associate-control-domain.7.x.java
rename to rest/sip-in/associate-control-domain/associate-control-domain.8.x.java
diff --git a/rest/sip-in/create-acl-address/create-acl-address.7.x.java b/rest/sip-in/create-acl-address/create-acl-address.8.x.java
similarity index 100%
rename from rest/sip-in/create-acl-address/create-acl-address.7.x.java
rename to rest/sip-in/create-acl-address/create-acl-address.8.x.java
diff --git a/rest/sip-in/create-credential-list/create-credential-list.7.x.java b/rest/sip-in/create-credential-list/create-credential-list.8.x.java
similarity index 100%
rename from rest/sip-in/create-credential-list/create-credential-list.7.x.java
rename to rest/sip-in/create-credential-list/create-credential-list.8.x.java
diff --git a/rest/sip-in/create-credential/create-credential.7.x.java b/rest/sip-in/create-credential/create-credential.8.x.java
similarity index 100%
rename from rest/sip-in/create-credential/create-credential.7.x.java
rename to rest/sip-in/create-credential/create-credential.8.x.java
diff --git a/rest/sip-in/create-domain/create-domain.7.x.java b/rest/sip-in/create-domain/create-domain.8.x.java
similarity index 100%
rename from rest/sip-in/create-domain/create-domain.7.x.java
rename to rest/sip-in/create-domain/create-domain.8.x.java
diff --git a/rest/sip-in/create-ip-acl/create-ip-acl.7.x.java b/rest/sip-in/create-ip-acl/create-ip-acl.8.x.java
similarity index 100%
rename from rest/sip-in/create-ip-acl/create-ip-acl.7.x.java
rename to rest/sip-in/create-ip-acl/create-ip-acl.8.x.java
diff --git a/rest/sip-in/delete-access-mapping-old/delete-access-mapping.7.x.java b/rest/sip-in/delete-access-mapping-old/delete-access-mapping.8.x.java
similarity index 100%
rename from rest/sip-in/delete-access-mapping-old/delete-access-mapping.7.x.java
rename to rest/sip-in/delete-access-mapping-old/delete-access-mapping.8.x.java
diff --git a/rest/sip-in/delete-access-mapping/delete-access-mapping.7.x.java b/rest/sip-in/delete-access-mapping/delete-access-mapping.8.x.java
similarity index 100%
rename from rest/sip-in/delete-access-mapping/delete-access-mapping.7.x.java
rename to rest/sip-in/delete-access-mapping/delete-access-mapping.8.x.java
diff --git a/rest/sip-in/delete-address-instance/delete-address-instance.7.x.java b/rest/sip-in/delete-address-instance/delete-address-instance.8.x.java
similarity index 100%
rename from rest/sip-in/delete-address-instance/delete-address-instance.7.x.java
rename to rest/sip-in/delete-address-instance/delete-address-instance.8.x.java
diff --git a/rest/sip-in/delete-credential-list-instance/delete-credential-list-instance.7.x.java b/rest/sip-in/delete-credential-list-instance/delete-credential-list-instance.8.x.java
similarity index 100%
rename from rest/sip-in/delete-credential-list-instance/delete-credential-list-instance.7.x.java
rename to rest/sip-in/delete-credential-list-instance/delete-credential-list-instance.8.x.java
diff --git a/rest/sip-in/delete-credential-list-mapping-old/delete-credential-list-mapping.7.x.java b/rest/sip-in/delete-credential-list-mapping-old/delete-credential-list-mapping.8.x.java
similarity index 100%
rename from rest/sip-in/delete-credential-list-mapping-old/delete-credential-list-mapping.7.x.java
rename to rest/sip-in/delete-credential-list-mapping-old/delete-credential-list-mapping.8.x.java
diff --git a/rest/sip-in/delete-credential-list-mapping/delete-credential-list-mapping.7.x.java b/rest/sip-in/delete-credential-list-mapping/delete-credential-list-mapping.8.x.java
similarity index 100%
rename from rest/sip-in/delete-credential-list-mapping/delete-credential-list-mapping.7.x.java
rename to rest/sip-in/delete-credential-list-mapping/delete-credential-list-mapping.8.x.java
diff --git a/rest/sip-in/delete-credential/delete-credential.7.x.java b/rest/sip-in/delete-credential/delete-credential.8.x.java
similarity index 100%
rename from rest/sip-in/delete-credential/delete-credential.7.x.java
rename to rest/sip-in/delete-credential/delete-credential.8.x.java
diff --git a/rest/sip-in/delete-domain-instance/delete-domain-instance.7.x.java b/rest/sip-in/delete-domain-instance/delete-domain-instance.8.x.java
similarity index 100%
rename from rest/sip-in/delete-domain-instance/delete-domain-instance.7.x.java
rename to rest/sip-in/delete-domain-instance/delete-domain-instance.8.x.java
diff --git a/rest/sip-in/delete-ip-acl/delete-ip-acl.7.x.java b/rest/sip-in/delete-ip-acl/delete-ip-acl.8.x.java
similarity index 100%
rename from rest/sip-in/delete-ip-acl/delete-ip-acl.7.x.java
rename to rest/sip-in/delete-ip-acl/delete-ip-acl.8.x.java
diff --git a/rest/sip-in/get-acl-addresses/get-acl-addresses.7.x.java b/rest/sip-in/get-acl-addresses/get-acl-addresses.8.x.java
similarity index 100%
rename from rest/sip-in/get-acl-addresses/get-acl-addresses.7.x.java
rename to rest/sip-in/get-acl-addresses/get-acl-addresses.8.x.java
diff --git a/rest/sip-in/get-acl-list/get-acl-list.7.x.java b/rest/sip-in/get-acl-list/get-acl-list.8.x.java
similarity index 100%
rename from rest/sip-in/get-acl-list/get-acl-list.7.x.java
rename to rest/sip-in/get-acl-list/get-acl-list.8.x.java
diff --git a/rest/sip-in/get-acl-lists/get-acl-lists.7.x.java b/rest/sip-in/get-acl-lists/get-acl-lists.8.x.java
similarity index 100%
rename from rest/sip-in/get-acl-lists/get-acl-lists.7.x.java
rename to rest/sip-in/get-acl-lists/get-acl-lists.8.x.java
diff --git a/rest/sip-in/get-address-instance/get-address-instance.7.x.java b/rest/sip-in/get-address-instance/get-address-instance.8.x.java
similarity index 100%
rename from rest/sip-in/get-address-instance/get-address-instance.7.x.java
rename to rest/sip-in/get-address-instance/get-address-instance.8.x.java
diff --git a/rest/sip-in/get-credential-list-instance/get-credential-list-instance.7.x.java b/rest/sip-in/get-credential-list-instance/get-credential-list-instance.8.x.java
similarity index 100%
rename from rest/sip-in/get-credential-list-instance/get-credential-list-instance.7.x.java
rename to rest/sip-in/get-credential-list-instance/get-credential-list-instance.8.x.java
diff --git a/rest/sip-in/get-credential-list-mappings/get-credential-list-mappings.7.x.java b/rest/sip-in/get-credential-list-mappings/get-credential-list-mappings.8.x.java
similarity index 100%
rename from rest/sip-in/get-credential-list-mappings/get-credential-list-mappings.7.x.java
rename to rest/sip-in/get-credential-list-mappings/get-credential-list-mappings.8.x.java
diff --git a/rest/sip-in/get-credential-lists-credentials/get-credential-lists-credentials.7.x.java b/rest/sip-in/get-credential-lists-credentials/get-credential-lists-credentials.8.x.java
similarity index 100%
rename from rest/sip-in/get-credential-lists-credentials/get-credential-lists-credentials.7.x.java
rename to rest/sip-in/get-credential-lists-credentials/get-credential-lists-credentials.8.x.java
diff --git a/rest/sip-in/get-credential-lists/get-credential-lists.7.x.java b/rest/sip-in/get-credential-lists/get-credential-lists.8.x.java
similarity index 100%
rename from rest/sip-in/get-credential-lists/get-credential-lists.7.x.java
rename to rest/sip-in/get-credential-lists/get-credential-lists.8.x.java
diff --git a/rest/sip-in/get-credential/get-credential.7.x.java b/rest/sip-in/get-credential/get-credential.8.x.java
similarity index 100%
rename from rest/sip-in/get-credential/get-credential.7.x.java
rename to rest/sip-in/get-credential/get-credential.8.x.java
diff --git a/rest/sip-in/get-domain-instance/get-domain-instance.7.x.java b/rest/sip-in/get-domain-instance/get-domain-instance.8.x.java
similarity index 100%
rename from rest/sip-in/get-domain-instance/get-domain-instance.7.x.java
rename to rest/sip-in/get-domain-instance/get-domain-instance.8.x.java
diff --git a/rest/sip-in/get-domain-mappings/get-domain-mappings.7.x.java b/rest/sip-in/get-domain-mappings/get-domain-mappings.8.x.java
similarity index 100%
rename from rest/sip-in/get-domain-mappings/get-domain-mappings.7.x.java
rename to rest/sip-in/get-domain-mappings/get-domain-mappings.8.x.java
diff --git a/rest/sip-in/get-domains/get-domains.7.x.java b/rest/sip-in/get-domains/get-domains.8.x.java
similarity index 100%
rename from rest/sip-in/get-domains/get-domains.7.x.java
rename to rest/sip-in/get-domains/get-domains.8.x.java
diff --git a/rest/sip-in/get-ip-acls/get-ip-acls.7.x.java b/rest/sip-in/get-ip-acls/get-ip-acls.8.x.java
similarity index 100%
rename from rest/sip-in/get-ip-acls/get-ip-acls.7.x.java
rename to rest/sip-in/get-ip-acls/get-ip-acls.8.x.java
diff --git a/rest/sip-in/get-mappings-instance-old/get-mappings-instance.7.x.java b/rest/sip-in/get-mappings-instance-old/get-mappings-instance.8.x.java
similarity index 100%
rename from rest/sip-in/get-mappings-instance-old/get-mappings-instance.7.x.java
rename to rest/sip-in/get-mappings-instance-old/get-mappings-instance.8.x.java
diff --git a/rest/sip-in/get-mappings-instance/get-mappings-instance.7.x.java b/rest/sip-in/get-mappings-instance/get-mappings-instance.8.x.java
similarity index 100%
rename from rest/sip-in/get-mappings-instance/get-mappings-instance.7.x.java
rename to rest/sip-in/get-mappings-instance/get-mappings-instance.8.x.java
diff --git a/rest/sip-in/map-credential-list-domain-old/map-credential-list-domain.7.x.java b/rest/sip-in/map-credential-list-domain-old/map-credential-list-domain.8.x.java
similarity index 100%
rename from rest/sip-in/map-credential-list-domain-old/map-credential-list-domain.7.x.java
rename to rest/sip-in/map-credential-list-domain-old/map-credential-list-domain.8.x.java
diff --git a/rest/sip-in/map-credential-list-domain/map-credential-list-domain.7.x.java b/rest/sip-in/map-credential-list-domain/map-credential-list-domain.8.x.java
similarity index 100%
rename from rest/sip-in/map-credential-list-domain/map-credential-list-domain.7.x.java
rename to rest/sip-in/map-credential-list-domain/map-credential-list-domain.8.x.java
diff --git a/rest/sip-in/map-list-domain-old/map-list-domain.7.x.java b/rest/sip-in/map-list-domain-old/map-list-domain.8.x.java
similarity index 100%
rename from rest/sip-in/map-list-domain-old/map-list-domain.7.x.java
rename to rest/sip-in/map-list-domain-old/map-list-domain.8.x.java
diff --git a/rest/sip-in/map-list-domain/map-list-domain.7.x.java b/rest/sip-in/map-list-domain/map-list-domain.8.x.java
similarity index 100%
rename from rest/sip-in/map-list-domain/map-list-domain.7.x.java
rename to rest/sip-in/map-list-domain/map-list-domain.8.x.java
diff --git a/rest/sip-in/update-address-instance/update-address-instance.7.x.java b/rest/sip-in/update-address-instance/update-address-instance.8.x.java
similarity index 100%
rename from rest/sip-in/update-address-instance/update-address-instance.7.x.java
rename to rest/sip-in/update-address-instance/update-address-instance.8.x.java
diff --git a/rest/sip-in/update-credential-list-instance/update-credential-list-instance.7.x.java b/rest/sip-in/update-credential-list-instance/update-credential-list-instance.8.x.java
similarity index 100%
rename from rest/sip-in/update-credential-list-instance/update-credential-list-instance.7.x.java
rename to rest/sip-in/update-credential-list-instance/update-credential-list-instance.8.x.java
diff --git a/rest/sip-in/update-credential/update-credential.7.x.java b/rest/sip-in/update-credential/update-credential.8.x.java
similarity index 100%
rename from rest/sip-in/update-credential/update-credential.7.x.java
rename to rest/sip-in/update-credential/update-credential.8.x.java
diff --git a/rest/sip-in/update-domain-instance/update-domain-instance.7.x.java b/rest/sip-in/update-domain-instance/update-domain-instance.8.x.java
similarity index 100%
rename from rest/sip-in/update-domain-instance/update-domain-instance.7.x.java
rename to rest/sip-in/update-domain-instance/update-domain-instance.8.x.java
diff --git a/rest/sip-in/update-ip-acl-instance/update-ip-acl-instance.7.x.java b/rest/sip-in/update-ip-acl-instance/update-ip-acl-instance.8.x.java
similarity index 100%
rename from rest/sip-in/update-ip-acl-instance/update-ip-acl-instance.7.x.java
rename to rest/sip-in/update-ip-acl-instance/update-ip-acl-instance.8.x.java
diff --git a/rest/sip/example-1/example-1.7.x.java b/rest/sip/example-1/example-1.8.x.java
similarity index 100%
rename from rest/sip/example-1/example-1.7.x.java
rename to rest/sip/example-1/example-1.8.x.java
diff --git a/rest/sip/example-2/example-2.7.x.java b/rest/sip/example-2/example-2.8.x.java
similarity index 100%
rename from rest/sip/example-2/example-2.7.x.java
rename to rest/sip/example-2/example-2.8.x.java
diff --git a/rest/sip/example-3/example-3.7.x.java b/rest/sip/example-3/example-3.8.x.java
similarity index 100%
rename from rest/sip/example-3/example-3.7.x.java
rename to rest/sip/example-3/example-3.8.x.java
diff --git a/rest/sms/instance-get-example-1/instance-get-example-1.7.x.java b/rest/sms/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/sms/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/sms/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/sms/list-get-example-1/list-get-example-1.7.x.java b/rest/sms/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/sms/list-get-example-1/list-get-example-1.7.x.java
rename to rest/sms/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/subaccounts/creating-subaccounts-example-1/creating-subaccounts-example-1.7.x.java b/rest/subaccounts/creating-subaccounts-example-1/creating-subaccounts-example-1.8.x.java
similarity index 100%
rename from rest/subaccounts/creating-subaccounts-example-1/creating-subaccounts-example-1.7.x.java
rename to rest/subaccounts/creating-subaccounts-example-1/creating-subaccounts-example-1.8.x.java
diff --git a/rest/subaccounts/exchanging-numbers-example-1/exchanging-numbers-example-1.7.x.java b/rest/subaccounts/exchanging-numbers-example-1/exchanging-numbers-example-1.8.x.java
similarity index 100%
rename from rest/subaccounts/exchanging-numbers-example-1/exchanging-numbers-example-1.7.x.java
rename to rest/subaccounts/exchanging-numbers-example-1/exchanging-numbers-example-1.8.x.java
diff --git a/rest/subaccounts/listing-subaccounts-example-1/listing-subaccounts-example-1.7.x.java b/rest/subaccounts/listing-subaccounts-example-1/listing-subaccounts-example-1.8.x.java
similarity index 100%
rename from rest/subaccounts/listing-subaccounts-example-1/listing-subaccounts-example-1.7.x.java
rename to rest/subaccounts/listing-subaccounts-example-1/listing-subaccounts-example-1.8.x.java
diff --git a/rest/subaccounts/listing-subaccounts-example-2/listing-subaccounts-example-2.7.x.java b/rest/subaccounts/listing-subaccounts-example-2/listing-subaccounts-example-2.8.x.java
similarity index 100%
rename from rest/subaccounts/listing-subaccounts-example-2/listing-subaccounts-example-2.7.x.java
rename to rest/subaccounts/listing-subaccounts-example-2/listing-subaccounts-example-2.8.x.java
diff --git a/rest/subaccounts/voice-example/subaccount-call.7.x.java b/rest/subaccounts/voice-example/subaccount-call.8.x.java
similarity index 100%
rename from rest/subaccounts/voice-example/subaccount-call.7.x.java
rename to rest/subaccounts/voice-example/subaccount-call.8.x.java
diff --git a/rest/taskrouter/activities/instance/delete/example-1/example-1.7.x.java b/rest/taskrouter/activities/instance/delete/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/activities/instance/delete/example-1/example-1.7.x.java
rename to rest/taskrouter/activities/instance/delete/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/activities/instance/get/example-1/example-1.7.x.java b/rest/taskrouter/activities/instance/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/activities/instance/get/example-1/example-1.7.x.java
rename to rest/taskrouter/activities/instance/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/activities/instance/post/example-1/example-1.7.x.java b/rest/taskrouter/activities/instance/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/activities/instance/post/example-1/example-1.7.x.java
rename to rest/taskrouter/activities/instance/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/activities/list/get/example-1/example-1.7.x.java b/rest/taskrouter/activities/list/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/activities/list/get/example-1/example-1.7.x.java
rename to rest/taskrouter/activities/list/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/activities/list/post/example-1/example-1.7.x.java b/rest/taskrouter/activities/list/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/activities/list/post/example-1/example-1.7.x.java
rename to rest/taskrouter/activities/list/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/events/example-1/example-1.7.x.java b/rest/taskrouter/events/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/events/example-1/example-1.7.x.java
rename to rest/taskrouter/events/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/jwts/taskqueue/example-1/example-1.8.x.java b/rest/taskrouter/jwts/taskqueue/example-1/example-1.8.x.java
new file mode 100644
index 0000000000..b9e12d9d87
--- /dev/null
+++ b/rest/taskrouter/jwts/taskqueue/example-1/example-1.8.x.java
@@ -0,0 +1,45 @@
+// Install the Java helper library from twilio.com/docs/java/install
+import java.util.List;
+import java.util.Arrays;
+
+import com.twilio.http.HttpMethod;
+import com.twilio.jwt.taskrouter.Policy;
+import com.twilio.jwt.taskrouter.TaskRouterCapability;
+import com.twilio.jwt.taskrouter.UrlUtils;
+
+public class Example {
+  // Get your Account SID and Auth Token from https://twilio.com/console
+  // To set up environment variables, see http://twil.io/secure
+  private static final String ACCOUNT_SID = System.getenv("TWILIO_ACCOUNT_SID");
+  private static final String AUTH_TOKEN = System.getenv("TWILIO_AUTH_TOKEN");
+  private static final String WORKSPACE_SID = "WSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
+  private static final String TASKQUEUE_SID = "WQXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
+
+  public static void main(String[] args) {
+    Policy allowFetchSubresources = new Policy.Builder()
+        .url(UrlUtils.taskQueue(WORKSPACE_SID, TASKQUEUE_SID) + "/**")
+        .build();
+
+    Policy allowUpdates = new Policy.Builder()
+        .url(UrlUtils.taskQueue(WORKSPACE_SID, TASKQUEUE_SID))
+        .method(HttpMethod.POST)
+        .build();
+
+    List<Policy> policies = Arrays.asList(allowFetchSubresources, allowUpdates);
+
+    TaskRouterCapability.Builder capabilityBuilder =
+        new TaskRouterCapability.Builder(ACCOUNT_SID, AUTH_TOKEN, WORKSPACE_SID, TASKQUEUE_SID)
+            .policies(policies);
+
+    String token = capabilityBuilder.build().toJwt();
+
+    System.out.println(token);
+
+    // By default, tokens are good for one hour.
+    // Override this default timeout by specifiying a new value (in seconds).
+    // For example, to generate a token good for 8 hours:
+    token = capabilityBuilder.ttl(28800).build().toJwt();
+
+    System.out.println(token);
+  }
+}
diff --git a/rest/taskrouter/jwts/worker/example-1/example-1.7.x.java b/rest/taskrouter/jwts/worker/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/jwts/worker/example-1/example-1.7.x.java
rename to rest/taskrouter/jwts/worker/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/jwts/workspace/example-1/example-1.7.x.java b/rest/taskrouter/jwts/workspace/example-1/example-1.8.x.java
similarity index 92%
rename from rest/taskrouter/jwts/workspace/example-1/example-1.7.x.java
rename to rest/taskrouter/jwts/workspace/example-1/example-1.8.x.java
index df79c7b49c..6fead83eab 100644
--- a/rest/taskrouter/jwts/workspace/example-1/example-1.7.x.java
+++ b/rest/taskrouter/jwts/workspace/example-1/example-1.8.x.java
@@ -1,7 +1,7 @@
 // Install the Java helper library from twilio.com/docs/java/install
 import java.util.List;
+import java.util.ArrayList;
 
-import com.google.common.collect.Lists;
 import com.twilio.http.HttpMethod;
 import com.twilio.jwt.taskrouter.Policy;
 import com.twilio.jwt.taskrouter.TaskRouterCapability;
@@ -30,7 +30,7 @@ public static void main(String[] args) {
         .build();
 
 
-    List<Policy> policies = Lists.newArrayList(allowFetchSubresources, allowUpdatesSubresources,
+    List<Policy> policies = Arrays.asList(allowFetchSubresources, allowUpdatesSubresources,
         allowDeleteSubresources);
 
 
diff --git a/rest/taskrouter/reservations/call/example-1.7.x.java b/rest/taskrouter/reservations/call/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/reservations/call/example-1.7.x.java
rename to rest/taskrouter/reservations/call/example-1.8.x.java
diff --git a/rest/taskrouter/reservations/conference/conference.7.x.java b/rest/taskrouter/reservations/conference/conference.8.x.java
similarity index 100%
rename from rest/taskrouter/reservations/conference/conference.7.x.java
rename to rest/taskrouter/reservations/conference/conference.8.x.java
diff --git a/rest/taskrouter/reservations/dequeue/example-1.7.x.java b/rest/taskrouter/reservations/dequeue/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/reservations/dequeue/example-1.7.x.java
rename to rest/taskrouter/reservations/dequeue/example-1.8.x.java
diff --git a/rest/taskrouter/reservations/instance/get/example-1/example-1.7.x.java b/rest/taskrouter/reservations/instance/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/reservations/instance/get/example-1/example-1.7.x.java
rename to rest/taskrouter/reservations/instance/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/reservations/instance/post/example-1/example-1.7.x.java b/rest/taskrouter/reservations/instance/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/reservations/instance/post/example-1/example-1.7.x.java
rename to rest/taskrouter/reservations/instance/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/reservations/list/get/example-1/example-1.7.x.java b/rest/taskrouter/reservations/list/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/reservations/list/get/example-1/example-1.7.x.java
rename to rest/taskrouter/reservations/list/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/reservations/redirect/redirect.7.x.java b/rest/taskrouter/reservations/redirect/redirect.8.x.java
similarity index 100%
rename from rest/taskrouter/reservations/redirect/redirect.7.x.java
rename to rest/taskrouter/reservations/redirect/redirect.8.x.java
diff --git a/rest/taskrouter/reservations/reject/example-1.7.x.java b/rest/taskrouter/reservations/reject/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/reservations/reject/example-1.7.x.java
rename to rest/taskrouter/reservations/reject/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/taskqueue/cumulative/example-1.7.x.java b/rest/taskrouter/statistics/taskqueue/cumulative/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/taskqueue/cumulative/example-1.7.x.java
rename to rest/taskrouter/statistics/taskqueue/cumulative/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/taskqueue/example-1/example-1.7.x.java b/rest/taskrouter/statistics/taskqueue/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/taskqueue/example-1/example-1.7.x.java
rename to rest/taskrouter/statistics/taskqueue/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/taskqueue/realtime/example-1.7.x.java b/rest/taskrouter/statistics/taskqueue/realtime/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/taskqueue/realtime/example-1.7.x.java
rename to rest/taskrouter/statistics/taskqueue/realtime/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/worker/example-1/example-1.7.x.java b/rest/taskrouter/statistics/worker/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/worker/example-1/example-1.7.x.java
rename to rest/taskrouter/statistics/worker/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/workers/cumulative/example-1.7.x.java b/rest/taskrouter/statistics/workers/cumulative/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/workers/cumulative/example-1.7.x.java
rename to rest/taskrouter/statistics/workers/cumulative/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/workers/example-1/example-1.7.x.java b/rest/taskrouter/statistics/workers/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/workers/example-1/example-1.7.x.java
rename to rest/taskrouter/statistics/workers/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/workers/realtime/example-1.7.x.java b/rest/taskrouter/statistics/workers/realtime/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/workers/realtime/example-1.7.x.java
rename to rest/taskrouter/statistics/workers/realtime/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/workflow/cumulative/example-1.7.x.java b/rest/taskrouter/statistics/workflow/cumulative/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/workflow/cumulative/example-1.7.x.java
rename to rest/taskrouter/statistics/workflow/cumulative/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/workflow/example-1/example-1.7.x.java b/rest/taskrouter/statistics/workflow/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/workflow/example-1/example-1.7.x.java
rename to rest/taskrouter/statistics/workflow/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/workflow/realtime/example-1.7.x.java b/rest/taskrouter/statistics/workflow/realtime/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/workflow/realtime/example-1.7.x.java
rename to rest/taskrouter/statistics/workflow/realtime/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/workspace/cumulative/example-1.7.x.java b/rest/taskrouter/statistics/workspace/cumulative/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/workspace/cumulative/example-1.7.x.java
rename to rest/taskrouter/statistics/workspace/cumulative/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/workspace/example-1/example-1.7.x.java b/rest/taskrouter/statistics/workspace/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/workspace/example-1/example-1.7.x.java
rename to rest/taskrouter/statistics/workspace/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/statistics/workspace/realtime/example-1.7.x.java b/rest/taskrouter/statistics/workspace/realtime/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/statistics/workspace/realtime/example-1.7.x.java
rename to rest/taskrouter/statistics/workspace/realtime/example-1.8.x.java
diff --git a/rest/taskrouter/taskchannels/instance/delete/example-1/example-1.7.x.java b/rest/taskrouter/taskchannels/instance/delete/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/taskchannels/instance/delete/example-1/example-1.7.x.java
rename to rest/taskrouter/taskchannels/instance/delete/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/taskchannels/instance/get/example-1/example-1.7.x.java b/rest/taskrouter/taskchannels/instance/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/taskchannels/instance/get/example-1/example-1.7.x.java
rename to rest/taskrouter/taskchannels/instance/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/taskchannels/instance/post/example-1/example-1.7.x.java b/rest/taskrouter/taskchannels/instance/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/taskchannels/instance/post/example-1/example-1.7.x.java
rename to rest/taskrouter/taskchannels/instance/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/taskchannels/list/get/example-1/example-1.7.x.java b/rest/taskrouter/taskchannels/list/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/taskchannels/list/get/example-1/example-1.7.x.java
rename to rest/taskrouter/taskchannels/list/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/taskchannels/list/post/example-1/example-1.7.x.java b/rest/taskrouter/taskchannels/list/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/taskchannels/list/post/example-1/example-1.7.x.java
rename to rest/taskrouter/taskchannels/list/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/taskqueues/instance/delete/example-1/example-1.7.x.java b/rest/taskrouter/taskqueues/instance/delete/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/taskqueues/instance/delete/example-1/example-1.7.x.java
rename to rest/taskrouter/taskqueues/instance/delete/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/taskqueues/instance/get/example-1/example-1.7.x.java b/rest/taskrouter/taskqueues/instance/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/taskqueues/instance/get/example-1/example-1.7.x.java
rename to rest/taskrouter/taskqueues/instance/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/taskqueues/instance/post/example-1/example-1.7.x.java b/rest/taskrouter/taskqueues/instance/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/taskqueues/instance/post/example-1/example-1.7.x.java
rename to rest/taskrouter/taskqueues/instance/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/taskqueues/list/get/example-1/example-1.7.x.java b/rest/taskrouter/taskqueues/list/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/taskqueues/list/get/example-1/example-1.7.x.java
rename to rest/taskrouter/taskqueues/list/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/taskqueues/list/post/example-1/example-1.7.x.java b/rest/taskrouter/taskqueues/list/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/taskqueues/list/post/example-1/example-1.7.x.java
rename to rest/taskrouter/taskqueues/list/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/tasks/instance/delete/example-1/example-1.7.x.java b/rest/taskrouter/tasks/instance/delete/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/tasks/instance/delete/example-1/example-1.7.x.java
rename to rest/taskrouter/tasks/instance/delete/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/tasks/instance/get/example-1/example-1.7.x.java b/rest/taskrouter/tasks/instance/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/tasks/instance/get/example-1/example-1.7.x.java
rename to rest/taskrouter/tasks/instance/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/tasks/instance/post/example-1/example-1.7.x.java b/rest/taskrouter/tasks/instance/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/tasks/instance/post/example-1/example-1.7.x.java
rename to rest/taskrouter/tasks/instance/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/tasks/list/get/example-1/example-1.7.x.java b/rest/taskrouter/tasks/list/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/tasks/list/get/example-1/example-1.7.x.java
rename to rest/taskrouter/tasks/list/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/tasks/list/post/example-1/example-1.7.x.java b/rest/taskrouter/tasks/list/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/tasks/list/post/example-1/example-1.7.x.java
rename to rest/taskrouter/tasks/list/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/twiml/example1/example/example.7.x.java b/rest/taskrouter/twiml/example1/example/example.8.x.java
similarity index 100%
rename from rest/taskrouter/twiml/example1/example/example.7.x.java
rename to rest/taskrouter/twiml/example1/example/example.8.x.java
diff --git a/rest/taskrouter/twiml/example2/example/example.7.x.java b/rest/taskrouter/twiml/example2/example/example.8.x.java
similarity index 100%
rename from rest/taskrouter/twiml/example2/example/example.7.x.java
rename to rest/taskrouter/twiml/example2/example/example.8.x.java
diff --git a/rest/taskrouter/twiml/example3/example/example.7.x.java b/rest/taskrouter/twiml/example3/example/example.8.x.java
similarity index 100%
rename from rest/taskrouter/twiml/example3/example/example.7.x.java
rename to rest/taskrouter/twiml/example3/example/example.8.x.java
diff --git a/rest/taskrouter/twiml/example4/example/example.7.x.java b/rest/taskrouter/twiml/example4/example/example.8.x.java
similarity index 100%
rename from rest/taskrouter/twiml/example4/example/example.7.x.java
rename to rest/taskrouter/twiml/example4/example/example.8.x.java
diff --git a/rest/taskrouter/worker-channels/instance/get/example-1/example-1.7.x.java b/rest/taskrouter/worker-channels/instance/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/worker-channels/instance/get/example-1/example-1.7.x.java
rename to rest/taskrouter/worker-channels/instance/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/worker-channels/instance/post/example-1/example-1.7.x.java b/rest/taskrouter/worker-channels/instance/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/worker-channels/instance/post/example-1/example-1.7.x.java
rename to rest/taskrouter/worker-channels/instance/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/worker-channels/list/get/example-1/example-1.7.x.java b/rest/taskrouter/worker-channels/list/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/worker-channels/list/get/example-1/example-1.7.x.java
rename to rest/taskrouter/worker-channels/list/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/worker-reservations/accept/example-1.7.x.java b/rest/taskrouter/worker-reservations/accept/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/worker-reservations/accept/example-1.7.x.java
rename to rest/taskrouter/worker-reservations/accept/example-1.8.x.java
diff --git a/rest/taskrouter/worker-reservations/call/example-1.7.x.java b/rest/taskrouter/worker-reservations/call/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/worker-reservations/call/example-1.7.x.java
rename to rest/taskrouter/worker-reservations/call/example-1.8.x.java
diff --git a/rest/taskrouter/worker-reservations/dequeue/example-1.7.x.java b/rest/taskrouter/worker-reservations/dequeue/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/worker-reservations/dequeue/example-1.7.x.java
rename to rest/taskrouter/worker-reservations/dequeue/example-1.8.x.java
diff --git a/rest/taskrouter/worker-reservations/instance-get-example1/example-1.7.x.java b/rest/taskrouter/worker-reservations/instance-get-example1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/worker-reservations/instance-get-example1/example-1.7.x.java
rename to rest/taskrouter/worker-reservations/instance-get-example1/example-1.8.x.java
diff --git a/rest/taskrouter/worker-reservations/list-get-example1/example-1.7.x.java b/rest/taskrouter/worker-reservations/list-get-example1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/worker-reservations/list-get-example1/example-1.7.x.java
rename to rest/taskrouter/worker-reservations/list-get-example1/example-1.8.x.java
diff --git a/rest/taskrouter/worker-reservations/reject/example-1.7.x.java b/rest/taskrouter/worker-reservations/reject/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/worker-reservations/reject/example-1.7.x.java
rename to rest/taskrouter/worker-reservations/reject/example-1.8.x.java
diff --git a/rest/taskrouter/workers/instance/delete/example-1/example-1.7.x.java b/rest/taskrouter/workers/instance/delete/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workers/instance/delete/example-1/example-1.7.x.java
rename to rest/taskrouter/workers/instance/delete/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workers/instance/get/example-1/example-1.7.x.java b/rest/taskrouter/workers/instance/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workers/instance/get/example-1/example-1.7.x.java
rename to rest/taskrouter/workers/instance/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workers/instance/post/example-1/example-1.7.x.java b/rest/taskrouter/workers/instance/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workers/instance/post/example-1/example-1.7.x.java
rename to rest/taskrouter/workers/instance/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workers/list/get/example-1/example-1.7.x.java b/rest/taskrouter/workers/list/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workers/list/get/example-1/example-1.7.x.java
rename to rest/taskrouter/workers/list/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workers/list/get/example-2/example-2.7.x.java b/rest/taskrouter/workers/list/get/example-2/example-2.8.x.java
similarity index 100%
rename from rest/taskrouter/workers/list/get/example-2/example-2.7.x.java
rename to rest/taskrouter/workers/list/get/example-2/example-2.8.x.java
diff --git a/rest/taskrouter/workers/list/post/example-1/example-1.7.x.java b/rest/taskrouter/workers/list/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workers/list/post/example-1/example-1.7.x.java
rename to rest/taskrouter/workers/list/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workflows/instance/delete/example-1/example-1.7.x.java b/rest/taskrouter/workflows/instance/delete/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workflows/instance/delete/example-1/example-1.7.x.java
rename to rest/taskrouter/workflows/instance/delete/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workflows/instance/get/example-1/example-1.7.x.java b/rest/taskrouter/workflows/instance/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workflows/instance/get/example-1/example-1.7.x.java
rename to rest/taskrouter/workflows/instance/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workflows/instance/post/example-1/example-1.7.x.java b/rest/taskrouter/workflows/instance/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workflows/instance/post/example-1/example-1.7.x.java
rename to rest/taskrouter/workflows/instance/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workflows/list/get/example-1/example-1.7.x.java b/rest/taskrouter/workflows/list/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workflows/list/get/example-1/example-1.7.x.java
rename to rest/taskrouter/workflows/list/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workflows/list/post/example-1/example-1.7.x.java b/rest/taskrouter/workflows/list/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workflows/list/post/example-1/example-1.7.x.java
rename to rest/taskrouter/workflows/list/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workspaces/instance/delete/example-1/example-1.7.x.java b/rest/taskrouter/workspaces/instance/delete/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workspaces/instance/delete/example-1/example-1.7.x.java
rename to rest/taskrouter/workspaces/instance/delete/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workspaces/instance/get/example-1/example-1.7.x.java b/rest/taskrouter/workspaces/instance/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workspaces/instance/get/example-1/example-1.7.x.java
rename to rest/taskrouter/workspaces/instance/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workspaces/instance/post/example-1/example-1.7.x.java b/rest/taskrouter/workspaces/instance/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workspaces/instance/post/example-1/example-1.7.x.java
rename to rest/taskrouter/workspaces/instance/post/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workspaces/list/get/example-1/example-1.7.x.java b/rest/taskrouter/workspaces/list/get/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workspaces/list/get/example-1/example-1.7.x.java
rename to rest/taskrouter/workspaces/list/get/example-1/example-1.8.x.java
diff --git a/rest/taskrouter/workspaces/list/post/example-1/example-1.7.x.java b/rest/taskrouter/workspaces/list/post/example-1/example-1.8.x.java
similarity index 100%
rename from rest/taskrouter/workspaces/list/post/example-1/example-1.7.x.java
rename to rest/taskrouter/workspaces/list/post/example-1/example-1.8.x.java
diff --git a/rest/test-credentials/test-calls-example-1/test-calls-example-1.7.x.java b/rest/test-credentials/test-calls-example-1/test-calls-example-1.8.x.java
similarity index 100%
rename from rest/test-credentials/test-calls-example-1/test-calls-example-1.7.x.java
rename to rest/test-credentials/test-calls-example-1/test-calls-example-1.8.x.java
diff --git a/rest/test-credentials/test-calls-example-2/test-calls-example-2.7.x.java b/rest/test-credentials/test-calls-example-2/test-calls-example-2.8.x.java
similarity index 100%
rename from rest/test-credentials/test-calls-example-2/test-calls-example-2.7.x.java
rename to rest/test-credentials/test-calls-example-2/test-calls-example-2.8.x.java
diff --git a/rest/test-credentials/test-incoming-phone-numbers-example-1/test-incoming-phone-numbers-example-1.7.x.java b/rest/test-credentials/test-incoming-phone-numbers-example-1/test-incoming-phone-numbers-example-1.8.x.java
similarity index 100%
rename from rest/test-credentials/test-incoming-phone-numbers-example-1/test-incoming-phone-numbers-example-1.7.x.java
rename to rest/test-credentials/test-incoming-phone-numbers-example-1/test-incoming-phone-numbers-example-1.8.x.java
diff --git a/rest/test-credentials/test-incoming-phone-numbers-example-2/test-incoming-phone-numbers-example-2.7.x.java b/rest/test-credentials/test-incoming-phone-numbers-example-2/test-incoming-phone-numbers-example-2.8.x.java
similarity index 100%
rename from rest/test-credentials/test-incoming-phone-numbers-example-2/test-incoming-phone-numbers-example-2.7.x.java
rename to rest/test-credentials/test-incoming-phone-numbers-example-2/test-incoming-phone-numbers-example-2.8.x.java
diff --git a/rest/test-credentials/test-post-example-3/test-post-example-3.7.x.java b/rest/test-credentials/test-post-example-3/test-post-example-3.8.x.java
similarity index 100%
rename from rest/test-credentials/test-post-example-3/test-post-example-3.7.x.java
rename to rest/test-credentials/test-post-example-3/test-post-example-3.8.x.java
diff --git a/rest/test-credentials/test-sms-messages-example-1/test-sms-messages-example-1.7.x.java b/rest/test-credentials/test-sms-messages-example-1/test-sms-messages-example-1.8.x.java
similarity index 100%
rename from rest/test-credentials/test-sms-messages-example-1/test-sms-messages-example-1.7.x.java
rename to rest/test-credentials/test-sms-messages-example-1/test-sms-messages-example-1.8.x.java
diff --git a/rest/test-credentials/test-sms-messages-example-2/test-sms-messages-example-2.7.x.java b/rest/test-credentials/test-sms-messages-example-2/test-sms-messages-example-2.8.x.java
similarity index 100%
rename from rest/test-credentials/test-sms-messages-example-2/test-sms-messages-example-2.7.x.java
rename to rest/test-credentials/test-sms-messages-example-2/test-sms-messages-example-2.8.x.java
diff --git a/rest/test-credentials/test-sms-messages-example-3/test-sms-messages-example-3.7.x.java b/rest/test-credentials/test-sms-messages-example-3/test-sms-messages-example-3.8.x.java
similarity index 100%
rename from rest/test-credentials/test-sms-messages-example-3/test-sms-messages-example-3.7.x.java
rename to rest/test-credentials/test-sms-messages-example-3/test-sms-messages-example-3.8.x.java
diff --git a/rest/token/list-post-1-hour-example/list-post-1-hour-example.7.x.java b/rest/token/list-post-1-hour-example/list-post-1-hour-example.8.x.java
similarity index 100%
rename from rest/token/list-post-1-hour-example/list-post-1-hour-example.7.x.java
rename to rest/token/list-post-1-hour-example/list-post-1-hour-example.8.x.java
diff --git a/rest/token/list-post-example/list-post-example.7.x.java b/rest/token/list-post-example/list-post-example.8.x.java
similarity index 100%
rename from rest/token/list-post-example/list-post-example.7.x.java
rename to rest/token/list-post-example/list-post-example.8.x.java
diff --git a/rest/transcription/instance-delete-examples/instance-delete-examples.7.x.java b/rest/transcription/instance-delete-examples/instance-delete-examples.8.x.java
similarity index 100%
rename from rest/transcription/instance-delete-examples/instance-delete-examples.7.x.java
rename to rest/transcription/instance-delete-examples/instance-delete-examples.8.x.java
diff --git a/rest/transcription/instance-get-example-1/instance-get-example-1.7.x.java b/rest/transcription/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/transcription/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/transcription/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/transcription/list-get-example-1/list-get-example-1.7.x.java b/rest/transcription/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/transcription/list-get-example-1/list-get-example-1.7.x.java
rename to rest/transcription/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/usage-records/list-get-example-1/list-get-example-1.7.x.java b/rest/usage-records/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/usage-records/list-get-example-1/list-get-example-1.7.x.java
rename to rest/usage-records/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/usage-records/list-get-example-2/list-get-example-2.7.x.java b/rest/usage-records/list-get-example-2/list-get-example-2.8.x.java
similarity index 100%
rename from rest/usage-records/list-get-example-2/list-get-example-2.7.x.java
rename to rest/usage-records/list-get-example-2/list-get-example-2.8.x.java
diff --git a/rest/usage-records/list-get-example-5/list-get-example-5.7.x.java b/rest/usage-records/list-get-example-5/list-get-example-5.8.x.java
similarity index 100%
rename from rest/usage-records/list-get-example-5/list-get-example-5.7.x.java
rename to rest/usage-records/list-get-example-5/list-get-example-5.8.x.java
diff --git a/rest/usage-triggers/instance-get-example-1/instance-get-example-1.7.x.java b/rest/usage-triggers/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from rest/usage-triggers/instance-get-example-1/instance-get-example-1.7.x.java
rename to rest/usage-triggers/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/rest/usage-triggers/instance-post-example-1/instance-post-example-1.7.x.java b/rest/usage-triggers/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from rest/usage-triggers/instance-post-example-1/instance-post-example-1.7.x.java
rename to rest/usage-triggers/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/rest/usage-triggers/list-get-example-1/list-get-example-1.7.x.java b/rest/usage-triggers/list-get-example-1/list-get-example-1.8.x.java
similarity index 100%
rename from rest/usage-triggers/list-get-example-1/list-get-example-1.7.x.java
rename to rest/usage-triggers/list-get-example-1/list-get-example-1.8.x.java
diff --git a/rest/usage-triggers/list-post-example-1/list-post-example-1.7.x.java b/rest/usage-triggers/list-post-example-1/list-post-example-1.8.x.java
similarity index 100%
rename from rest/usage-triggers/list-post-example-1/list-post-example-1.7.x.java
rename to rest/usage-triggers/list-post-example-1/list-post-example-1.8.x.java
diff --git a/rest/voice/generate-twiml-gather-input/twiml-gather-record.7.x.java b/rest/voice/generate-twiml-gather-input/twiml-gather-record.8.x.java
similarity index 100%
rename from rest/voice/generate-twiml-gather-input/twiml-gather-record.7.x.java
rename to rest/voice/generate-twiml-gather-input/twiml-gather-record.8.x.java
diff --git a/rest/voice/generate-twiml-gather/example.7.x.java b/rest/voice/generate-twiml-gather/example.8.x.java
similarity index 100%
rename from rest/voice/generate-twiml-gather/example.7.x.java
rename to rest/voice/generate-twiml-gather/example.8.x.java
diff --git a/rest/voice/generate-twiml-play/twiml-play.7.x.java b/rest/voice/generate-twiml-play/twiml-play.8.x.java
similarity index 100%
rename from rest/voice/generate-twiml-play/twiml-play.7.x.java
rename to rest/voice/generate-twiml-play/twiml-play.8.x.java
diff --git a/rest/voice/generate-twiml-record/twiml-record.7.x.java b/rest/voice/generate-twiml-record/twiml-record.8.x.java
similarity index 100%
rename from rest/voice/generate-twiml-record/twiml-record.7.x.java
rename to rest/voice/generate-twiml-record/twiml-record.8.x.java
diff --git a/rest/voice/generate-twiml-say/generate-twiml-say.7.x.java b/rest/voice/generate-twiml-say/generate-twiml-say.8.x.java
similarity index 100%
rename from rest/voice/generate-twiml-say/generate-twiml-say.7.x.java
rename to rest/voice/generate-twiml-say/generate-twiml-say.8.x.java
diff --git a/rest/voice/outbound-calls/example-1/example-1.7.x.java b/rest/voice/outbound-calls/example-1/example-1.8.x.java
similarity index 100%
rename from rest/voice/outbound-calls/example-1/example-1.7.x.java
rename to rest/voice/outbound-calls/example-1/example-1.8.x.java
diff --git a/rest/voice/outbound-calls/example-2/example-2.7.x.java b/rest/voice/outbound-calls/example-2/example-2.8.x.java
similarity index 100%
rename from rest/voice/outbound-calls/example-2/example-2.7.x.java
rename to rest/voice/outbound-calls/example-2/example-2.8.x.java
diff --git a/rest/voice/outbound-calls/example-3/example-3.7.x.java b/rest/voice/outbound-calls/example-3/example-3.8.x.java
similarity index 100%
rename from rest/voice/outbound-calls/example-3/example-3.7.x.java
rename to rest/voice/outbound-calls/example-3/example-3.8.x.java
diff --git a/rest/voice/outbound-calls/example-4/example-4.7.x.java b/rest/voice/outbound-calls/example-4/example-4.8.x.java
similarity index 100%
rename from rest/voice/outbound-calls/example-4/example-4.7.x.java
rename to rest/voice/outbound-calls/example-4/example-4.8.x.java
diff --git a/rest/voice/twiml-recording-action/recording-action.7.x.java b/rest/voice/twiml-recording-action/recording-action.8.x.java
similarity index 100%
rename from rest/voice/twiml-recording-action/recording-action.7.x.java
rename to rest/voice/twiml-recording-action/recording-action.8.x.java
diff --git a/security/environment_variables/environment-variables-1.7.x.java b/security/environment_variables/environment-variables-1.8.x.java
similarity index 100%
rename from security/environment_variables/environment-variables-1.7.x.java
rename to security/environment_variables/environment-variables-1.8.x.java
diff --git a/security/signature_validation/signature_validation.7.x.java b/security/signature_validation/signature_validation.8.x.java
similarity index 100%
rename from security/signature_validation/signature_validation.7.x.java
rename to security/signature_validation/signature_validation.8.x.java
diff --git a/security/signature_validation_tests/signature_validation_tests.7.x.java b/security/signature_validation_tests/signature_validation_tests.8.x.java
similarity index 100%
rename from security/signature_validation_tests/signature_validation_tests.7.x.java
rename to security/signature_validation_tests/signature_validation_tests.8.x.java
diff --git a/stun-turn/list-post-example/list-post-example.7.x.java b/stun-turn/list-post-example/list-post-example.8.x.java
similarity index 100%
rename from stun-turn/list-post-example/list-post-example.7.x.java
rename to stun-turn/list-post-example/list-post-example.8.x.java
diff --git a/super-sim/sims/update-account/update-account.7.x.java b/super-sim/sims/update-account/update-account.8.x.java
similarity index 100%
rename from super-sim/sims/update-account/update-account.7.x.java
rename to super-sim/sims/update-account/update-account.8.x.java
diff --git a/sync/rest/document-permissions/delete-permission/delete-permission.7.x.java b/sync/rest/document-permissions/delete-permission/delete-permission.8.x.java
similarity index 100%
rename from sync/rest/document-permissions/delete-permission/delete-permission.7.x.java
rename to sync/rest/document-permissions/delete-permission/delete-permission.8.x.java
diff --git a/sync/rest/document-permissions/list-permissions/list-permissions.7.x.java b/sync/rest/document-permissions/list-permissions/list-permissions.8.x.java
similarity index 100%
rename from sync/rest/document-permissions/list-permissions/list-permissions.7.x.java
rename to sync/rest/document-permissions/list-permissions/list-permissions.8.x.java
diff --git a/sync/rest/document-permissions/retrieve-permission/retrieve-permission.7.x.java b/sync/rest/document-permissions/retrieve-permission/retrieve-permission.8.x.java
similarity index 100%
rename from sync/rest/document-permissions/retrieve-permission/retrieve-permission.7.x.java
rename to sync/rest/document-permissions/retrieve-permission/retrieve-permission.8.x.java
diff --git a/sync/rest/document-permissions/update-permission/update-permission.7.x.java b/sync/rest/document-permissions/update-permission/update-permission.8.x.java
similarity index 100%
rename from sync/rest/document-permissions/update-permission/update-permission.7.x.java
rename to sync/rest/document-permissions/update-permission/update-permission.8.x.java
diff --git a/sync/rest/documents/create-document/create-document.7.x.java b/sync/rest/documents/create-document/create-document.8.x.java
similarity index 100%
rename from sync/rest/documents/create-document/create-document.7.x.java
rename to sync/rest/documents/create-document/create-document.8.x.java
diff --git a/sync/rest/documents/delete-document/delete-document.7.x.java b/sync/rest/documents/delete-document/delete-document.8.x.java
similarity index 100%
rename from sync/rest/documents/delete-document/delete-document.7.x.java
rename to sync/rest/documents/delete-document/delete-document.8.x.java
diff --git a/sync/rest/documents/list-documents/list-documents.7.x.java b/sync/rest/documents/list-documents/list-documents.8.x.java
similarity index 100%
rename from sync/rest/documents/list-documents/list-documents.7.x.java
rename to sync/rest/documents/list-documents/list-documents.8.x.java
diff --git a/sync/rest/documents/retrieve-document/retrieve-document.7.x.java b/sync/rest/documents/retrieve-document/retrieve-document.8.x.java
similarity index 100%
rename from sync/rest/documents/retrieve-document/retrieve-document.7.x.java
rename to sync/rest/documents/retrieve-document/retrieve-document.8.x.java
diff --git a/sync/rest/documents/update-document/update-document.7.x.java b/sync/rest/documents/update-document/update-document.8.x.java
similarity index 100%
rename from sync/rest/documents/update-document/update-document.7.x.java
rename to sync/rest/documents/update-document/update-document.8.x.java
diff --git a/sync/rest/list-permissions/delete-permission/delete-permission.7.x.java b/sync/rest/list-permissions/delete-permission/delete-permission.8.x.java
similarity index 100%
rename from sync/rest/list-permissions/delete-permission/delete-permission.7.x.java
rename to sync/rest/list-permissions/delete-permission/delete-permission.8.x.java
diff --git a/sync/rest/list-permissions/list-permissions/list-permissions.7.x.java b/sync/rest/list-permissions/list-permissions/list-permissions.8.x.java
similarity index 100%
rename from sync/rest/list-permissions/list-permissions/list-permissions.7.x.java
rename to sync/rest/list-permissions/list-permissions/list-permissions.8.x.java
diff --git a/sync/rest/list-permissions/retrieve-permission/retrieve-permission.7.x.java b/sync/rest/list-permissions/retrieve-permission/retrieve-permission.8.x.java
similarity index 100%
rename from sync/rest/list-permissions/retrieve-permission/retrieve-permission.7.x.java
rename to sync/rest/list-permissions/retrieve-permission/retrieve-permission.8.x.java
diff --git a/sync/rest/list-permissions/update-permission/update-permission.7.x.java b/sync/rest/list-permissions/update-permission/update-permission.8.x.java
similarity index 100%
rename from sync/rest/list-permissions/update-permission/update-permission.7.x.java
rename to sync/rest/list-permissions/update-permission/update-permission.8.x.java
diff --git a/sync/rest/lists/create-list-item/create-list-item.7.x.java b/sync/rest/lists/create-list-item/create-list-item.8.x.java
similarity index 100%
rename from sync/rest/lists/create-list-item/create-list-item.7.x.java
rename to sync/rest/lists/create-list-item/create-list-item.8.x.java
diff --git a/sync/rest/lists/create-list/create-list.7.x.java b/sync/rest/lists/create-list/create-list.8.x.java
similarity index 100%
rename from sync/rest/lists/create-list/create-list.7.x.java
rename to sync/rest/lists/create-list/create-list.8.x.java
diff --git a/sync/rest/lists/delete-list-item/delete-list-item.7.x.java b/sync/rest/lists/delete-list-item/delete-list-item.8.x.java
similarity index 100%
rename from sync/rest/lists/delete-list-item/delete-list-item.7.x.java
rename to sync/rest/lists/delete-list-item/delete-list-item.8.x.java
diff --git a/sync/rest/lists/delete-list/delete-list.7.x.java b/sync/rest/lists/delete-list/delete-list.8.x.java
similarity index 100%
rename from sync/rest/lists/delete-list/delete-list.7.x.java
rename to sync/rest/lists/delete-list/delete-list.8.x.java
diff --git a/sync/rest/lists/list-lists/list-lists.7.x.java b/sync/rest/lists/list-lists/list-lists.8.x.java
similarity index 100%
rename from sync/rest/lists/list-lists/list-lists.7.x.java
rename to sync/rest/lists/list-lists/list-lists.8.x.java
diff --git a/sync/rest/lists/query-list/query-list.7.x.java b/sync/rest/lists/query-list/query-list.8.x.java
similarity index 100%
rename from sync/rest/lists/query-list/query-list.7.x.java
rename to sync/rest/lists/query-list/query-list.8.x.java
diff --git a/sync/rest/lists/retrieve-list-item/retrieve-list-item.7.x.java b/sync/rest/lists/retrieve-list-item/retrieve-list-item.8.x.java
similarity index 100%
rename from sync/rest/lists/retrieve-list-item/retrieve-list-item.7.x.java
rename to sync/rest/lists/retrieve-list-item/retrieve-list-item.8.x.java
diff --git a/sync/rest/lists/retrieve-list/retrieve-list.7.x.java b/sync/rest/lists/retrieve-list/retrieve-list.8.x.java
similarity index 100%
rename from sync/rest/lists/retrieve-list/retrieve-list.7.x.java
rename to sync/rest/lists/retrieve-list/retrieve-list.8.x.java
diff --git a/sync/rest/lists/update-list-item/update-list-item.7.x.java b/sync/rest/lists/update-list-item/update-list-item.8.x.java
similarity index 100%
rename from sync/rest/lists/update-list-item/update-list-item.7.x.java
rename to sync/rest/lists/update-list-item/update-list-item.8.x.java
diff --git a/sync/rest/lists/update-list/update-list.7.x.java b/sync/rest/lists/update-list/update-list.8.x.java
similarity index 100%
rename from sync/rest/lists/update-list/update-list.7.x.java
rename to sync/rest/lists/update-list/update-list.8.x.java
diff --git a/sync/rest/map-permissions/delete-permission/delete-permission.7.x.java b/sync/rest/map-permissions/delete-permission/delete-permission.8.x.java
similarity index 100%
rename from sync/rest/map-permissions/delete-permission/delete-permission.7.x.java
rename to sync/rest/map-permissions/delete-permission/delete-permission.8.x.java
diff --git a/sync/rest/map-permissions/list-permissions/list-permissions.7.x.java b/sync/rest/map-permissions/list-permissions/list-permissions.8.x.java
similarity index 100%
rename from sync/rest/map-permissions/list-permissions/list-permissions.7.x.java
rename to sync/rest/map-permissions/list-permissions/list-permissions.8.x.java
diff --git a/sync/rest/map-permissions/retrieve-permission/retrieve-permission.7.x.java b/sync/rest/map-permissions/retrieve-permission/retrieve-permission.8.x.java
similarity index 100%
rename from sync/rest/map-permissions/retrieve-permission/retrieve-permission.7.x.java
rename to sync/rest/map-permissions/retrieve-permission/retrieve-permission.8.x.java
diff --git a/sync/rest/map-permissions/update-permission/update-permission.7.x.java b/sync/rest/map-permissions/update-permission/update-permission.8.x.java
similarity index 100%
rename from sync/rest/map-permissions/update-permission/update-permission.7.x.java
rename to sync/rest/map-permissions/update-permission/update-permission.8.x.java
diff --git a/sync/rest/maps/create-map-item/create-map-item.7.x.java b/sync/rest/maps/create-map-item/create-map-item.8.x.java
similarity index 100%
rename from sync/rest/maps/create-map-item/create-map-item.7.x.java
rename to sync/rest/maps/create-map-item/create-map-item.8.x.java
diff --git a/sync/rest/maps/create-map/create-map.7.x.java b/sync/rest/maps/create-map/create-map.8.x.java
similarity index 100%
rename from sync/rest/maps/create-map/create-map.7.x.java
rename to sync/rest/maps/create-map/create-map.8.x.java
diff --git a/sync/rest/maps/delete-map-item/delete-map-item.7.x.java b/sync/rest/maps/delete-map-item/delete-map-item.8.x.java
similarity index 100%
rename from sync/rest/maps/delete-map-item/delete-map-item.7.x.java
rename to sync/rest/maps/delete-map-item/delete-map-item.8.x.java
diff --git a/sync/rest/maps/delete-map/delete-map.7.x.java b/sync/rest/maps/delete-map/delete-map.8.x.java
similarity index 100%
rename from sync/rest/maps/delete-map/delete-map.7.x.java
rename to sync/rest/maps/delete-map/delete-map.8.x.java
diff --git a/sync/rest/maps/list-maps/list-maps.7.x.java b/sync/rest/maps/list-maps/list-maps.8.x.java
similarity index 100%
rename from sync/rest/maps/list-maps/list-maps.7.x.java
rename to sync/rest/maps/list-maps/list-maps.8.x.java
diff --git a/sync/rest/maps/query-map/query-map.7.x.java b/sync/rest/maps/query-map/query-map.8.x.java
similarity index 100%
rename from sync/rest/maps/query-map/query-map.7.x.java
rename to sync/rest/maps/query-map/query-map.8.x.java
diff --git a/sync/rest/maps/retrieve-map-item/retrieve-map-item.7.x.java b/sync/rest/maps/retrieve-map-item/retrieve-map-item.8.x.java
similarity index 100%
rename from sync/rest/maps/retrieve-map-item/retrieve-map-item.7.x.java
rename to sync/rest/maps/retrieve-map-item/retrieve-map-item.8.x.java
diff --git a/sync/rest/maps/retrieve-map/retrieve-map.7.x.java b/sync/rest/maps/retrieve-map/retrieve-map.8.x.java
similarity index 100%
rename from sync/rest/maps/retrieve-map/retrieve-map.7.x.java
rename to sync/rest/maps/retrieve-map/retrieve-map.8.x.java
diff --git a/sync/rest/maps/update-map-item/update-map-item.7.x.java b/sync/rest/maps/update-map-item/update-map-item.8.x.java
similarity index 100%
rename from sync/rest/maps/update-map-item/update-map-item.7.x.java
rename to sync/rest/maps/update-map-item/update-map-item.8.x.java
diff --git a/sync/rest/maps/update-map/update-map.7.x.java b/sync/rest/maps/update-map/update-map.8.x.java
similarity index 100%
rename from sync/rest/maps/update-map/update-map.7.x.java
rename to sync/rest/maps/update-map/update-map.8.x.java
diff --git a/sync/rest/services/create-service-webhook/create-service-webhook.7.x.java b/sync/rest/services/create-service-webhook/create-service-webhook.8.x.java
similarity index 100%
rename from sync/rest/services/create-service-webhook/create-service-webhook.7.x.java
rename to sync/rest/services/create-service-webhook/create-service-webhook.8.x.java
diff --git a/sync/rest/services/create-service/create-service.7.x.java b/sync/rest/services/create-service/create-service.8.x.java
similarity index 100%
rename from sync/rest/services/create-service/create-service.7.x.java
rename to sync/rest/services/create-service/create-service.8.x.java
diff --git a/sync/rest/services/delete-service/delete-service.7.x.java b/sync/rest/services/delete-service/delete-service.8.x.java
similarity index 100%
rename from sync/rest/services/delete-service/delete-service.7.x.java
rename to sync/rest/services/delete-service/delete-service.8.x.java
diff --git a/sync/rest/services/list-services/list-services.7.x.java b/sync/rest/services/list-services/list-services.8.x.java
similarity index 100%
rename from sync/rest/services/list-services/list-services.7.x.java
rename to sync/rest/services/list-services/list-services.8.x.java
diff --git a/sync/rest/services/retrieve-service/retrieve-service.7.x.java b/sync/rest/services/retrieve-service/retrieve-service.8.x.java
similarity index 100%
rename from sync/rest/services/retrieve-service/retrieve-service.7.x.java
rename to sync/rest/services/retrieve-service/retrieve-service.8.x.java
diff --git a/sync/rest/services/update-service/update-service.7.x.java b/sync/rest/services/update-service/update-service.8.x.java
similarity index 100%
rename from sync/rest/services/update-service/update-service.7.x.java
rename to sync/rest/services/update-service/update-service.8.x.java
diff --git a/sync/rest/streams/create-stream/create-stream.7.x.java b/sync/rest/streams/create-stream/create-stream.8.x.java
similarity index 100%
rename from sync/rest/streams/create-stream/create-stream.7.x.java
rename to sync/rest/streams/create-stream/create-stream.8.x.java
diff --git a/sync/rest/streams/delete-stream/delete-stream.7.x.java b/sync/rest/streams/delete-stream/delete-stream.8.x.java
similarity index 100%
rename from sync/rest/streams/delete-stream/delete-stream.7.x.java
rename to sync/rest/streams/delete-stream/delete-stream.8.x.java
diff --git a/sync/rest/streams/list-streams/list-streams.7.x.java b/sync/rest/streams/list-streams/list-streams.8.x.java
similarity index 100%
rename from sync/rest/streams/list-streams/list-streams.7.x.java
rename to sync/rest/streams/list-streams/list-streams.8.x.java
diff --git a/sync/rest/streams/publish-stream-message/publish-stream-message.7.x.java b/sync/rest/streams/publish-stream-message/publish-stream-message.8.x.java
similarity index 100%
rename from sync/rest/streams/publish-stream-message/publish-stream-message.7.x.java
rename to sync/rest/streams/publish-stream-message/publish-stream-message.8.x.java
diff --git a/sync/rest/streams/retrieve-stream/retrieve-stream.7.x.java b/sync/rest/streams/retrieve-stream/retrieve-stream.8.x.java
similarity index 100%
rename from sync/rest/streams/retrieve-stream/retrieve-stream.7.x.java
rename to sync/rest/streams/retrieve-stream/retrieve-stream.8.x.java
diff --git a/verify/verifications/approve-verification/approve-verification.7.x.java b/verify/verifications/approve-verification/approve-verification.8.x.java
similarity index 100%
rename from verify/verifications/approve-verification/approve-verification.7.x.java
rename to verify/verifications/approve-verification/approve-verification.8.x.java
diff --git a/voice/queueing/agent/queue-agent.7.x.java b/voice/queueing/agent/queue-agent.8.x.java
similarity index 100%
rename from voice/queueing/agent/queue-agent.7.x.java
rename to voice/queueing/agent/queue-agent.8.x.java
diff --git a/voice/queueing/caller/queue-caller.7.x.java b/voice/queueing/caller/queue-caller.8.x.java
similarity index 100%
rename from voice/queueing/caller/queue-caller.7.x.java
rename to voice/queueing/caller/queue-caller.8.x.java
diff --git a/voice/queueing/redirect/queue-redirect.7.x.java b/voice/queueing/redirect/queue-redirect.8.x.java
similarity index 100%
rename from voice/queueing/redirect/queue-redirect.7.x.java
rename to voice/queueing/redirect/queue-redirect.8.x.java
diff --git a/wireless/commands/create-binary-example-1/create-binary-example-1.7.x.java b/wireless/commands/create-binary-example-1/create-binary-example-1.8.x.java
similarity index 100%
rename from wireless/commands/create-binary-example-1/create-binary-example-1.7.x.java
rename to wireless/commands/create-binary-example-1/create-binary-example-1.8.x.java
diff --git a/wireless/commands/create-text-example-1/create-text-example-1.7.x.java b/wireless/commands/create-text-example-1/create-text-example-1.8.x.java
similarity index 100%
rename from wireless/commands/create-text-example-1/create-text-example-1.7.x.java
rename to wireless/commands/create-text-example-1/create-text-example-1.8.x.java
diff --git a/wireless/commands/instance-get-example-1/instance-get-example-1.7.x.java b/wireless/commands/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from wireless/commands/instance-get-example-1/instance-get-example-1.7.x.java
rename to wireless/commands/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/wireless/commands/list-example-1/list-example-1.7.x.java b/wireless/commands/list-example-1/list-example-1.8.x.java
similarity index 100%
rename from wireless/commands/list-example-1/list-example-1.7.x.java
rename to wireless/commands/list-example-1/list-example-1.8.x.java
diff --git a/wireless/rateplans/create-example-1/create-example-1.7.x.java b/wireless/rateplans/create-example-1/create-example-1.8.x.java
similarity index 100%
rename from wireless/rateplans/create-example-1/create-example-1.7.x.java
rename to wireless/rateplans/create-example-1/create-example-1.8.x.java
diff --git a/wireless/rateplans/instance-delete-example-1/delete-example-1.7.x.java b/wireless/rateplans/instance-delete-example-1/delete-example-1.8.x.java
similarity index 100%
rename from wireless/rateplans/instance-delete-example-1/delete-example-1.7.x.java
rename to wireless/rateplans/instance-delete-example-1/delete-example-1.8.x.java
diff --git a/wireless/rateplans/instance-get-example-1/instance-get-example-1.7.x.java b/wireless/rateplans/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from wireless/rateplans/instance-get-example-1/instance-get-example-1.7.x.java
rename to wireless/rateplans/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/wireless/rateplans/instance-get-example-2/instance-get-example-2.7.x.java b/wireless/rateplans/instance-get-example-2/instance-get-example-2.8.x.java
similarity index 100%
rename from wireless/rateplans/instance-get-example-2/instance-get-example-2.7.x.java
rename to wireless/rateplans/instance-get-example-2/instance-get-example-2.8.x.java
diff --git a/wireless/rateplans/list-example-1/list-example-1.7.x.java b/wireless/rateplans/list-example-1/list-example-1.8.x.java
similarity index 100%
rename from wireless/rateplans/list-example-1/list-example-1.7.x.java
rename to wireless/rateplans/list-example-1/list-example-1.8.x.java
diff --git a/wireless/sims-data-session/list-example-1/list-example-1.7.x.java b/wireless/sims-data-session/list-example-1/list-example-1.8.x.java
similarity index 100%
rename from wireless/sims-data-session/list-example-1/list-example-1.7.x.java
rename to wireless/sims-data-session/list-example-1/list-example-1.8.x.java
diff --git a/wireless/sims-usage-record/list-example-1/list-example-1.7.x.java b/wireless/sims-usage-record/list-example-1/list-example-1.8.x.java
similarity index 100%
rename from wireless/sims-usage-record/list-example-1/list-example-1.7.x.java
rename to wireless/sims-usage-record/list-example-1/list-example-1.8.x.java
diff --git a/wireless/sims/instance-get-example-1/instance-get-example-1.7.x.java b/wireless/sims/instance-get-example-1/instance-get-example-1.8.x.java
similarity index 100%
rename from wireless/sims/instance-get-example-1/instance-get-example-1.7.x.java
rename to wireless/sims/instance-get-example-1/instance-get-example-1.8.x.java
diff --git a/wireless/sims/instance-get-example-2/instance-get-example-2.7.x.java b/wireless/sims/instance-get-example-2/instance-get-example-2.8.x.java
similarity index 100%
rename from wireless/sims/instance-get-example-2/instance-get-example-2.7.x.java
rename to wireless/sims/instance-get-example-2/instance-get-example-2.8.x.java
diff --git a/wireless/sims/instance-post-example-1/instance-post-example-1.7.x.java b/wireless/sims/instance-post-example-1/instance-post-example-1.8.x.java
similarity index 100%
rename from wireless/sims/instance-post-example-1/instance-post-example-1.7.x.java
rename to wireless/sims/instance-post-example-1/instance-post-example-1.8.x.java
diff --git a/wireless/sims/list-example-1/list-example-1.7.x.java b/wireless/sims/list-example-1/list-example-1.8.x.java
similarity index 100%
rename from wireless/sims/list-example-1/list-example-1.7.x.java
rename to wireless/sims/list-example-1/list-example-1.8.x.java