diff --git a/.gitmodules b/.gitmodules
index 5625aa190458d76d915eaabc3c80fff7d0510d86..a53f01aa07fbb015ca7e19fcbe473dbc4c1d1de6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,11 +8,11 @@
 	path = magma/hackfest_magma-agw-enb_vnfd/charms/magmagw/mod/charms.osm
 	url = https://github.com/charmed-osm/charms.osm
 [submodule "magma/hackfest_gateway_pnf/charms/vyos-config/mod/charms.osm"]
-	path = magma/hackfest_gateway_pnf/charms/vyos-config/mod/charms.osm
+	path = magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charms.osm
 	url = https://github.com/charmed-osm/charms.osm
 [submodule "magma/hackfest_gateway_pnf/charms/vyos-config/mod/operator"]
-	path = magma/hackfest_gateway_pnf/charms/vyos-config/mod/operator
+	path = magma/hackfest_gateway_vnfd/charms/vyos-config/mod/operator
 	url = https://github.com/canonical/operator
 [submodule "magma/hackfest_gateway_pnf/charms/vyos-config/mod/charm-helpers"]
-	path = magma/hackfest_gateway_pnf/charms/vyos-config/mod/charm-helpers
+	path = magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charm-helpers
 	url = https://github.com/juju/charm-helpers.git
diff --git a/magma/hackfest_gateway_pnf/charms/.DS_Store b/magma/hackfest_gateway_vnfd/charms/.DS_Store
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/.DS_Store
rename to magma/hackfest_gateway_vnfd/charms/.DS_Store
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/README.md b/magma/hackfest_gateway_vnfd/charms/vyos-config/README.md
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/README.md
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/README.md
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/actions.yaml b/magma/hackfest_gateway_vnfd/charms/vyos-config/actions.yaml
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/actions.yaml
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/actions.yaml
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/config.yaml b/magma/hackfest_gateway_vnfd/charms/vyos-config/config.yaml
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/config.yaml
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/config.yaml
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/hooks/install b/magma/hackfest_gateway_vnfd/charms/vyos-config/hooks/install
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/hooks/install
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/hooks/install
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/lib/charmhelpers b/magma/hackfest_gateway_vnfd/charms/vyos-config/lib/charmhelpers
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/lib/charmhelpers
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/lib/charmhelpers
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/lib/charms/osm b/magma/hackfest_gateway_vnfd/charms/vyos-config/lib/charms/osm
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/lib/charms/osm
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/lib/charms/osm
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/lib/ops b/magma/hackfest_gateway_vnfd/charms/vyos-config/lib/ops
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/lib/ops
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/lib/ops
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/metadata.yaml b/magma/hackfest_gateway_vnfd/charms/vyos-config/metadata.yaml
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/metadata.yaml
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/metadata.yaml
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/mod/charm-helpers b/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charm-helpers
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/mod/charm-helpers
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charm-helpers
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/mod/charms.osm b/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charms.osm
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/mod/charms.osm
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/mod/charms.osm
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/mod/operator b/magma/hackfest_gateway_vnfd/charms/vyos-config/mod/operator
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/mod/operator
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/mod/operator
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/playbooks/configure-remote.yaml b/magma/hackfest_gateway_vnfd/charms/vyos-config/playbooks/configure-remote.yaml
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/playbooks/configure-remote.yaml
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/playbooks/configure-remote.yaml
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/requirements.txt b/magma/hackfest_gateway_vnfd/charms/vyos-config/requirements.txt
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/requirements.txt
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/requirements.txt
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/src/charm.py b/magma/hackfest_gateway_vnfd/charms/vyos-config/src/charm.py
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/src/charm.py
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/src/charm.py
diff --git a/magma/hackfest_gateway_pnf/charms/vyos-config/src/proxy_cluster.py b/magma/hackfest_gateway_vnfd/charms/vyos-config/src/proxy_cluster.py
similarity index 100%
rename from magma/hackfest_gateway_pnf/charms/vyos-config/src/proxy_cluster.py
rename to magma/hackfest_gateway_vnfd/charms/vyos-config/src/proxy_cluster.py
diff --git a/magma/hackfest_gateway_pnf/hackfest_gateway_vnf.yaml b/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml
similarity index 90%
rename from magma/hackfest_gateway_pnf/hackfest_gateway_vnf.yaml
rename to magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml
index 7469abae4abdfc6ade4c2965f17e7756df2d476a..a8424fcf95d51155cc8cfdf1b4e06d732785c594 100644
--- a/magma/hackfest_gateway_pnf/hackfest_gateway_vnf.yaml
+++ b/magma/hackfest_gateway_vnfd/hackfest_gateway_vnfd.yaml
@@ -4,11 +4,11 @@ vnfd:vnfd-catalog:
         -   name: gateway_public
             type: VPORT
         description: Gateway PNF
-        id: hackfest_vyos_pnf
+        id: hackfest_gateway_vnfd
         mgmt-interface:
             cp: gateway_public
-        name: hackfest_vyos_pnf
-        short-name: hackfest_vyos_pnf
+        name: hackfest_gateway_vnfd
+        short-name: hackfest_gateway_vnfd
         vdu:
         -   description: gateway_pdu
             id: gateway_pdu
diff --git a/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml b/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml
index 3c1c00eac94ef4b7b1715f4b7f0e165d321d5298..3b0fd7ffa905dce6979fccfdb8b56e48f10be10a 100644
--- a/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml
+++ b/magma/hackfest_magma-agw-enb_nsd/magma-agw-enb_nsd.yaml
@@ -10,7 +10,7 @@ nsd:nsd-catalog:
         -   member-vnf-index: '1'
             vnfd-id-ref: hackfest_magma-agw-enb_vnfd
         -   member-vnf-index: '2'
-            vnfd-id-ref: hackfest_vyos_pnf
+            vnfd-id-ref: hackfest_gateway_vnfd
         connection-point:
         -   name: nsd_cp_mgmt
             vld-id-ref: mgmt
@@ -30,7 +30,7 @@ nsd:nsd-catalog:
                 vnfd-id-ref: hackfest_magma-agw-enb_vnfd
                 vnfd-connection-point-ref: srsLTE-mgmt
             -   member-vnf-index-ref: '2'
-                vnfd-id-ref: hackfest_vyos_pnf
+                vnfd-id-ref: hackfest_gateway_vnfd
                 vnfd-connection-point-ref: gateway_public
         -   id: sgi
             name: sgi
@@ -43,5 +43,5 @@ nsd:nsd-catalog:
                 vnfd-id-ref: hackfest_magma-agw-enb_vnfd
                 vnfd-connection-point-ref: agw-sgi
             -   member-vnf-index-ref: '2'
-                vnfd-id-ref: hackfest_vyos_pnf
+                vnfd-id-ref: hackfest_gateway_vnfd
                 vnfd-connection-point-ref: gateway_public
diff --git a/magma/vnf_price_list.yaml b/magma/vnf_price_list.yaml
index 6fb0cf946be327a491ee610df0f3c76241a536df..389c1b207d8609b504a065a59173bb77ea94222a 100644
--- a/magma/vnf_price_list.yaml
+++ b/magma/vnf_price_list.yaml
@@ -6,11 +6,11 @@
     - vim_url: http://172.21.7.5:5000/v3
       vim_name: whitecloud_lowcost
       price: 1
-- vnfd: hackfest_vyos_pnf
+- vnfd: hackfest_gateway_vnfd
   prices:
     - vim_url: http://172.21.247.1:5000/v3
       vim_name: whitecloud_highcost
       price: 5
     - vim_url: http://172.21.7.5:5000/v3
       vim_name: whitecloud_lowcost
-      price: 1
\ No newline at end of file
+      price: 1