diff --git a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
index f2f3ff62e8986eaec6182215f519810f07887c5c..13019dd014f32133fd59621485737fbad5157f4b 100644
--- a/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
+++ b/src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
@@ -23,7 +23,7 @@ servers:
   - url: https://127.0.0.1/callback/v1
 
 paths:
-  /URI-is-provided-by-the-client-when-creating-the-subscription_AlarmNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-AlarmNotification:
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
@@ -76,7 +76,7 @@ paths:
         "503":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/503
 
-  /URI-is-provided-by-the-client-when-creating-the-subscription_AlarmClearedNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-AlarmClearedNotification:
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
@@ -129,7 +129,7 @@ paths:
         "503":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/503
 
-  /URI-is-provided-by-the-client-when-creating-the-subscription_AlarmListRebuiltNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-AlarmListRebuiltNotification:
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
diff --git a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
index 4e8aa6bc810c7588b349a77d4944334f280f1b8f..03adbc7b6cc4f7bf34611033f2b33d80fa6fe32c 100644
--- a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
+++ b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml
@@ -26,7 +26,7 @@ servers:
   - url: https://127.0.0.1/callback/v1
 
 paths:
-  '/URI-is-provided-by-the-client-when-creating-the-subscription_VnfIndicatorValueChangeNotification':
+  '/URI_is_provided_by_the_client_when_creating_the_subscription-VnfIndicatorValueChangeNotification':
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
@@ -83,7 +83,7 @@ paths:
         "503":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/503
 
-  '/URI-is-provided-by-the-client-when-creating-the-subscription_SupportedIndicatorsChangeNotification':
+  '/URI_is_provided_by_the_client_when_creating_the_subscription-SupportedIndicatorsChangeNotification':
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
diff --git a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
index b84db5bb94d7ac4fadbc812e095f23ca5d748369..413fff580dd79f9260bcca551b267a1c15ae7deb 100644
--- a/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
+++ b/src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
@@ -24,7 +24,7 @@ servers:
   - url: https://127.0.0.1/callback/v1
 
 paths:
-  /URI-is-provided-by-the-client-when-creating-the-subscription_VnfLcmOperationOccurrenceNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-VnfLcmOperationOccurrenceNotification:
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
@@ -77,7 +77,7 @@ paths:
         "503":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/503
 
-  /URI-is-provided-by-the-client-when-creating-the-subscription_VnfIdentifierCreationNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-VnfIdentifierCreationNotification:
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
@@ -130,7 +130,7 @@ paths:
         "503":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/503
 
-  /URI-is-provided-by-the-client-when-creating-the-subscription_VnfIdentifierDeletionNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-VnfIdentifierDeletionNotification:
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
diff --git a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
index f176a80b7be0e3332f181bcff0ff63423c67ea27..bceab6ddb01bebfc3dcb6fd9e8705c5aea9a4704 100644
--- a/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
+++ b/src/SOL002/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
@@ -24,7 +24,7 @@ servers:
   - url: https://127.0.0.1/callback/v1
 
 paths:
-  '/URI-is-provided-by-the-client-when-creating-the-subscription_PerformanceInformationAvailableNotification':
+  '/URI_is_provided_by_the_client_when_creating_the_subscription-PerformanceInformationAvailableNotification':
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
@@ -77,7 +77,7 @@ paths:
         "503":
           $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/503
 
-  /URI-is-provided-by-the-client-when-creating-the-subscription_ThresholdCrossedNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-ThresholdCrossedNotification:
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
diff --git a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
index d723b308230a81ab8bb52b3e1e2706a4b9e9ddde..b2752a0fa089655036bea4e0757b6a9f2feb5ab3 100644
--- a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
+++ b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml
@@ -29,7 +29,7 @@ paths:
   ###############################################################################
   # Notification endpoint AlarmNotification                                     #
   ###############################################################################
-  /URI-is-provided-by-the-client-when-creating-the-subscription-AlarmNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-AlarmNotification:
     #SOL003 location: 7.4.6
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
@@ -90,7 +90,7 @@ paths:
   ###############################################################################
   # Notification endpoint AlarmClearedNotification                              #
   ###############################################################################
-  /URI-is-provided-by-the-client-when-creating-the-subscription-AlarmClearedNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-AlarmClearedNotification:
     #SOL003 location: 7.4.6
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
@@ -151,7 +151,7 @@ paths:
   ###############################################################################
   # Notification endpoint AlarmListRebuiltNotification                          #
   ###############################################################################
-  /URI-is-provided-by-the-client-when-creating-the-subscription-AlarmListRebuiltNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-AlarmListRebuiltNotification:
     #SOL003 location: 7.4.6
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
diff --git a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml
index eeed2be7f19dcdf35bdc3cfc7962f5d90e1f4284..cbf33e42b8231a087fa0ffa9cc7f1e8f18ddfcb5 100644
--- a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml
+++ b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml
@@ -29,7 +29,7 @@ paths:
   ###############################################################################
   # Notification endpoint VnfIndicatorValueChangeNotification                   #
   ###############################################################################
-  /URI-is-provided-by-the-client-when-creating-the-subscription-VnfIndicatorValueChangeNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-VnfIndicatorValueChangeNotification:
     #SOL003 location: 8.4.7
     post:
       description: |
diff --git a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
index 0466ce236b524b2db57451516adc2862fc76ecd5..000c5d0d0be76ca5c95238f81357c384f4bb12c6 100644
--- a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
+++ b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml
@@ -29,7 +29,7 @@ paths:
   ###############################################################################
   # Notification endpoint VnfLcmOperationOccurrenceNotification                 #
   ###############################################################################
-  /URI-is-provided-by-the-client-when-creating-the-subscription-VnfLcmOperationOccurrenceNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-VnfLcmOperationOccurrenceNotification:
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
@@ -87,7 +87,7 @@ paths:
   ###############################################################################
   # Notification endpoint VnfIdentifierCreationNotification                     #
   ###############################################################################
-  /URI-is-provided-by-the-client-when-creating-the-subscription-VnfIdentifierCreationNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-VnfIdentifierCreationNotification:
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
@@ -145,7 +145,7 @@ paths:
   ###############################################################################
   # Notification endpoint VnfIdentifierDeletionNotification                     #
   ###############################################################################
-  /URI-is-provided-by-the-client-when-creating-the-subscription-VnfIdentifierDeletionNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-VnfIdentifierDeletionNotification:
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
diff --git a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
index acc0f46073648b6c480aaa4f3167303effb45165..a37d18dd67d5d07c2238c12d8c4d1b72bab07f3a 100644
--- a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
+++ b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml
@@ -29,7 +29,7 @@ paths:
   ###############################################################################
   # Notification endpoint VnfPackageOnboardingNotification                      #
   ###############################################################################
-  /URI-is-provided-by-the-client-when-creating-the-subscription-VnfPackageOnboardingNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-VnfPackageOnboardingNotification:
     #SOL003 location: 10.4.9
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
@@ -90,7 +90,7 @@ paths:
   ###############################################################################
   # Notification endpoint VnfPackageChangeNotification                          #
   ###############################################################################
-  /URI-is-provided-by-the-client-when-creating-the-subscription-VnfPackageChangeNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-VnfPackageChangeNotification:
     #SOL003 location: 10.4.9
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
diff --git a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
index a0f6c7ac122c03f90ae9b543ec69d6a977995a40..d756a944292443517471aff6f6e6f3da3ad0ac01 100644
--- a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
+++ b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml
@@ -29,7 +29,7 @@ paths:
   ###############################################################################
   # Notification endpoint PerformanceInformationAvailableNotification           #
   ###############################################################################
-  /URI-is-provided-by-the-client-when-creating-the-subscription-PerformanceInformationAvailableNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-PerformanceInformationAvailableNotification:
     #SOL003 location: 6.4.9
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
@@ -91,7 +91,7 @@ paths:
   ###############################################################################
   # Notification endpoint ThresholdCrossedNotification                          #
   ###############################################################################
-  /URI-is-provided-by-the-client-when-creating-the-subscription-ThresholdCrossedNotification:
+  /URI_is_provided_by_the_client_when_creating_the_subscription-ThresholdCrossedNotification:
     #SOL003 location: 6.4.9
     parameters:
       - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization