Rename product names to use amsterdam

Issue-ID: CLI-66

Change-Id: Ief9c03adec45f037baea82d344addb1c6b538bd9
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

320 files changed, 501 insertions, 501 deletions

diff --git a/deployment/zip/installer/cli-init.sh b/deployment/zip/installer/cli-init.sh
index e78923f5..bf9f4fdd 100644
--- a/deployment/zip/installer/cli-init.sh
+++ b/deployment/zip/installer/cli-init.sh
@@ -17,7 +17,7 @@
 #*******************************************************************************
 
 export ONAP_CLI_HOME=/opt/onap/cli
-export CLI_PRODUCT_VERSION=onap-1.1
+export CLI_PRODUCT_VERSION=onap-amsterdam
 
 cd $ONAP_CLI_HOME
 
diff --git a/framework/src/main/resources/open-cli.properties b/framework/src/main/resources/open-cli.properties
index 813e46dd..b009472b 100644
--- a/framework/src/main/resources/open-cli.properties
+++ b/framework/src/main/resources/open-cli.properties
@@ -35,7 +35,7 @@ cli.schema.mode_values=direct,catalog
 cli.command.type=cmd,auth,catalog
 
 #product version
-cli.product.version=cli-1.0
+cli.product.version=open-cli
 
 # moco properties
 cli.sample.gen.enable=false
diff --git a/framework/src/test/resources/open-cli-sample/schema-refresh-sample.yaml b/framework/src/test/resources/open-cli-sample/schema-refresh-sample.yaml
index c24ea4d2..f6d9794a 100644
--- a/framework/src/test/resources/open-cli-sample/schema-refresh-sample.yaml
+++ b/framework/src/test/resources/open-cli-sample/schema-refresh-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: schema-refresh
-version: cli-1.0
+version: open-cli
 samples:
   sample1:
     name: schema-refresh
@@ -10,231 +10,231 @@ samples:
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
       |sl-no   |command                         |product-version   |schema                                          |version   |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |1       |vfmodule-create                 |onap-1.1          |vfmodule-create-schema-1.1.yaml                 |1.0       |
+      |1       |vfmodule-create                 |onap-amsterdam    |vfmodule-create-schema-1.1.yaml                 |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |2       |schema-validate                 |cli-1.0           |schema-validate.yaml                            |1.0       |
+      |2       |schema-validate                 |open-cli          |schema-validate.yaml                            |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |3       |schema-refresh                  |cli-1.0           |schema-refresh.yaml                             |1.0       |
+      |3       |schema-refresh                  |open-cli          |schema-refresh.yaml                             |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |4       |cloud-list                      |onap-1.1          |cloud-list-schema-1.1.yaml                      |1.0       |
+      |4       |cloud-list                      |onap-amsterdam    |cloud-list-schema-1.1.yaml                      |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |5       |sdnc-list                       |onap-1.1          |sdnc-list-schema-1.1.yaml                       |1.0       |
+      |5       |sdnc-list                       |onap-amsterdam    |sdnc-list-schema-1.1.yaml                       |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |6       |sdnc-register                   |onap-1.1          |sdnc-create-schema-1.1.yaml                     |1.0       |
+      |6       |sdnc-register                   |onap-amsterdam    |sdnc-create-schema-1.1.yaml                     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |7       |sdnc-unregister                 |onap-1.1          |sdnc-delete-schema-1.1.yaml                     |1.0       |
+      |7       |sdnc-unregister                 |onap-amsterdam    |sdnc-delete-schema-1.1.yaml                     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |8       |vnfm-show                       |onap-1.1          |vnfm-show-schema-1.1.yaml                       |1.0       |
+      |8       |vnfm-show                       |onap-amsterdam    |vnfm-show-schema-1.1.yaml                       |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |9       |vnfm-unregister                 |onap-1.1          |vnfm-delete-schema-1.1.yaml                     |1.0       |
+      |9       |vnfm-unregister                 |onap-amsterdam    |vnfm-delete-schema-1.1.yaml                     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |10      |vnfm-register                   |onap-1.1          |vnfm-create-schema-1.1.yaml                     |1.0       |
+      |10      |vnfm-register                   |onap-amsterdam    |vnfm-create-schema-1.1.yaml                     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |11      |vnfm-list                       |onap-1.1          |vnfm-list-schema-1.1.yaml                       |1.0       |
+      |11      |vnfm-list                       |onap-amsterdam    |vnfm-list-schema-1.1.yaml                       |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |12      |vim-register                    |onap-1.1          |vim-create-schema-1.1.yaml                      |1.0       |
+      |12      |vim-register                    |onap-amsterdam    |vim-create-schema-1.1.yaml                      |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |13      |vim-unregister                  |onap-1.1          |vim-delete-schema-1.1.yaml                      |1.0       |
+      |13      |vim-unregister                  |onap-amsterdam    |vim-delete-schema-1.1.yaml                      |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |14      |vim-list                        |onap-1.1          |vim-list-schema-1.1.yaml                        |1.0       |
+      |14      |vim-list                        |onap-amsterdam    |vim-list-schema-1.1.yaml                        |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |15      |ems-list                        |onap-1.1          |ems-list-schema-1.1.yaml                        |1.0       |
+      |15      |ems-list                        |onap-amsterdam    |ems-list-schema-1.1.yaml                        |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |16      |ems-register                    |onap-1.1          |ems-create-schema-1.1.yaml                      |1.0       |
+      |16      |ems-register                    |onap-amsterdam    |ems-create-schema-1.1.yaml                      |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |17      |ems-show                        |onap-1.1          |ems-show-schema-1.1.yaml                        |1.0       |
+      |17      |ems-show                        |onap-amsterdam    |ems-show-schema-1.1.yaml                        |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |18      |cloud-delete                    |onap-1.1          |cloud-delete-schema-1.1.yaml                    |1.0       |
+      |18      |cloud-delete                    |onap-amsterdam    |cloud-delete-schema-1.1.yaml                    |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |19      |ems-unregister                  |onap-1.1          |ems-delete-schema-1.1.yaml                      |1.0       |
+      |19      |ems-unregister                  |onap-amsterdam    |ems-delete-schema-1.1.yaml                      |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |20      |subscription-list               |onap-1.0          |subscription-list-schema.yaml                   |1.0       |
+      |20      |subscription-list               |openecomp         |subscription-list-schema.yaml                   |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |21      |subscription-create             |onap-1.0          |subscription-create-schema.yaml                 |1.0       |
+      |21      |subscription-create             |openecomp         |subscription-create-schema.yaml                 |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |22      |subscription-list               |onap-1.1          |subscription-list-schema-1.1.yaml               |1.0       |
+      |22      |subscription-list               |onap-amsterdam    |subscription-list-schema-1.1.yaml               |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |23      |subscription-create             |onap-1.1          |subscription-create-schema-1.1.yaml             |1.0       |
+      |23      |subscription-create             |onap-amsterdam    |subscription-create-schema-1.1.yaml             |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |24      |subscription-delete             |onap-1.1          |subscription-delete-schema-1.1.yaml             |1.0       |
+      |24      |subscription-delete             |onap-amsterdam    |subscription-delete-schema-1.1.yaml             |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |25      |customer-show                   |onap-1.0          |customer-show-schema.yaml                       |1.0       |
+      |25      |customer-show                   |openecomp         |customer-show-schema.yaml                       |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |26      |customer-show                   |onap-1.1          |customer-show-schema-1.1.yaml                   |1.0       |
+      |26      |customer-show                   |onap-amsterdam    |customer-show-schema-1.1.yaml                   |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |27      |customer-list                   |onap-1.0          |customer-list-schema.yaml                       |1.0       |
+      |27      |customer-list                   |openecomp         |customer-list-schema.yaml                       |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |28      |customer-delete                 |onap-1.0          |customer-delete-schema.yaml                     |1.0       |
+      |28      |customer-delete                 |openecomp         |customer-delete-schema.yaml                     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |29      |customer-create                 |onap-1.0          |customer-create-schema.yaml                     |1.0       |
+      |29      |customer-create                 |openecomp         |customer-create-schema.yaml                     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |30      |customer-create                 |onap-1.1          |customer-create-schema-1.1.yaml                 |1.0       |
+      |30      |customer-create                 |onap-amsterdam    |customer-create-schema-1.1.yaml                 |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |31      |customer-delete                 |onap-1.1          |customer-delete-schema-1.1.yaml                 |1.0       |
+      |31      |customer-delete                 |onap-amsterdam    |customer-delete-schema-1.1.yaml                 |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |32      |customer-list                   |onap-1.1          |customer-list-schema-1.1.yaml                   |1.0       |
+      |32      |customer-list                   |onap-amsterdam    |customer-list-schema-1.1.yaml                   |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |33      |vf-list                         |onap-1.1          |vf-list-schema-1.1.yaml                         |1.0       |
+      |33      |vf-list                         |onap-amsterdam    |vf-list-schema-1.1.yaml                         |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |34      |service-list                    |onap-1.1          |service-list-schema-1.1.yaml                    |1.0       |
+      |34      |service-list                    |onap-amsterdam    |service-list-schema-1.1.yaml                    |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |35      |vf-show                         |onap-1.1          |vf-show-schema-1.1.yaml                         |1.0       |
+      |35      |vf-show                         |onap-amsterdam    |vf-show-schema-1.1.yaml                         |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |36      |tenant-create                   |onap-1.1          |tenant-create-schema-1.1.yaml                   |1.0       |
+      |36      |tenant-create                   |onap-amsterdam    |tenant-create-schema-1.1.yaml                   |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |37      |tenant-list                     |onap-1.1          |tenant-list-schema-1.1.yaml                     |1.0       |
+      |37      |tenant-list                     |onap-amsterdam    |tenant-list-schema-1.1.yaml                     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |38      |tenant-delete                   |onap-1.1          |tenant-delete-schema-1.1.yaml                   |1.0       |
+      |38      |tenant-delete                   |onap-amsterdam    |tenant-delete-schema-1.1.yaml                   |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |39      |service-type-create             |onap-1.0          |service-type-create-schema.yaml                 |1.0       |
+      |39      |service-type-create             |openecomp         |service-type-create-schema.yaml                 |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |40      |service-type-list               |onap-1.1          |service-type-list-schema-1.1.yaml               |1.0       |
+      |40      |service-type-list               |onap-amsterdam    |service-type-list-schema-1.1.yaml               |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |41      |service-type-create             |onap-1.1          |service-type-create-schema-1.1.yaml             |1.0       |
+      |41      |service-type-create             |onap-amsterdam    |service-type-create-schema-1.1.yaml             |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |42      |service-type-delete             |onap-1.0          |service-type-delete-schema.yaml                 |1.0       |
+      |42      |service-type-delete             |openecomp         |service-type-delete-schema.yaml                 |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |43      |service-type-list               |onap-1.0          |service-type-list-schema.yaml                   |1.0       |
+      |43      |service-type-list               |openecomp         |service-type-list-schema.yaml                   |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |44      |service-type-delete             |onap-1.1          |service-type-delete-schema-1.1.yaml             |1.0       |
+      |44      |service-type-delete             |onap-amsterdam    |service-type-delete-schema-1.1.yaml             |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |45      |cloud-create                    |onap-1.1          |cloud-create-schema-1.1.yaml                    |1.0       |
+      |45      |cloud-create                    |onap-amsterdam    |cloud-create-schema-1.1.yaml                    |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |46      |cloud-list                      |onap-1.0          |cloud-list-schema.yaml                          |1.0       |
+      |46      |cloud-list                      |openecomp         |cloud-list-schema.yaml                          |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |47      |microservice-delete             |onap-1.1          |microservice-delete-schema.yaml                 |1.0       |
+      |47      |microservice-delete             |onap-amsterdam    |microservice-delete-schema.yaml                 |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |48      |microservice-list               |onap-1.1          |microservice-list-schema.yaml                   |1.0       |
+      |48      |microservice-list               |onap-amsterdam    |microservice-list-schema.yaml                   |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |49      |microservice-show               |onap-1.1          |microservice-show-schema.yaml                   |1.0       |
+      |49      |microservice-show               |onap-amsterdam    |microservice-show-schema.yaml                   |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |50      |microservice-create             |onap-1.1          |microservice-create-schema.yaml                 |1.0       |
+      |50      |microservice-create             |onap-amsterdam    |microservice-create-schema.yaml                 |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |51      |hello-world                     |sample-1.0        |hello-world.yaml                                |1.0       |
+      |51      |hello-world                     |sample-helloworld |hello-world.yaml                                |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |52      |hello-world-http                |sample-1.0        |hello-world-http.yaml                           |1.0       |
+      |52      |hello-world-http                |sample-helloworld |hello-world-http.yaml                           |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |53      |vlm-checkin                     |onap-1.1          |vlm-checkin-schema-1.1.yaml                     |1.0       |
+      |53      |vlm-checkin                     |onap-amsterdam    |vlm-checkin-schema-1.1.yaml                     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |54      |license-group-create            |onap-1.0          |license-group-create-schema.yaml                |1.0       |
+      |54      |license-group-create            |openecomp         |license-group-create-schema.yaml                |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |55      |vlm-key-group-create            |onap-1.1          |vlm-key-group-create-schema-1.1.yaml            |1.0       |
+      |55      |vlm-key-group-create            |onap-amsterdam    |vlm-key-group-create-schema-1.1.yaml            |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |56      |vlm-aggreement-list             |onap-1.1          |vlm-aggreement-list-schema-1.1.yaml             |1.0       |
+      |56      |vlm-aggreement-list             |onap-amsterdam    |vlm-aggreement-list-schema-1.1.yaml             |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |57      |vlm-key-group-list              |onap-1.1          |vlm-key-group-list-schema-1.1.yaml              |1.0       |
+      |57      |vlm-key-group-list              |onap-amsterdam    |vlm-key-group-list-schema-1.1.yaml              |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |58      |vlm-create                      |onap-1.1          |vlm-create-schema-1.1.yaml                      |1.0       |
+      |58      |vlm-create                      |onap-amsterdam    |vlm-create-schema-1.1.yaml                      |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |59      |vlm-entitlement-pool-create     |onap-1.1          |vlm-entitlement-pool-create-schema-1.1.yaml     |1.0       |
+      |59      |vlm-entitlement-pool-create     |onap-amsterdam    |vlm-entitlement-pool-create-schema-1.1.yaml     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |60      |ep-show                         |onap-1.0          |license-entitlement-pool-show-schema.yaml       |1.0       |
+      |60      |ep-show                         |openecomp         |license-entitlement-pool-show-schema.yaml       |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |61      |license-model-create            |onap-1.0          |license-model-create-schema.yaml                |1.0       |
+      |61      |license-model-create            |openecomp         |license-model-create-schema.yaml                |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |62      |license-group-show              |onap-1.0          |license-group-show-schema.yaml                  |1.0       |
+      |62      |license-group-show              |openecomp         |license-group-show-schema.yaml                  |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |63      |vsp-upload                      |onap-1.0          |vsp-upload-schema.yaml                          |1.0       |
+      |63      |vsp-upload                      |openecomp         |vsp-upload-schema.yaml                          |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |64      |vsp-package                     |onap-1.1          |vsp-package-schema-1.1.yaml                     |1.0       |
+      |64      |vsp-package                     |onap-amsterdam    |vsp-package-schema-1.1.yaml                     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |65      |vsp-submit                      |onap-1.1          |vsp-submit-schema-1.1.yaml                      |1.0       |
+      |65      |vsp-submit                      |onap-amsterdam    |vsp-submit-schema-1.1.yaml                      |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |66      |vsp-checkout                    |onap-1.1          |vsp-checkout-schema-1.1.yaml                    |1.0       |
+      |66      |vsp-checkout                    |onap-amsterdam    |vsp-checkout-schema-1.1.yaml                    |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |67      |vsp-create                      |onap-1.0          |vsp-create-schema.yaml                          |1.0       |
+      |67      |vsp-create                      |openecomp         |vsp-create-schema.yaml                          |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |68      |vsp-list                        |onap-1.0          |vsp-list-schema.yaml                            |1.0       |
+      |68      |vsp-list                        |openecomp         |vsp-list-schema.yaml                            |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |69      |vsp-show                        |onap-1.1          |vsp-show-schema-1.1.yaml                        |1.0       |
+      |69      |vsp-show                        |onap-amsterdam    |vsp-show-schema-1.1.yaml                        |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |70      |vsp-show                        |onap-1.0          |vsp-show-schema.yaml                            |1.0       |
+      |70      |vsp-show                        |openecomp         |vsp-show-schema.yaml                            |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |71      |vsp-submit                      |onap-1.0          |vsp-submit-schema.yaml                          |1.0       |
+      |71      |vsp-submit                      |openecomp         |vsp-submit-schema.yaml                          |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |72      |vsp-create                      |onap-1.1          |vsp-create-schema-1.1.yaml                      |1.0       |
+      |72      |vsp-create                      |onap-amsterdam    |vsp-create-schema-1.1.yaml                      |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |73      |vsp-add-artifact                |onap-1.1          |vsp-add-artifact-schema-1.1.yaml                |1.0       |
+      |73      |vsp-add-artifact                |onap-amsterdam    |vsp-add-artifact-schema-1.1.yaml                |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |74      |vsp-revert                      |onap-1.1          |vsp-revert-schema-1.1.yaml                      |1.0       |
+      |74      |vsp-revert                      |onap-amsterdam    |vsp-revert-schema-1.1.yaml                      |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |75      |vsp-checkin                     |onap-1.0          |vsp-checkin-schema.yaml                         |1.0       |
+      |75      |vsp-checkin                     |openecomp         |vsp-checkin-schema.yaml                         |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |76      |vsp-checkout                    |onap-1.1          |vsp-checkout-schema.yaml                        |1.0       |
+      |76      |vsp-checkout                    |onap-amsterdam    |vsp-checkout-schema.yaml                        |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |77      |vsp-validate                    |onap-1.1          |vsp-validate-schema-1.1.yaml                    |1.0       |
+      |77      |vsp-validate                    |onap-amsterdam    |vsp-validate-schema-1.1.yaml                    |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |78      |vsp-list                        |onap-1.1          |vsp-list-schema-1.1.yaml                        |1.0       |
+      |78      |vsp-list                        |onap-amsterdam    |vsp-list-schema-1.1.yaml                        |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |79      |vsp-checkin                     |onap-1.1          |vsp-checkin-schema-1.1.yaml                     |1.0       |
+      |79      |vsp-checkin                     |onap-amsterdam    |vsp-checkin-schema-1.1.yaml                     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |80      |service-model-checkin           |onap-1.1          |service-model-checkin-schema-1.1.yaml           |1.0       |
+      |80      |service-model-checkin           |onap-amsterdam    |service-model-checkin-schema-1.1.yaml           |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |81      |service-model-distribute        |onap-1.1          |service-model-distribute-schema-1.1.yaml        |1.0       |
+      |81      |service-model-distribute        |onap-amsterdam    |service-model-distribute-schema-1.1.yaml        |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |82      |service-model-list              |onap-1.1          |service-model-list-schema-1.1.yaml              |1.0       |
+      |82      |service-model-list              |onap-amsterdam    |service-model-list-schema-1.1.yaml              |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |83      |service-model-certify-start     |onap-1.1          |service-model-certify-start-schema-1.1.yaml     |1.0       |
+      |83      |service-model-certify-start     |onap-amsterdam    |service-model-certify-start-schema-1.1.yaml     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |84      |service-model-add-vf            |onap-1.1          |service-model-add-vf-schema-1.1.yaml            |1.0       |
+      |84      |service-model-add-vf            |onap-amsterdam    |service-model-add-vf-schema-1.1.yaml            |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |85      |service-model-certify-request   |onap-1.1          |service-model-certify-request-schema-1.1.yaml   |1.0       |
+      |85      |service-model-certify-request   |onap-amsterdam    |service-model-certify-request-schema-1.1.yaml   |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |86      |service-model-revert            |onap-1.1          |service-model-checkout-schema-1.1.yaml          |1.0       |
+      |86      |service-model-revert            |onap-amsterdam    |service-model-checkout-schema-1.1.yaml          |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |87      |service-model-checkout          |onap-1.1          |service-model-revert-schema-1.1.yaml            |1.0       |
+      |87      |service-model-checkout          |onap-amsterdam    |service-model-revert-schema-1.1.yaml            |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |88      |service-model-certify-complete  |onap-1.1          |service-model-certify-complete-schema-1.1.yaml  |1.0       |
+      |88      |service-model-certify-complete  |onap-amsterdam    |service-model-certify-complete-schema-1.1.yaml  |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |89      |service2vf-model-list           |onap-1.1          |service2vf-model-list-schema-1.1.yaml           |1.0       |
+      |89      |service2vf-model-list           |onap-amsterdam    |service2vf-model-list-schema-1.1.yaml           |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |90      |service-model-create            |onap-1.1          |service-model-create-schema-1.1.yaml            |1.0       |
+      |90      |service-model-create            |onap-amsterdam    |service-model-create-schema-1.1.yaml            |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |91      |service-model-approve           |onap-1.1          |service-model-approve-schema-1.1.yaml           |1.0       |
+      |91      |service-model-approve           |onap-amsterdam    |service-model-approve-schema-1.1.yaml           |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |92      |vf-model-create                 |onap-1.1          |vf-model-create-schema-1.1.yaml                 |1.0       |
+      |92      |vf-model-create                 |onap-amsterdam    |vf-model-create-schema-1.1.yaml                 |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |93      |vf-model-checkin                |onap-1.1          |vf-model-checkin-schema-1.1.yaml                |1.0       |
+      |93      |vf-model-checkin                |onap-amsterdam    |vf-model-checkin-schema-1.1.yaml                |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |94      |vlm-revert                      |onap-1.1          |vlm-revert-schema-1.1.yaml                      |1.0       |
+      |94      |vlm-revert                      |onap-amsterdam    |vlm-revert-schema-1.1.yaml                      |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |95      |vlm-feature-group-create        |onap-1.1          |vlm-feature-group-create-schema-1.1.yaml        |1.0       |
+      |95      |vlm-feature-group-create        |onap-amsterdam    |vlm-feature-group-create-schema-1.1.yaml        |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |96      |vlm-submit                      |onap-1.1          |vlm-submit-schema-1.1.yaml                      |1.0       |
+      |96      |vlm-submit                      |onap-amsterdam    |vlm-submit-schema-1.1.yaml                      |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |97      |license-model-show              |onap-1.0          |license-model-show-schema.yaml                  |1.0       |
+      |97      |license-model-show              |openecomp         |license-model-show-schema.yaml                  |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |98      |vf-model-certify-start          |onap-1.1          |vf-model-certify-start-schema-1.1.yaml          |1.0       |
+      |98      |vf-model-certify-start          |onap-amsterdam    |vf-model-certify-start-schema-1.1.yaml          |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |99      |vf-model-list                   |onap-1.1          |vf-model-list-schema-1.1.yaml                   |1.0       |
+      |99      |vf-model-list                   |onap-amsterdam    |vf-model-list-schema-1.1.yaml                   |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |100     |vlm-entitlement-pool-list       |onap-1.1          |vlm-entitlement-pool-list-schema-1.1.yaml       |1.0       |
+      |100     |vlm-entitlement-pool-list       |onap-amsterdam    |vlm-entitlement-pool-list-schema-1.1.yaml       |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |101     |vlm-feature-group-list          |onap-1.1          |vlm-feature-group-list-schema-1.1.yaml          |1.0       |
+      |101     |vlm-feature-group-list          |onap-amsterdam    |vlm-feature-group-list-schema-1.1.yaml          |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |102     |vlm-checkout                    |onap-1.1          |vlm-checkout-schema-1.1.yaml                    |1.0       |
+      |102     |vlm-checkout                    |onap-amsterdam    |vlm-checkout-schema-1.1.yaml                    |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |103     |vlm-list                        |onap-1.1          |vlm-list-schema-1.1.yaml                        |1.0       |
+      |103     |vlm-list                        |onap-amsterdam    |vlm-list-schema-1.1.yaml                        |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |104     |vlm-aggreement-create           |onap-1.1          |vlm-aggreement-create-schema-1.1.yaml           |1.0       |
+      |104     |vlm-aggreement-create           |onap-amsterdam    |vlm-aggreement-create-schema-1.1.yaml           |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |105     |vf-model-certify-request        |onap-1.1          |vf-model-certify-request-schema-1.1.yaml        |1.0       |
+      |105     |vf-model-certify-request        |onap-amsterdam    |vf-model-certify-request-schema-1.1.yaml        |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |106     |ep-create                       |onap-1.0          |license-entitlement-pool-create-schema.yaml     |1.0       |
+      |106     |ep-create                       |openecomp         |license-entitlement-pool-create-schema.yaml     |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |107     |vf2vfmodule-model-list          |onap-1.1          |vf2vfmodule-model-list-schema-1.1.yaml          |1.0       |
+      |107     |vf2vfmodule-model-list          |onap-amsterdam    |vf2vfmodule-model-list-schema-1.1.yaml          |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |108     |vf-model-certify-complete       |onap-1.1          |vf-model-certify-complete-schema-1.1.yaml       |1.0       |
+      |108     |vf-model-certify-complete       |onap-amsterdam    |vf-model-certify-complete-schema-1.1.yaml       |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |109     |service-delete                  |onap-1.1          |service-delete-schema-1.1.yaml                  |1.0       |
+      |109     |service-delete                  |onap-amsterdam    |service-delete-schema-1.1.yaml                  |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |110     |vfmodule-delete                 |onap-1.1          |vf-module-delete-schema-1.1.yaml                |1.0       |
+      |110     |vfmodule-delete                 |onap-amsterdam    |vf-module-delete-schema-1.1.yaml                |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |111     |vfmodule-create                 |onap-1.1          |vfmodule-create-schema-1.1.yaml                 |1.0       |
+      |111     |vfmodule-create                 |onap-amsterdam    |vfmodule-create-schema-1.1.yaml                 |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |112     |service-create                  |onap-1.1          |service-create-schema-1.1.yaml                  |1.0       |
+      |112     |service-create                  |onap-amsterdam    |service-create-schema-1.1.yaml                  |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |113     |vf-delete                       |onap-1.1          |vf-delete-schema-1.1.yaml                       |1.0       |
+      |113     |vf-delete                       |onap-amsterdam    |vf-delete-schema-1.1.yaml                       |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
-      |114     |vf-create                       |onap-1.1          |vf-create-schema-1.1.yaml                       |1.0       |
+      |114     |vf-create                       |onap-amsterdam    |vf-create-schema-1.1.yaml                       |1.0       |
       +--------+--------------------------------+------------------+------------------------------------------------+----------+
diff --git a/framework/src/test/resources/open-cli-sample/schema-validate-sample.yaml b/framework/src/test/resources/open-cli-sample/schema-validate-sample.yaml
index 21cc4012..e9ad7f03 100644
--- a/framework/src/test/resources/open-cli-sample/schema-validate-sample.yaml
+++ b/framework/src/test/resources/open-cli-sample/schema-validate-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: schema-validate
-version: cli-1.0
+version: open-cli
 samples:
   sample1:
     name: schema-validate
diff --git a/plugins/onap-1.1/features/aai/pom.xml b/plugins/onap-1.1/features/aai/pom.xml
deleted file mode 100644
index 8cf8072f..00000000
--- a/plugins/onap-1.1/features/aai/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright 2017 Huawei Technologies Co., Ltd.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-         http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.1-features</artifactId>
-        <version>2.0.0</version>
-    </parent>
-
-    <artifactId>cli-plugins-onap-1.1-features-aai</artifactId>
-    <name>cli/plugins/onap-1.1/features/aai</name>
-    <packaging>jar</packaging>
-    <build>
-        <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/plugins/onap-1.1/features/msb/pom.xml b/plugins/onap-1.1/features/msb/pom.xml
deleted file mode 100644
index 66bf0db0..00000000
--- a/plugins/onap-1.1/features/msb/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright 2017 Huawei Technologies Co., Ltd.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-         http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.1-features</artifactId>
-        <version>2.0.0</version>
-    </parent>
-
-    <artifactId>cli-plugins-onap-1.1-features-msb</artifactId>
-    <name>cli/plugins/onap-1.1/features/msb</name>
-    <packaging>jar</packaging>
-    <build>
-        <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/plugins/onap-1.1/features/so/pom.xml b/plugins/onap-1.1/features/so/pom.xml
deleted file mode 100644
index 7f800a7f..00000000
--- a/plugins/onap-1.1/features/so/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright 2017 Huawei Technologies Co., Ltd.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-         http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.1-features</artifactId>
-        <version>2.0.0</version>
-    </parent>
-
-    <artifactId>cli-plugins-onap-1.1-features-so</artifactId>
-    <name>cli/plugins/onap-1.1/features/so</name>
-    <packaging>jar</packaging>
-    <build>
-        <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/plugins/onap-1.1/catalog/pom.xml b/plugins/onap-amsterdam/auth/pom.xml
index be7aa9ab..eaa83cb6 100644
--- a/plugins/onap-1.1/catalog/pom.xml
+++ b/plugins/onap-amsterdam/auth/pom.xml
@@ -23,12 +23,12 @@
 
     <parent>
         <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.1</artifactId>
+        <artifactId>cli-plugins-onap-amsterdam</artifactId>
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>cli-plugins-onap-1.1-catalog</artifactId>
-    <name>cli/plugins/onap-1.1/catalog</name>
+    <artifactId>cli-plugins-onap-amsterdam-auth</artifactId>
+    <name>cli/plugins/onap-amsterdam/auth</name>
     <packaging>jar</packaging>
     <build>
         <plugins>
diff --git a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandAmesterdam.java b/plugins/onap-amsterdam/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandAmesterdam.java
index 2e7e95eb..2e7e95eb 100644
--- a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandAmesterdam.java
+++ b/plugins/onap-amsterdam/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandAmesterdam.java
diff --git a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandAmesterdam.java b/plugins/onap-amsterdam/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandAmesterdam.java
index 130f71be..130f71be 100644
--- a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandAmesterdam.java
+++ b/plugins/onap-amsterdam/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandAmesterdam.java
diff --git a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandAmesterdam.java b/plugins/onap-amsterdam/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandAmesterdam.java
index cae9b3fd..cae9b3fd 100644
--- a/plugins/onap-1.1/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandAmesterdam.java
+++ b/plugins/onap-amsterdam/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandAmesterdam.java
diff --git a/plugins/onap-1.1/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand b/plugins/onap-amsterdam/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
index 3095b6f8..3095b6f8 100644
--- a/plugins/onap-1.1/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
+++ b/plugins/onap-amsterdam/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
diff --git a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml b/plugins/onap-amsterdam/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml
index 50fa1aff..52e6ba42 100644
--- a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml
+++ b/plugins/onap-amsterdam/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml
@@ -5,7 +5,7 @@ name: basic-login
 description: ONAP basic login auth command
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: basic-auth
   type: auth
   author: ONAP CLI Team onap-discuss@lists.onap.org
diff --git a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml b/plugins/onap-amsterdam/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml
index 7208537c..bd0b2e70 100644
--- a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml
+++ b/plugins/onap-amsterdam/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml
@@ -6,7 +6,7 @@ description: ONAP basic login auth command
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc-basic-auth
   type: auth
   author: ONAP CLI Team onap-discuss@lists.onap.org
diff --git a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml b/plugins/onap-amsterdam/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml
index b7e6dddb..c5e44183 100644
--- a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml
+++ b/plugins/onap-amsterdam/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml
@@ -5,7 +5,7 @@ name: basic-logout
 description: ONAP basic logout auth command
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: basic-auth
   type: auth
   author: ONAP CLI Team onap-discuss@lists.onap.org
diff --git a/plugins/onap-1.1/auth/pom.xml b/plugins/onap-amsterdam/catalog/pom.xml
index 91c3dd28..d041dced 100644
--- a/plugins/onap-1.1/auth/pom.xml
+++ b/plugins/onap-amsterdam/catalog/pom.xml
@@ -23,12 +23,12 @@
 
     <parent>
         <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.1</artifactId>
+        <artifactId>cli-plugins-onap-amsterdam</artifactId>
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>cli-plugins-onap-1.1-auth</artifactId>
-    <name>cli/plugins/onap-1.1/auth</name>
+    <artifactId>cli-plugins-onap-amsterdam-catalog</artifactId>
+    <name>cli/plugins/onap-amsterdam/catalog</name>
     <packaging>jar</packaging>
     <build>
         <plugins>
diff --git a/plugins/onap-1.1/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml b/plugins/onap-amsterdam/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml
index 5ab44e32..27fd24ae 100644
--- a/plugins/onap-1.1/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml
+++ b/plugins/onap-amsterdam/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml
@@ -6,7 +6,7 @@ description: ONAP catalog command to find the base path for service.
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: msb
   type: catalog
   author: ONAP CLI Team onap-discuss@lists.onap.org
diff --git a/plugins/onap-amsterdam/features/aai/pom.xml b/plugins/onap-amsterdam/features/aai/pom.xml
new file mode 100644
index 00000000..45e7ced3
--- /dev/null
+++ b/plugins/onap-amsterdam/features/aai/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2017 Huawei Technologies Co., Ltd.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+         http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.cli</groupId>
+        <artifactId>cli-plugins-onap-amsterdam-features</artifactId>
+        <version>2.0.0</version>
+    </parent>
+
+    <artifactId>cli-plugins-onap-amsterdam-features-aai</artifactId>
+    <name>cli/plugins/onap-amsterdam/features/aai</name>
+    <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
index 13e1dd43..4377332b 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: cloud-create
 description: Create a cloud region in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
index 7d61b659..c9f7e7a5 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: cloud-delete
 description: Delete a cloud region from Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
index 7ff00647..6048e907 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: cloud-list
 description: List the configured clouds and Onap service subscriptions
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
index 9d3bdf50..709e7358 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: customer-create
 description: Create a customer in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
index 5f9d0edc..c765dc73 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: customer-delete
 description: Delete a customer from Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
index 3dc1f509..ca2fd79c 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: customer-list
 description: Lists the registetred customers in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
index 8779ce2a..f8cb93d0 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: customer-show
 description: Lists the registetred customers in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
index a343a634..bd00aee8 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: Register a EMS in Onap
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
index ee89030b..140dfc9e 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: Un-register a EMS in Onap
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
index f4c6114e..244d6aec 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
@@ -5,7 +5,7 @@ name: ems-list
 description: List the configured ems
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
index fbcd6470..6c511602 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: Show the details of configured ems
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
index 422b20e3..58b14ac5 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: Register a SDNC in Onap
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
index 2a3e9f8d..f8fb4943 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: Un-register a VNFM in Onap
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
index 3f7f999d..fd17c14e 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: List the configured sdnc
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
index 02859d93..877940aa 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vim-register
 description: Register a VIM under a given cloud region in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
index a958e12b..2ecc868e 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: Un-register a VIM under from cloud region in Onap
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
index c946db86..3624824a 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: List the configured vims
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
index 37c2dd96..71ea1b8f 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: Register a VNFM in Onap
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
index 2792d1fc..449a2f5d 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: Un-register a VNFM in Onap
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
index bce4e1bb..d63e10b5 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: List the configured vnfm
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
index 1a42e683..241e4b14 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
@@ -6,7 +6,7 @@ description: Show the VNFM in Onap
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
index 97909598..10e058d6 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-list
 description: List created service instance
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml
index 0a9fa905..adb238c0 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vf-list
 description: List created VF instances for a service instance
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml
index c9546dea..95463354 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vf-show
 description: Show details for VF
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
index 80d6a8c8..5475ce38 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-type-create
 description: Add a service type in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 parameters:
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
index 2b5c923f..2c1f1af8 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-type-delete
 description: Delete a service type from Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
index 05b83174..747d7c11 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-type-list
 description: List the service types configured in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
index 0a501e20..ddf6a579 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: subscription-create
 description: Create a subscription of a customer for given service in specific cloud region in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
index a6df7b39..c20862ad 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: subscription-delete
 description: Delete the subscription for a given customer in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
index 03cb0f4d..7938c090 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: subscription-list
 description: Lists the subscription for a given customer in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
index 8b7f2368..f10dde93 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: tenant-create
 description: Create a tenant under given cloud region in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
index ea27c670..000ca852 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: tenant-delete
 description: Delete tenant under given cloud region in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
index d5e99d92..c30dacd6 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: tenant-list
 description: Lists the tenants under given cloud region in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json
index 223ebd26..223ebd26 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml
index 406fd941..3d032ec8 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: cloud-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: cloud-create
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json
index 85094a9d..85094a9d 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml
index ba123616..711f1410 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: cloud-delete
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: cloud-delete
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json
index 2e5b1db0..2e5b1db0 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml
index c82e928d..d16c858d 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: cloud-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: cloud-list
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-moco.json
index 18bb05d7..18bb05d7 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-sample.yaml
index 8f9f9514..f1530e30 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: customer-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: customer-create
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-moco.json
index 26e8a918..26e8a918 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-sample.yaml
index f57de5bd..6633f356 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: customer-delete
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: customer-delete
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-moco.json
index f7737271..f7737271 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-sample.yaml
index 19876116..023a6209 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: customer-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: customer-list
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-moco.json
index 242db8c1..242db8c1 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-sample.yaml
index 5ebbfa91..50fab324 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: customer-show
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: customer-show
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-moco.json
index 639f3581..639f3581 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml
index d086b9ef..0af19bb5 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: ems-register
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: ems-register
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json
index 9adbf83d..9adbf83d 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml
index 943d1c79..f0d210e7 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: ems-unregister
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: ems-unregister
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-moco.json
index b3b4738c..b3b4738c 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml
index 0852d506..79558757 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: ems-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: ems-list
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-moco.json
index b6ac827d..b6ac827d 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml
index 4a42171a..e4355b1b 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: ems-show
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: ems-show
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-moco.json
index 01ff5088..01ff5088 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml
index 93c8ca2a..a2f9b009 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vim-register
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vim-register
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json
index 4b5f43d3..4b5f43d3 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml
index 4cea61cd..e325d4c4 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vim-unregister
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vim-unregister
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-moco.json
index c9d425b3..c9d425b3 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml
index d3517fa6..fcb44ee6 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vim-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vim-list
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json
index b5091ecc..b5091ecc 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml
index 98dbb1da..b9d8ab10 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vnfm-register
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vnfm-register
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json
index 01248fc7..01248fc7 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml
index 7e436fbf..8ed8159d 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vnfm-unregister
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vnfm-unregister
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json
index 246f2dd2..246f2dd2 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml
index 5967b953..5ea9cfd0 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vnfm-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vnfm-list
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json
index 1b34db2f..1b34db2f 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml
index 071a4cc7..76acd620 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vnfm-show
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vnfm-show
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-moco.json
index e9a1d529..e9a1d529 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-sample.yaml
index 20038dc7..4ff87fbf 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-list
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-moco.json
index 096b5992..096b5992 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml
index f0ac7a1b..46877883 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vf-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vf-list
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-moco.json
index 3d697e03..3d697e03 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml
index e0d380c7..97b12cd8 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vf-show
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vf-show
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-moco.json
index d41ec6e3..d41ec6e3 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml
index b3a629c4..33cb278a 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-type-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-type-create
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-moco.json
index 682d32f1..682d32f1 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml
index 498b60a0..a95f289d 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-type-delete
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-type-delete
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-moco.json
index 337d445e..337d445e 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml
index 3baaef37..59affec0 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-type-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-type-list
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-moco.json
index 0839ead0..0839ead0 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml
index ce5ca345..f817e377 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: subscription-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: subscription-create
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-moco.json
index 302ea818..302ea818 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml
index c70d3f9b..da9b6491 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: subscription-delete
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: subscription-delete
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-moco.json
index 9565db34..9565db34 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml
index cec6ba41..5739cc82 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: subscription-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: subscription-list
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml
index e824b149..64cb9853 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: tenant-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
     sample1:
         name: Create a tenant under given cloud region
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml
index 42447ecb..3da7762a 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: tenant-delete
-version: onap-1.1
+version: onap-amsterdam
 samples:
     sample1:
         name: Delete the tenant under given cloud region
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml
index 72b48a6e..36730547 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml
+++ b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: tenant-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
     sample1:
         name: List the tenant under given cloud region in onap
diff --git a/plugins/onap-amsterdam/features/msb/pom.xml b/plugins/onap-amsterdam/features/msb/pom.xml
new file mode 100644
index 00000000..27b3642d
--- /dev/null
+++ b/plugins/onap-amsterdam/features/msb/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2017 Huawei Technologies Co., Ltd.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+         http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.cli</groupId>
+        <artifactId>cli-plugins-onap-amsterdam-features</artifactId>
+        <version>2.0.0</version>
+    </parent>
+
+    <artifactId>cli-plugins-onap-amsterdam-features-msb</artifactId>
+    <name>cli/plugins/onap-amsterdam/features/msb</name>
+    <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml
index 560fde38..44f1f86a 100644
--- a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml
+++ b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml
@@ -3,7 +3,7 @@ name: microservice-create
 description: Register microservice into Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: msb
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml
index 28fe2094..cc7f875b 100644
--- a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml
+++ b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml
@@ -3,7 +3,7 @@ name: microservice-delete
 description: Deletes the micro service from Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: msb
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml
index e355e2cc..91f847f3 100644
--- a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml
+++ b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml
@@ -4,7 +4,7 @@ description: Lists the registetred micro services in Onap
 
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: msb
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml
index d3d1d08a..13de1030 100644
--- a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml
+++ b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml
@@ -3,7 +3,7 @@ name: microservice-show
 description: Details the registered microservice in Onap
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: msb
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-moco.json b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-moco.json
index d2b703d0..d2b703d0 100644
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-moco.json
+++ b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-moco.json
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-sample.yaml b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-sample.yaml
index 87c1c457..3216ff7e 100644
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-sample.yaml
+++ b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: microservice-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: microservice-create
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-moco.json b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-moco.json
index 0c3d7e82..0c3d7e82 100644
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-moco.json
+++ b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-moco.json
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-sample.yaml b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-sample.yaml
index 4fcd9f82..c0a3778d 100644
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-sample.yaml
+++ b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-sample.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: microservice-delete
-version: onap-1.1
+version: onap-amsterdam
 samples:
     sample1:
         name: microservice-delete
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-moco.json b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-moco.json
index b836183d..b836183d 100644
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-moco.json
+++ b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-moco.json
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-sample.yaml b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-sample.yaml
index 7e104049..819618dd 100644
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-sample.yaml
+++ b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: microservice-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: microservice-list
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-moco.json b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-moco.json
index 5064b7b6..5064b7b6 100644
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-moco.json
+++ b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-moco.json
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-sample.yaml b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-sample.yaml
index 86f1f417..b75cb8bc 100644
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-sample.yaml
+++ b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: microservice-show
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: microservice-show
diff --git a/plugins/onap-1.1/features/pom.xml b/plugins/onap-amsterdam/features/pom.xml
index ca51aaae..3757a3a1 100644
--- a/plugins/onap-1.1/features/pom.xml
+++ b/plugins/onap-amsterdam/features/pom.xml
@@ -23,12 +23,12 @@
 
     <parent>
         <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.1</artifactId>
+        <artifactId>cli-plugins-onap-amsterdam</artifactId>
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>cli-plugins-onap-1.1-features</artifactId>
-    <name>cli/plugins/onap-1.1/features</name>
+    <artifactId>cli-plugins-onap-amsterdam-features</artifactId>
+    <name>cli/plugins/onap-amsterdam/features</name>
     <packaging>pom</packaging>
     
     <modules>
diff --git a/plugins/onap-1.0/features/sdc/pom.xml b/plugins/onap-amsterdam/features/sdc/pom.xml
index 275cae52..009709c6 100644
--- a/plugins/onap-1.0/features/sdc/pom.xml
+++ b/plugins/onap-amsterdam/features/sdc/pom.xml
@@ -21,12 +21,12 @@
 
     <parent>
         <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.0-features</artifactId>
+        <artifactId>cli-plugins-onap-amsterdam-features</artifactId>
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>cli-plugins-onap-1.0-features-sdc</artifactId>
-    <name>cli/plugins/onap-1.0/features/sdc</name>
+    <artifactId>cli-plugins-onap-amsterdam-features-sdc</artifactId>
+    <name>cli/plugins/onap-amsterdam/features/sdc</name>
     <packaging>jar</packaging>
     <build>
         <plugins>
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml
index 33dce3cd..e1166e4b 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-model-add-vf
 description: Helps to add VF into service models in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-1.1.yaml
index 1e779b3a..b814db50 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-model-approve
 description: Approves the Service model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml
index e45552b2..8b0ee7a1 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-model-certify-complete
 description: Completes the certification of Service model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml
index e9787c5f..dc19c796 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-model-certify-request
 description: Request the certification of Service model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml
index 9c6dfad3..598eea7e 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-model-certify-start
 description: Starts the certification of Service model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-1.1.yaml
index 9e03dfe1..048e8c41 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-model-checkin
 description: Checkin Service model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-1.1.yaml
index da392975..cf243365 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-model-revert
 description: Checkout Service model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-1.1.yaml
index d723d2bd..6d34d4ab 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-model-create
 description: Create Service model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-1.1.yaml
index 76428a15..aa69687e 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-model-distribute
 description: Distributes the Service model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-1.1.yaml
index fdc2529c..2e1bccea 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-model-list
 description: List the service model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-revert-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-revert-schema-1.1.yaml
index 7d91015f..9029b2a4 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-revert-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-revert-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-model-checkout
 description: Checkout Service model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml
index b0b7790a..8a50f4f2 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service2vf-model-list
 description: List the VF in a given service model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-complete-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-complete-schema-1.1.yaml
index 5a9d900b..06ac254c 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-complete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-complete-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vf-model-certify-complete
 description: Complete certifying Virtual function
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-request-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-request-schema-1.1.yaml
index 62c749a7..5af2098e 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-request-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-request-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vf-model-certify-request
 description: Request for certifying Virtual function
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-start-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-start-schema-1.1.yaml
index ed8cbb92..e7944133 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-start-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-start-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vf-model-certify-start
 description: Start certifying Virtual function
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkin-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkin-schema-1.1.yaml
index 235ff834..019cab00 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkin-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkin-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vf-model-checkin
 description: Checkin Virtual function
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-1.1.yaml
index 614a5098..44b706d0 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vf-model-create
 description: Create Virtual function from Vendor Software Product
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-list-schema-1.1.yaml
index 172ad815..48619c87 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vf-model-list
 description: List the VF resource model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml
index 75092245..ae151279 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vf2vfmodule-model-list
 description: List the VF modules in a given VF model in SDC
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-create-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-create-schema.yaml
index 7d944f53..721d2604 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-create-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-create-schema.yaml
@@ -3,7 +3,7 @@ name: ep-create
 description: Create Entitlement Pool
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-show-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-show-schema.yaml
index e3b9578d..20c134cc 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-show-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-show-schema.yaml
@@ -3,7 +3,7 @@ name: ep-show
 description: Details of the Entitlement Pool
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-create-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-create-schema.yaml
index 3bf9c84b..9797f46d 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-create-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-create-schema.yaml
@@ -3,7 +3,7 @@ name: license-group-create
 description: Create License Group
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-show-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-show-schema.yaml
index 231387ef..15609462 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-show-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-show-schema.yaml
@@ -3,7 +3,7 @@ name: license-group-show
 description: Details of the License Group
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-create-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-create-schema.yaml
index 7493ee26..cfcc1a13 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-create-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-create-schema.yaml
@@ -3,7 +3,7 @@ name: license-model-create
 description: Create License Model
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-show-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-show-schema.yaml
index 05ceace0..da1c3b57 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-show-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-show-schema.yaml
@@ -3,7 +3,7 @@ name: license-model-show
 description: Details of the License Model
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-1.1.yaml
index 2224d6d5..b424e31d 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-aggreement-create
 description: Create license aggreement
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-list-schema-1.1.yaml
index 9a7f6c79..0194a4d2 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-aggreement-list
 description: List license aggreement
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkin-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkin-schema-1.1.yaml
index b05fbb16..38e335f3 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkin-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkin-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-checkin
 description: Checkin Vendor License Model
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkout-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkout-schema-1.1.yaml
index 6b4c5688..42fd8193 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkout-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkout-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-checkout
 description: Checkout Vendor License Model
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-create-schema-1.1.yaml
index 128a9e2c..dad02b4f 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-create
 description: Create License Model
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-create-schema-1.1.yaml
index db59fc24..ca9d00ea 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-entitlement-pool-create
 description: Create Entitlement Pool
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-list-schema-1.1.yaml
index 0e6dc66b..d847ce80 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-entitlement-pool-list
 description: entitlement pool list in a license model
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-create-schema-1.1.yaml
index a694ae62..7b637067 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-feature-group-create
 description: Create feature group Pool
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-list-schema-1.1.yaml
index 3f3a1aff..92de8d25 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-feature-group-list
 description: Feature group list in a license model
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-create-schema-1.1.yaml
index 69ba00ec..76c12cc9 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-key-group-create
 description: Create License Key Group
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-list-schema-1.1.yaml
index e326f2e6..37a8fa5c 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-key-group-list
 description: key group list in a license model
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-list-schema-1.1.yaml
index c85846f7..c01c9802 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-list
 description: List License Model
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-revert-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-revert-schema-1.1.yaml
index 890da577..05185fdb 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-revert-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-revert-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-revert
 description: Revert Vendor License Model
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-submit-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-submit-schema-1.1.yaml
index f824af07..8d7274e0 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-submit-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-submit-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vlm-submit
 description: Submit Vendor License Model
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml
index 6822ef90..446f002a 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vsp-add-artifact
 description: Upload the CSAR file to VSP
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema-1.1.yaml
index cdafa2c7..c556d4a0 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vsp-checkin
 description: Checkin Vendor Software Product
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema-1.1.yaml
index 9e221b7f..aed6f39a 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vsp-checkout
 description: Checkout Vendor Software Product
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-1.1.yaml
index e4cd8bd3..2ddda92d 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vsp-create
 description: Create Vendor Software Product
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-1.1.yaml
index 8271f9de..bc0114ae 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vsp-list
 description: List of the Vendor Software Products
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-1.1.yaml
index 01833844..766e1f77 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vsp-package
 description: Package Vendor Software Product
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-revert-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-revert-schema-1.1.yaml
index f5796520..932b1b3b 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-revert-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-revert-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vsp-revert
 description: Revert Vendor Software Product
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema-1.1.yaml
index dea07300..b788148b 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vsp-show
 description: Details of the Vendor Software Product
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-1.1.yaml
index 6529b9a3..04b84b07 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vsp-submit
 description: Submit Vendor Software Product
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-1.1.yaml b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-1.1.yaml
index 42364cc3..61b664c5 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vsp-validate
 description: Validated the uploaded Vendor Software Product
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-moco.json
index 34058a31..34058a31 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-sample.yaml
index 2fd3d4d4..ff90dd98 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-model-add-vf
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-model-add-vf
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-moco.json
index b7ea4ebf..b7ea4ebf 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-sample.yaml
index fb0d48d7..8b6e831a 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-model-certify-complete
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-model-certify-complete
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-moco.json
index 0ae0e2da..0ae0e2da 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-sample.yaml
index a96f759a..7ba27d9a 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-model-certify-request
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-model-certify-request
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-moco.json
index 1f1330d6..1f1330d6 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-sample.yaml
index 615f0247..e4386d94 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-model-certify-start
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-model-certify-start
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-moco.json
index b6979a55..b6979a55 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-sample.yaml
index acc1ab74..25969019 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-model-checkin
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-model-checkin
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-moco.json
index 5521a446..5521a446 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-sample.yaml
index 7930e1f7..82eba525 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-model-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-model-create
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-moco.json
index 9baedf85..9baedf85 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-sample.yaml
index 162b2f93..cd25fbab 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-model-distribute
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-model-distribute
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-moco.json
index d5745217..d5745217 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml
index 40eec42e..53d0f826 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-model-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-model-list
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-moco.json
index cb4b6e16..cb4b6e16 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml
index b6442e8d..88275646 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service2vf-model-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service2vf-model-list
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-moco.json
index 48df97c4..48df97c4 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-sample.yaml
index dab22073..9b3a9c97 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vf-model-certify-complete
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vf-model-certify-complete
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-moco.json
index 5160e68f..5160e68f 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-sample.yaml
index 64a26472..8da64f9c 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vf-model-certify-request
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vf-model-certify-request
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-moco.json
index e5332cb8..e5332cb8 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-sample.yaml
index cbff5293..885dc5c1 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vf-model-certify-start
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vf-model-certify-start
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-moco.json
index 5fd14717..5fd14717 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-sample.yaml
index b88fa121..588ada2b 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vf-model-checkin
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vf-model-checkin
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-moco.json
index c71e0448..c71e0448 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-sample.yaml
index bf043a0c..e9b6db76 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vf-model-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vf-model-create
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-moco.json
index 0a7e338e..0a7e338e 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml
index f4b45889..c0598d94 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vf-model-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vf-model-list
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json
index 14d15d02..14d15d02 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml
index 6fb4b0e9..f729652b 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vf2vfmodule-model-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vf2vfmodule-model-list
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-create-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-create-schema.yaml
index 0ca30d3e..25f9f8a9 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-create-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-create-schema.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: ep-create
-version: onap-1.0
+version: openecomp
 samples:
   sample1:
     name: create license entitlement Pool
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-show-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-show-schema.yaml
index 4bed00ee..786453ab 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-show-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-show-schema.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: ep-show
-version: onap-1.0
+version: openecomp
 samples:
   sample1:
     name: Get specific license key group
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-create-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-create-schema.yaml
index b5c2de44..ee8bc124 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-create-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-create-schema.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: license-key-group-create
-version: onap-1.0
+version: openecomp
 samples:
   sample1:
     name: create license key group
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-show-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-show-schema.yaml
index 7dd75aca..e9f70f7d 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-show-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-show-schema.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: license-group-show
-version: onap-1.0
+version: openecomp
 samples:
   sample1:
     name: Get specific license key group
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-create-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-create-schema.yaml
index fdc54dd6..d95292ef 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-create-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-create-schema.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: license-model-create
-version: onap-1.0
+version: openecomp
 samples:
   sample1:
     name: create license model
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-show-schema.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-show-schema.yaml
index b8265664..d9ee023e 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-show-schema.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-show-schema.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: license-model-show
-version: onap-1.0
+version: openecomp
 samples:
   sample1:
     name: Get specific license model
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-moco.json
index 44038797..44038797 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml
index 4817206a..d0cefb53 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-aggreement-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-aggreement-create
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-moco.json
index 3da67ac8..3da67ac8 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-sample.yaml
index 01e9b906..d245498b 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-aggreement-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-aggreement-list
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json
index c62f721c..c62f721c 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml
index 2db17cb9..27c3a32b 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-checkin
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-checkin
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-moco.json
index 164a59c7..164a59c7 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-sample.yaml
index 1e647559..5c11d88a 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-checkout
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-checkout
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-moco.json
index 57445daf..57445daf 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml
index 899ca07e..46c7473e 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-create
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-moco.json
index f40193ad..f40193ad 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-sample.yaml
index b4505a3c..a4d563bc 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-entitlement-pool-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-entitlement-pool-create
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-moco.json
index acf1f022..acf1f022 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-sample.yaml
index 0f45164c..ced316b1 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-entitlement-pool-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-entitlement-pool-list
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-moco.json
index d3b8c0d2..d3b8c0d2 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml
index 13e393b5..914ec5ff 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-feature-group-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-feature-group-create
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-moco.json
index ac09b4eb..ac09b4eb 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-sample.yaml
index 4745329b..42e68514 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-feature-group-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-feature-group-list
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-moco.json
index 4ac759e9..4ac759e9 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml
index a140156c..c48d2b9a 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-key-group-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-key-group-create
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-moco.json
index cb688bbc..cb688bbc 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-sample.yaml
index b088bb72..79e17327 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-key-group-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-key-group-list
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-moco.json
index 8634d109..8634d109 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml
index 9f4abce7..9f2e7691 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-list
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-moco.json
index 5045c98c..5045c98c 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-sample.yaml
index c9ac298f..6a4b1d05 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-revert
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-revert
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-moco.json
index b7811539..b7811539 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml
index bbe93d68..9a0656de 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vlm-submit
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vlm-submit
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json
index bf29aed4..bf29aed4 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml
index bd1a6f98..5fcfc877 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vsp-checkin
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vsp-checkin
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json
index fb90a444..fb90a444 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml
index 45e880d9..02507598 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vsp-checkout
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vsp-checkout
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-moco.json
index 0a9b516c..0a9b516c 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml
index 2ffe41b4..6847df0f 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vsp-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vsp-create
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-moco.json
index b2f96dd9..b2f96dd9 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml
index 83df60da..d3276fe9 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vsp-list
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vsp-list
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-moco.json
index 9c93fb79..9c93fb79 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml
index 6eb13313..a034c9fc 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vsp-package
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vsp-package
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-moco.json
index fcff4c97..fcff4c97 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-sample.yaml
index 274d54c7..9dceda5c 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vsp-revert
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vsp-revert
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-moco.json
index 8caab9a1..8caab9a1 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml
index 5c15ec13..84effbf5 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vsp-show
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vsp-show
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-moco.json
index 6ec6072b..6ec6072b 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml
index 74a4c66c..97013bb6 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vsp-submit
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vsp-submit
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-schema-1.1-sample.yaml
index dc229d76..92990a77 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-schema-1.1-sample.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: vsp-upload
-version: onap-1.1
+version: onap-amsterdam
 samples:
     sample1:
         name: vsp-upload
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-moco.json b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-moco.json
index 8ae9d2c5..8ae9d2c5 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml
index 341f38c7..4e0389e8 100644
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vsp-validate
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vsp-validate
diff --git a/plugins/onap-amsterdam/features/so/pom.xml b/plugins/onap-amsterdam/features/so/pom.xml
new file mode 100644
index 00000000..afa5acf6
--- /dev/null
+++ b/plugins/onap-amsterdam/features/so/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2017 Huawei Technologies Co., Ltd.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+         http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.cli</groupId>
+        <artifactId>cli-plugins-onap-amsterdam-features</artifactId>
+        <version>2.0.0</version>
+    </parent>
+
+    <artifactId>cli-plugins-onap-amsterdam-features-so</artifactId>
+    <name>cli/plugins/onap-amsterdam/features/so</name>
+    <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
index c9b1d7ac..8073f07e 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: service-create
 description: Create a service instance using MSO
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: so
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
index 324e4e20..ce45e2d8 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
@@ -4,7 +4,7 @@ name: service-delete
 description: Delete service instance (experimental)
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: so
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml
index faf9cfa4..9a56a9a4 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml
@@ -2,7 +2,7 @@ open_cli_schema_version: 1.0
 name: vf-create
 description: Create a VF
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: so
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml
index c706c931..e3a7cbea 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml
@@ -2,7 +2,7 @@ open_cli_schema_version: 1.0
 name: vf-delete
 description: delete a VF (experimental)
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: so
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
index 9395f4a1..3f08e44c 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vf-module-create
 description: Create a VF Module
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: so
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
index 013ec68a..18ed5fc3 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
@@ -4,7 +4,7 @@ name: vfmodule-delete
 description: delete a VF module (experimental)
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: so
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml
index c2537aea..e1f77aad 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml
+++ b/plugins/onap-amsterdam/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml
@@ -3,7 +3,7 @@ name: vfmodule-create
 description: Create a VF module
 
 info:
-  product: onap-1.1
+  product: onap-amsterdam
   service: so
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml
index e8fcb0f8..c8810226 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml
+++ b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: service-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
     sample1:
         name: Create a service instance
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json
index 28321085..28321085 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml
index 4815ac39..e4f37195 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: service-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: service-create
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml
index f6fd2c77..b4994c9e 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml
+++ b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: service-delete
-version: onap-1.1
+version: onap-amsterdam
 samples:
     sample1:
         name: delete a service instance
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json
index 0d8a97b9..0d8a97b9 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json
+++ b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml
index 3b31d80c..265d293a 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml
+++ b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml
@@ -1,6 +1,6 @@
 open_cli_sample_version: 1.0
 name: vf-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: vf-create
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml
index 6ba9633b..c04d2357 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml
+++ b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: vf-module-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
     sample1:
         name: Create a vnf
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml
index 36a7f150..74536538 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml
+++ b/plugins/onap-amsterdam/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: vf-module-delete
-version: onap-1.1
+version: onap-amsterdam
 samples:
     sample1:
         name: delete a vf module
diff --git a/plugins/onap-1.1/pom.xml b/plugins/onap-amsterdam/pom.xml
index fcde9060..2b4dfada 100644
--- a/plugins/onap-1.1/pom.xml
+++ b/plugins/onap-amsterdam/pom.xml
@@ -27,8 +27,8 @@
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>cli-plugins-onap-1.1</artifactId>
-    <name>cli/plugins/onap-1.1</name>
+    <artifactId>cli-plugins-onap-amsterdam</artifactId>
+    <name>cli/plugins/onap-amsterdam</name>
     <packaging>pom</packaging>
     
     <modules>
diff --git a/plugins/onap-1.0/auth/pom.xml b/plugins/openecomp/auth/pom.xml
index f1d6ab15..8b69d782 100644
--- a/plugins/onap-1.0/auth/pom.xml
+++ b/plugins/openecomp/auth/pom.xml
@@ -23,12 +23,12 @@
 
     <parent>
         <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.0</artifactId>
+        <artifactId>cli-plugins-openecomp</artifactId>
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>cli-plugins-onap-1.0-auth</artifactId>
-    <name>cli/plugins/onap-1.0/auth</name>
+    <artifactId>cli-plugins-openecomp-auth</artifactId>
+    <name>cli/plugins/openecomp/auth</name>
     <packaging>jar</packaging>
     <build>
         <plugins>
diff --git a/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java b/plugins/openecomp/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java
index e0fa3abf..e0fa3abf 100644
--- a/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java
+++ b/plugins/openecomp/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommand.java
diff --git a/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java b/plugins/openecomp/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java
index b87989c7..b87989c7 100644
--- a/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java
+++ b/plugins/openecomp/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommand.java
diff --git a/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java b/plugins/openecomp/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java
index 0e8805a4..0e8805a4 100644
--- a/plugins/onap-1.0/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java
+++ b/plugins/openecomp/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommand.java
diff --git a/plugins/onap-1.0/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand b/plugins/openecomp/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
index 7594b30f..7594b30f 100644
--- a/plugins/onap-1.0/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
+++ b/plugins/openecomp/auth/src/main/resources/META-INF/services/org.onap.cli.fw.OnapCommand
diff --git a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml b/plugins/openecomp/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml
index ce039496..675a1f88 100644
--- a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml
+++ b/plugins/openecomp/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml
@@ -5,7 +5,7 @@ name: basic-login
 description: ONAP basic login auth command
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: basic-auth
   type: auth
   author: ONAP CLI Team onap-discuss@lists.onap.org
diff --git a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml b/plugins/openecomp/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml
index 02ae5b64..d9467440 100644
--- a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml
+++ b/plugins/openecomp/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml
@@ -6,7 +6,7 @@ description: ONAP basic login auth command
 
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: sdc-basic-auth
   type: auth
   author: ONAP CLI Team onap-discuss@lists.onap.org
diff --git a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml b/plugins/openecomp/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml
index dee323da..1e2bea22 100644
--- a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml
+++ b/plugins/openecomp/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml
@@ -5,7 +5,7 @@ name: basic-logout
 description: ONAP basic logout auth command
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: basic-auth
   type: auth
   author: ONAP CLI Team onap-discuss@lists.onap.org
diff --git a/plugins/onap-1.0/catalog/pom.xml b/plugins/openecomp/catalog/pom.xml
index f1e13930..6e216449 100644
--- a/plugins/onap-1.0/catalog/pom.xml
+++ b/plugins/openecomp/catalog/pom.xml
@@ -23,12 +23,12 @@
 
     <parent>
         <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.0</artifactId>
+        <artifactId>cli-plugins-openecomp</artifactId>
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>cli-plugins-onap-1.0-catalog</artifactId>
-    <name>cli/plugins/onap-1.0/catalog</name>
+    <artifactId>cli-plugins-openecomp-catalog</artifactId>
+    <name>cli/plugins/openecomp/catalog</name>
     <packaging>jar</packaging>
     <build>
         <plugins>
diff --git a/plugins/onap-1.0/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml b/plugins/openecomp/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml
index 89fde833..d55e23d3 100644
--- a/plugins/onap-1.0/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml
+++ b/plugins/openecomp/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml
@@ -5,7 +5,7 @@ name: catalog
 description: ONAP catalog command to find the base path for service.
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: msb
   type: catalog
   author: ONAP CLI Team onap-discuss@lists.onap.org
diff --git a/plugins/onap-1.0/features/aai/pom.xml b/plugins/openecomp/features/aai/pom.xml
index 587d554b..dc452b45 100644
--- a/plugins/onap-1.0/features/aai/pom.xml
+++ b/plugins/openecomp/features/aai/pom.xml
@@ -23,12 +23,12 @@
 
     <parent>
         <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.0-features</artifactId>
+        <artifactId>cli-plugins-openecomp-features</artifactId>
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>cli-plugins-onap-1.0-features-aai</artifactId>
-    <name>cli/plugins/onap-1.0/features/aai</name>
+    <artifactId>cli-plugins-openecomp-features-aai</artifactId>
+    <name>cli/plugins/openecomp/features/aai</name>
     <packaging>jar</packaging>
     <build>
         <plugins>
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml
index f3e93e4d..50cea668 100644
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml
+++ b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml
@@ -3,7 +3,7 @@ name: cloud-list
 description: List the configured clouds and Onap service subscriptions
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml
index 304f5471..8ca23903 100644
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml
+++ b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml
@@ -3,7 +3,7 @@ name: customer-create
 description: Create a customer in Onap
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml
index 98e11b8e..01fecefb 100644
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml
+++ b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml
@@ -3,7 +3,7 @@ name: customer-delete
 description: Delete a customer from Onap
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml
index dab97755..043e5bc7 100644
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml
+++ b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml
@@ -3,7 +3,7 @@ name: customer-list
 description: Lists the registetred customers in Onap
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml
index 45caad5d..357efefa 100644
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml
+++ b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml
@@ -3,7 +3,7 @@ name: customer-show
 description: Lists the registetred customers in Onap
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml
index e5f398ed..e59e910f 100644
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml
+++ b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml
@@ -3,7 +3,7 @@ name: service-type-create
 description: Add a service type in Onap
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml
index 977e78ad..4c615b40 100644
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml
+++ b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml
@@ -3,7 +3,7 @@ name: service-type-delete
 description: Delete a service type from Onap
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml
index c97ea77d..746b58f8 100644
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml
+++ b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml
@@ -3,7 +3,7 @@ name: service-type-list
 description: List the service types configured in Onap
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml
index e6d059aa..2fd3ca98 100644
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml
+++ b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml
@@ -3,7 +3,7 @@ name: subscription-create
 description: Create a subscription for a customer in Onap
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml
index 75b9b3a7..4893194d 100644
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml
+++ b/plugins/openecomp/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml
@@ -3,7 +3,7 @@ name: subscription-list
 description: Lists the subscription for a given customer in Onap
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: aai
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml b/plugins/openecomp/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
index b448c8cc..f57b3018 100644
--- a/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
+++ b/plugins/openecomp/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: cloud-list
-version: onap-1.0
+version: openecomp
 samples:
     sample1:
         name: List the configured clouds in onap
diff --git a/plugins/onap-1.0/features/pom.xml b/plugins/openecomp/features/pom.xml
index 0dfd033e..b1f334bf 100644
--- a/plugins/onap-1.0/features/pom.xml
+++ b/plugins/openecomp/features/pom.xml
@@ -23,12 +23,12 @@
 
     <parent>
         <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.0</artifactId>
+        <artifactId>cli-plugins-openecomp</artifactId>
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>cli-plugins-onap-1.0-features</artifactId>
-    <name>cli/plugins/onap-1.0/features</name>
+    <artifactId>cli-plugins-openecomp-features</artifactId>
+    <name>cli/plugins/openecomp/features</name>
     <packaging>pom</packaging>
     
     <modules>
diff --git a/plugins/onap-1.1/features/sdc/pom.xml b/plugins/openecomp/features/sdc/pom.xml
index 71ef047e..fc2b1b5a 100644
--- a/plugins/onap-1.1/features/sdc/pom.xml
+++ b/plugins/openecomp/features/sdc/pom.xml
@@ -21,12 +21,12 @@
 
     <parent>
         <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.1-features</artifactId>
+        <artifactId>cli-plugins-openecomp-features</artifactId>
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>cli-plugins-onap-1.1-features-sdc</artifactId>
-    <name>cli/plugins/onap-1.1/features/sdc</name>
+    <artifactId>cli-plugins-openecomp-features-sdc</artifactId>
+    <name>cli/plugins/openecomp/features/sdc</name>
     <packaging>jar</packaging>
     <build>
         <plugins>
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
index 57085d54..a223c8d4 100644
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
+++ b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
@@ -3,7 +3,7 @@ name: license-model-create
 description: Create License Model
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
index fe950f32..860cbea9 100644
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
+++ b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
@@ -3,7 +3,7 @@ name: license-model-show
 description: Details of the License Model
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
index a6c0b700..d7b2d90f 100644
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
+++ b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
@@ -3,7 +3,7 @@ name: vsp-checkin
 description: Checkin Vendor Software Product
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
index 6e4b11b0..50d73517 100644
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
+++ b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
@@ -3,7 +3,7 @@ name: vsp-checkout
 description: Checkout Vendor Software Product
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
index a50ef44b..f3fbbd6a 100644
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
+++ b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
@@ -3,7 +3,7 @@ name: vsp-create
 description: Create Vendor Software Product
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
index 66892aaf..3bdd41d7 100644
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
+++ b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
@@ -3,7 +3,7 @@ name: vsp-list
 description: List of the Vendor Software Products
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
index 35d776d5..affe73e7 100644
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
+++ b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
@@ -3,7 +3,7 @@ name: vsp-show
 description: Details of the Vendor Software Product
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
index 4ad1cff4..00c95f01 100644
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
+++ b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
@@ -3,7 +3,7 @@ name: vsp-submit
 description: Submit Vendor Software Product
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
index e54e1132..b8708b83 100644
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
+++ b/plugins/openecomp/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
@@ -3,7 +3,7 @@ name: vsp-upload
 description: Upload the CSAR file to VSP
 
 info:
-  product: onap-1.0
+  product: openecomp
   service: sdc
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
index 9dfe035f..6d703741 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
+++ b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: vsp-checkin
-version: onap-1.0
+version: openecomp
 samples:
     sample1:
         name: Checkin the Vendor Software Product
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
index 32f2de93..b935cd20 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
+++ b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: vsp-checkout
-version: onap-1.1
+version: onap-amsterdam
 
 samples:
     sample1:
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
index 3b4ce7b5..3fb85e48 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
+++ b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: vsp-create
-version: onap-1.0
+version: openecomp
 samples:
     sample1:
         name: Create the Vendor Software Product
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
index f1fff560..50ba22db 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
+++ b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: vsp-list
-version: onap-1.0
+version: openecomp
 samples:
     sample1:
         name: List Vendor Software Products
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
index 880608c5..4af221e3 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
+++ b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: vsp-show
-version: onap-1.0
+version: openecomp
 samples:
     sample1:
         name: Show the details of Vendor Software Products
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
index 4f4e15c0..3cf101bc 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
+++ b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: vsp-submit
-version: onap-1.0
+version: openecomp
 samples:
     sample1:
         name: Submit the Vendor Software Product
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
index d3fc41be..b615bd66 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
+++ b/plugins/openecomp/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: vsp-upload
-version: onap-1.0
+version: openecomp
 samples:
     sample1:
         name: upload the zip file to Vendor Software Product
diff --git a/plugins/onap-1.0/pom.xml b/plugins/openecomp/pom.xml
index 400b6e90..2f490432 100644
--- a/plugins/onap-1.0/pom.xml
+++ b/plugins/openecomp/pom.xml
@@ -27,8 +27,8 @@
         <version>2.0.0</version>
     </parent>
 
-    <artifactId>cli-plugins-onap-1.0</artifactId>
-    <name>cli/plugins/onap-1.0</name>
+    <artifactId>cli-plugins-openecomp</artifactId>
+    <name>cli/plugins/openecomp</name>
     <packaging>pom</packaging>
     
     <modules>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 5d1ac35e..2e733529 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -59,8 +59,8 @@
             <activeByDefault>true</activeByDefault>
           </activation>
           <modules>
-            <module>onap-1.0</module>
-            <module>onap-1.1</module>
+            <module>openecomp</module>
+            <module>onap-amsterdam</module>
           </modules>
        </profile>
 
diff --git a/plugins/sample/src/main/resources/open-cli-schema/hello-world-http.yaml b/plugins/sample/src/main/resources/open-cli-schema/hello-world-http.yaml
index 04998ea3..7acba741 100644
--- a/plugins/sample/src/main/resources/open-cli-schema/hello-world-http.yaml
+++ b/plugins/sample/src/main/resources/open-cli-schema/hello-world-http.yaml
@@ -7,7 +7,7 @@ description: |
    lighttpd in cli at http://<cli-ip>:8080/version.json
 
 info:
-  product: sample-1.0
+  product: sample-helloworld
   service: hello-world
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/plugins/sample/src/main/resources/open-cli-schema/hello-world.yaml b/plugins/sample/src/main/resources/open-cli-schema/hello-world.yaml
index 9e99046e..e87e6dff 100644
--- a/plugins/sample/src/main/resources/open-cli-schema/hello-world.yaml
+++ b/plugins/sample/src/main/resources/open-cli-schema/hello-world.yaml
@@ -5,7 +5,7 @@ name: hello-world
 description: First cmd hello world
 
 info:
-  product: sample-1.0
+  product: sample-helloworld
   service: hello-world
   author: ONAP CLI Team onap-discuss@lists.onap.org
 
diff --git a/validate/validation/pom.xml b/validate/validation/pom.xml
index cdbf43c2..27f34c12 100644
--- a/validate/validation/pom.xml
+++ b/validate/validation/pom.xml
@@ -55,34 +55,34 @@
         </dependency>
         <dependency>
             <groupId>org.onap.cli</groupId>
-            <artifactId>cli-plugins-onap-1.1-catalog</artifactId>
+            <artifactId>cli-plugins-onap-amsterdam-catalog</artifactId>
             <version>${project.version}</version>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>org.onap.cli</groupId>
-            <artifactId>cli-plugins-onap-1.1-auth</artifactId>
+            <artifactId>cli-plugins-onap-amsterdam-auth</artifactId>
             <version>${project.version}</version>
-        </dependency>                 
+        </dependency>
         <dependency>
             <groupId>org.onap.cli</groupId>
-            <artifactId>cli-plugins-onap-1.1-features-so</artifactId>
+            <artifactId>cli-plugins-onap-amsterdam-features-so</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.onap.cli</groupId>
-            <artifactId>cli-plugins-onap-1.1-features-sdc</artifactId>
+            <artifactId>cli-plugins-onap-amsterdam-features-sdc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.cli</groupId>
-            <artifactId>cli-plugins-onap-1.1-features-msb</artifactId>
+            <artifactId>cli-plugins-onap-amsterdam-features-msb</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.cli</groupId>
-            <artifactId>cli-plugins-onap-1.1-features-aai</artifactId>
+            <artifactId>cli-plugins-onap-amsterdam-features-aai</artifactId>
             <version>${project.version}</version>
-        </dependency>                
+        </dependency>
   </dependencies>
 <!--   <build>
         <plugins>
diff --git a/validate/validation/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml b/validate/validation/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml
index 51d4fca3..5138cefe 100644
--- a/validate/validation/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml
+++ b/validate/validation/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml
@@ -1,7 +1,7 @@
 open_cli_sample_version: 1.0
 
 name: customer-create
-version: onap-1.1
+version: onap-amsterdam
 samples:
   sample1:
     name: Create a customer