12 files changed, 38 insertions, 38 deletions
diff --git a/interface-definitions/include/ospf/ospf-authentication.xml.i b/interface-definitions/include/ospf/authentication.xml.i
index 322c002e4..1e6050b97 100644
--- a/interface-definitions/include/ospf/ospf-authentication.xml.i
+++ b/interface-definitions/include/ospf/authentication.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ospf/ospf-authentication.xml.i -->
+<!-- include start from ospf/authentication.xml.i -->
 <node name="authentication">
   <properties>
     <help>Authentication</help>
diff --git a/interface-definitions/include/ospf/ospf-distance-global.xml.i b/interface-definitions/include/ospf/distance-global.xml.i
index 08cd76cba..31809cb70 100644
--- a/interface-definitions/include/ospf/ospf-distance-global.xml.i
+++ b/interface-definitions/include/ospf/distance-global.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ospf/ospf-distance-global.xml.i -->
+<!-- include start from ospf/distance-global.xml.i -->
 <leafNode name="global">
   <properties>
     <help>Administrative distance</help>
diff --git a/interface-definitions/include/ospf/ospf-distance-per-protocol.xml.i b/interface-definitions/include/ospf/distance-per-protocol.xml.i
index d2c4b8b52..da3f16c06 100644
--- a/interface-definitions/include/ospf/ospf-distance-per-protocol.xml.i
+++ b/interface-definitions/include/ospf/distance-per-protocol.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ospf/ospf-distance-per-protocol.xml.i -->
+<!-- include start from ospf/distance-per-protocol.xml.i -->
 <leafNode name="external">
   <properties>
     <help>Distance for external routes</help>
diff --git a/interface-definitions/include/ospf/ospf-interface-common.xml.i b/interface-definitions/include/ospf/interface-common.xml.i
index 39e90482c..4b0aef380 100644
--- a/interface-definitions/include/ospf/ospf-interface-common.xml.i
+++ b/interface-definitions/include/ospf/interface-common.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ospf/ospf-interface-common.xml.i -->
+<!-- include start from ospf/interface-common.xml.i -->
 #include <include/bfd.xml.i>
 <leafNode name="cost">
   <properties>
diff --git a/interface-definitions/include/ospf/ospf-intervals.xml.i b/interface-definitions/include/ospf/intervals.xml.i
index fe220eceb..fad1a6305 100644
--- a/interface-definitions/include/ospf/ospf-intervals.xml.i
+++ b/interface-definitions/include/ospf/intervals.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ospf/ospf-intervals.xml.i -->
+<!-- include start from ospf/intervals.xml.i -->
 <leafNode name="dead-interval">
   <properties>
     <help>Interval after which a neighbor is declared dead (default: 40)</help>
diff --git a/interface-definitions/include/ospf/ospf-metric-type.xml.i b/interface-definitions/include/ospf/metric-type.xml.i
index 1e982c4bc..83dc24909 100644
--- a/interface-definitions/include/ospf/ospf-metric-type.xml.i
+++ b/interface-definitions/include/ospf/metric-type.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ospf/ospf-metric-type.xml.i -->
+<!-- include start from ospf/metric-type.xml.i -->
 <leafNode name="metric-type">
   <properties>
     <help>OSPF metric type for default routes (default: 2)</help>
diff --git a/interface-definitions/include/ospf/ospf-metric.xml.i b/interface-definitions/include/ospf/metric.xml.i
index 125aedea7..64b455b00 100644
--- a/interface-definitions/include/ospf/ospf-metric.xml.i
+++ b/interface-definitions/include/ospf/metric.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ospf/ospf-metric.xml.i -->
+<!-- include start from ospf/metric.xml.i -->
 <leafNode name="metric">
   <properties>
     <help>OSPF default metric</help>
diff --git a/interface-definitions/include/ospf/ospf-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index ef2b66f8b..6d7fe9d70 100644
--- a/interface-definitions/include/ospf/ospf-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ospf/ospf-common-config.xml.i -->
+<!-- include start from ospf/protocol-common-config.xml.i -->
 <tagNode name="access-list">
   <properties>
     <help>Access list to filter networks in routing updates</help>
@@ -269,8 +269,8 @@
         </constraint>
       </properties>
       <children>
-        #include <include/ospf/ospf-authentication.xml.i>
-        #include <include/ospf/ospf-intervals.xml.i>
+        #include <include/ospf/authentication.xml.i>
+        #include <include/ospf/intervals.xml.i>
       </children>
     </tagNode>
   </children>
@@ -311,8 +311,8 @@
             <valueless/>
           </properties>
         </leafNode>
-        #include <include/ospf/ospf-metric.xml.i>
-        #include <include/ospf/ospf-metric-type.xml.i>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
@@ -335,13 +335,13 @@
     <help>Administrative distance</help>
   </properties>
   <children>
-    #include <include/ospf/ospf-distance-global.xml.i>
+    #include <include/ospf/distance-global.xml.i>
     <node name="ospf">
       <properties>
         <help>OSPF administrative distance</help>
       </properties>
       <children>
-        #include <include/ospf/ospf-distance-per-protocol.xml.i>
+        #include <include/ospf/distance-per-protocol.xml.i>
       </children>
     </node>
   </children>
@@ -361,9 +361,9 @@
     </constraint>
   </properties>
   <children>
-    #include <include/ospf/ospf-authentication.xml.i>
-    #include <include/ospf/ospf-intervals.xml.i>
-    #include <include/ospf/ospf-interface-common.xml.i>
+    #include <include/ospf/authentication.xml.i>
+    #include <include/ospf/intervals.xml.i>
+    #include <include/ospf/interface-common.xml.i>
     <leafNode name="bandwidth">
       <properties>
         <help>Interface bandwidth (Mbit/s)</help>
@@ -586,7 +586,7 @@
         <valueless/>
       </properties>
     </leafNode>
-    #include <include/ospf/ospf-router-id.xml.i>
+    #include <include/ospf/router-id.xml.i>
   </children>
 </node>
 #include <include/routing-passive-interface-xml.i>
@@ -621,8 +621,8 @@
         <help>Redistribute BGP routes</help>
       </properties>
       <children>
-        #include <include/ospf/ospf-metric.xml.i>
-        #include <include/ospf/ospf-metric-type.xml.i>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
@@ -631,8 +631,8 @@
         <help>Redistribute connected routes</help>
       </properties>
       <children>
-        #include <include/ospf/ospf-metric.xml.i>
-        #include <include/ospf/ospf-metric-type.xml.i>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
@@ -641,8 +641,8 @@
         <help>Redistribute IS-IS routes</help>
       </properties>
       <children>
-        #include <include/ospf/ospf-metric.xml.i>
-        #include <include/ospf/ospf-metric-type.xml.i>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
@@ -651,8 +651,8 @@
         <help>Redistribute kernel routes</help>
       </properties>
       <children>
-        #include <include/ospf/ospf-metric.xml.i>
-        #include <include/ospf/ospf-metric-type.xml.i>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
@@ -661,8 +661,8 @@
         <help>Redistribute RIP routes</help>
       </properties>
       <children>
-        #include <include/ospf/ospf-metric.xml.i>
-        #include <include/ospf/ospf-metric-type.xml.i>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
@@ -671,8 +671,8 @@
         <help>Redistribute static routes</help>
       </properties>
       <children>
-        #include <include/ospf/ospf-metric.xml.i>
-        #include <include/ospf/ospf-metric-type.xml.i>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
         #include <include/route-map.xml.i>
       </children>
     </node>
diff --git a/interface-definitions/include/ospf/ospf-router-id.xml.i b/interface-definitions/include/ospf/router-id.xml.i
index 5dbb52a36..2512f78d7 100644
--- a/interface-definitions/include/ospf/ospf-router-id.xml.i
+++ b/interface-definitions/include/ospf/router-id.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from ospf/ospf-router-id.xml.i -->
+<!-- include start from ospf/router-id.xml.i -->
 <leafNode name="router-id">
   <properties>
     <help>Override the default router identifier</help>
diff --git a/interface-definitions/protocols-ospf.xml.in b/interface-definitions/protocols-ospf.xml.in
index 4431a1772..eae522893 100644
--- a/interface-definitions/protocols-ospf.xml.in
+++ b/interface-definitions/protocols-ospf.xml.in
@@ -8,7 +8,7 @@
           <priority>620</priority>
         </properties>
         <children>
-          #include <include/ospf/ospf-common-config.xml.i>
+          #include <include/ospf/protocol-common-config.xml.i>
           #include <include/route-map.xml.i>
         </children>
       </node>
diff --git a/interface-definitions/protocols-ospfv3.xml.in b/interface-definitions/protocols-ospfv3.xml.in
index f4f403e93..df775233b 100644
--- a/interface-definitions/protocols-ospfv3.xml.in
+++ b/interface-definitions/protocols-ospfv3.xml.in
@@ -90,13 +90,13 @@
               <help>Administrative distance</help>
             </properties>
             <children>
-              #include <include/ospf/ospf-distance-global.xml.i>
+              #include <include/ospf/distance-global.xml.i>
               <node name="ospfv3">
                 <properties>
                   <help>OSPFv3 administrative distance</help>
                 </properties>
                 <children>
-                  #include <include/ospf/ospf-distance-per-protocol.xml.i>
+                  #include <include/ospf/distance-per-protocol.xml.i>
                 </children>
               </node>
             </children>
@@ -116,8 +116,8 @@
               </constraint>
             </properties>
             <children>
-              #include <include/ospf/ospf-intervals.xml.i>
-              #include <include/ospf/ospf-interface-common.xml.i>
+              #include <include/ospf/intervals.xml.i>
+              #include <include/ospf/interface-common.xml.i>
               <leafNode name="ifmtu">
                 <properties>
                   <help>Interface MTU</help>
@@ -171,7 +171,7 @@
               <help>OSPFv3 specific parameters</help>
             </properties>
             <children>
-              #include <include/ospf/ospf-router-id.xml.i>
+              #include <include/ospf/router-id.xml.i>
             </children>
           </node>
           <node name="redistribute">
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 5b6cda29a..d66056db9 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -57,7 +57,7 @@
                   <priority>621</priority>
                 </properties>
                 <children>
-                  #include <include/ospf/ospf-common-config.xml.i>
+                  #include <include/ospf/protocol-common-config.xml.i>
                 </children>
               </node>
               <node name="static" owner="${vyos_conf_scripts_dir}/protocols_static.py $VAR(../../@)">