diff --git a/src/nsd/VyOS_ns/VyOS_nsd.yaml b/src/nsd/VyOS_ns/VyOS_nsd.yaml
index 041817e..3344baa 100644
--- a/src/nsd/VyOS_ns/VyOS_nsd.yaml
+++ b/src/nsd/VyOS_ns/VyOS_nsd.yaml
@@ -11,6 +11,7 @@
         vld:
         -   id: data
             name: data
+            short-name: data
             type: ELAN
             provider-network:
                 overlay-type: VLAN
@@ -20,6 +21,7 @@
                 vnfd-id-ref: VyOS
         -   id: management
             name: management
+            short-name: management
             type: ELAN
             provider-network:
                 overlay-type: VLAN
diff --git a/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml b/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
index 27a1197..9283995 100644
--- a/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
+++ b/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
@@ -11,6 +11,7 @@
         vld:
         -   id: data
             name: data
+            short-name: data
             type: ELAN
             provider-network:
                 overlay-type: VLAN
@@ -22,6 +23,7 @@
                 vnfd-id-ref: IMS-ALLIN1_2p
         -   id: management
             name: management
+            short-name: management
             type: ELAN
             provider-network:
                 overlay-type: VLAN
diff --git a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
index 2ff7032..af6a4a3 100644
--- a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
+++ b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
@@ -7,38 +7,38 @@
         logo: osm_2x.png
         mgmt-interface:
             vdu-id: VyOS-VM
-            vnf-configuration:
-                config-attributes:
-                    config-delay: '0'
-                    config-priority: '1'
-                config-primitive:
-                -   name: config
-                    parameter:
-                    -   name: user
-                        data-type: STRING
-                        mandatory: 'true'
-                        default-value: vyos
-                    -   name: pass
-                        data-type: string
-                        mandatory: 'true'
-                        default-value: vyos
-                -   name: ping
-                    parameter:
-                    -   name: destination
-                        data-type: STRING
-                        mandatory: 'true'
-                    -   name: count
-                        data-type: INTEGER
-                        mandatory: 'false'
-                        default-value: 5
-                initial-config-primitive:
-                -   name: config
-                    parameter:
-                    -   name: hostname
-                        value: <rw_mgmt_ip>
-                    seq: '1'
-                juju:
-                    charm: VyOS-proxy
+        vnf-configuration:
+            config-attributes:
+                config-delay: '0'
+                config-priority: '1'
+            config-primitive:
+            -   name: config
+                parameter:
+                -   name: user
+                    data-type: STRING
+                    mandatory: 'true'
+                    default-value: vyos
+                -   name: pass
+                    data-type: string
+                    mandatory: 'true'
+                    default-value: vyos
+            -   name: ping
+                parameter:
+                -   name: destination
+                    data-type: STRING
+                    mandatory: 'true'
+                -   name: count
+                    data-type: INTEGER
+                    mandatory: 'false'
+                    default-value: 5
+            initial-config-primitive:
+            -   name: config
+                parameter:
+                -   name: hostname
+                    value: <rw_mgmt_ip>
+                seq: '1'
+            juju:
+                charm: VyOS-proxy
         connection-point:
         -   name: eth0
             type: VPORT
diff --git a/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml b/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
index b36941a..d02fc0b 100644
--- a/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
+++ b/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
@@ -7,43 +7,43 @@
         logo: metaswitch_2x.png
         mgmt-interface:
             vdu-id: IMS-ALLIN1_2p-VM
-            vnf-configuration:
-                config-attributes:
-                    config-delay: '0'
-                    config-priority: '1'
-                config-primitive:
-                -   name: config
-                    parameter:
-                    -   name: home_domain
-                        data-type: STRING
-                        mandatory: 'true'
-                        default-value: ims.com
-                    -   name: password
-                        data-type: string
-                        mandatory: 'true'
-                        name: password
-                        default-value: cw-aio
-                -   name: create-update-user
-                    parameter:
-                    -   name: number
-                        data-type: STRING
-                        mandatory: 'true'
-                    -   name: password
-                        data-type: STRING
-                        mandatory: 'true'
-                -   name: delete-user
-                    parameter:
-                    -   name: number
-                        data-type: STRING
-                        mandatory: 'true'
-                initial-config-primitive:
-                -   name: config
-                    parameter:
-                    -   name: proxied_ip
-                        value: <rw_mgmt_ip>
-                    seq: '1'
-                juju:
-                    charm: clearwater-aio-proxy
+        vnf-configuration:
+            config-attributes:
+                config-delay: '0'
+                config-priority: '1'
+            config-primitive:
+            -   name: config
+                parameter:
+                -   name: home_domain
+                    data-type: STRING
+                    mandatory: 'true'
+                    default-value: ims.com
+                -   name: password
+                    data-type: string
+                    mandatory: 'true'
+                    name: password
+                    default-value: cw-aio
+            -   name: create-update-user
+                parameter:
+                -   name: number
+                    data-type: STRING
+                    mandatory: 'true'
+                -   name: password
+                    data-type: STRING
+                    mandatory: 'true'
+            -   name: delete-user
+                parameter:
+                -   name: number
+                    data-type: STRING
+                    mandatory: 'true'
+            initial-config-primitive:
+            -   name: config
+                parameter:
+                -   name: proxied_ip
+                    value: <rw_mgmt_ip>
+                seq: '1'
+            juju:
+                charm: clearwater-aio-proxy
         connection-point:
         -   name: eth0
             type: VPORT