diff --git a/etsi_nfv_sol001_nsd_2_5_1_types.yaml b/etsi_nfv_sol001_nsd_types.yaml
similarity index 99%
rename from etsi_nfv_sol001_nsd_2_5_1_types.yaml
rename to etsi_nfv_sol001_nsd_types.yaml
index e332680882c14f546d7a7c49a34ee7660d21a965..c140f28595814f5f22e8afe113aa8814804fe9aa 100644
--- a/etsi_nfv_sol001_nsd_2_5_1_types.yaml
+++ b/etsi_nfv_sol001_nsd_types.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2
 description: ETSI NFV SOL 001 nsd types definitions version 2.5.1
 
 imports:
-  - etsi_nfv_sol001_vnfd_2_5_1_types.yaml
+  - etsi_nfv_sol001_vnfd_types.yaml
 
 data_types:
   tosca.datatypes.nfv.ServiceAvailability:
diff --git a/etsi_nfv_sol001_pnfd_2_5_1_types.yaml b/etsi_nfv_sol001_pnfd_types.yaml
similarity index 99%
rename from etsi_nfv_sol001_pnfd_2_5_1_types.yaml
rename to etsi_nfv_sol001_pnfd_types.yaml
index f05d273a1db2e3af1d8836a61471f767c0c2f7b9..9ab46092de77a21e549637cae0be14e014c72fb6 100644
--- a/etsi_nfv_sol001_pnfd_2_5_1_types.yaml
+++ b/etsi_nfv_sol001_pnfd_types.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_yaml_1_2
 description: ETSI NFV SOL 001 pnfd types definitions version 2.5.1
 
 imports:
-  - etsi_nfv_sol001_vnfd_2_5_1_types.yaml
+  - etsi_nfv_sol001_vnfd_types.yaml
 
 data_types:  
   tosca.datatypes.nfv.L2AddressData:
diff --git a/etsi_nfv_sol001_vnfd_2_5_1_types.yaml b/etsi_nfv_sol001_vnfd_types.yaml
similarity index 100%
rename from etsi_nfv_sol001_vnfd_2_5_1_types.yaml
rename to etsi_nfv_sol001_vnfd_types.yaml