HONEYCOMB-130: Rename infra packages(remove vpp/v3po)

Change-Id: Ic5b90e397e3743623d01b206bc60bc5c7df6b981
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

5 files changed, 59 insertions, 59 deletions

diff --git a/infra/impl/src/main/config/context-datatree-config.xml b/infra/impl/src/main/config/context-datatree-config.xml
index 313f0ebe6..4d43a40cf 100644
--- a/infra/impl/src/main/config/context-datatree-config.xml
+++ b/infra/impl/src/main/config/context-datatree-config.xml
@@ -19,9 +19,9 @@
 
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&amp;revision=2014-12-10</capability>
+      <capability>urn:opendaylight:params:xml:ns:yang:honeycomb:impl?module=honeycomb-impl&amp;revision=2014-12-10</capability>
       <capability>urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&amp;revision=2016-04-06</capability>
-      <capability>urn:honeycomb:params:xml:ns:yang:vpp:data:init?module=vpp-cfg-init&amp;revision=2016-04-07</capability>
+      <capability>urn:honeycomb:params:xml:ns:yang:data:init?module=cfg-init&amp;revision=2016-04-07</capability>
       <capability>urn:honeycomb:params:xml:ns:yang:data:api?module=data-api&amp;revision=2016-04-11</capability>
       <capability>urn:honeycomb:params:xml:ns:yang:data:impl?module=data-impl&amp;revision=2016-04-11</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
@@ -60,7 +60,7 @@
 
         <!-- DOM Data Broker for context data -->
         <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:honeycomb-context-dom-data-broker</type>
+          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:honeycomb-context-dom-data-broker</type>
           <name>honeycomb-context-data-broker</name>
           <!-- With persistence -->
           <context-data-tree>
diff --git a/infra/impl/src/main/config/default-config.xml b/infra/impl/src/main/config/default-config.xml
index c817a5db3..9e63917cd 100644
--- a/infra/impl/src/main/config/default-config.xml
+++ b/infra/impl/src/main/config/default-config.xml
@@ -16,7 +16,7 @@
 -->
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&amp;revision=2014-12-10</capability>
+      <capability>urn:opendaylight:params:xml:ns:yang:honeycomb:impl?module=honeycomb-impl&amp;revision=2014-12-10</capability>
       <capability>urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&amp;revision=2016-04-06</capability>
       <capability>urn:honeycomb:params:xml:ns:yang:data:api?module=data-api&amp;revision=2016-04-11</capability>
       <capability>urn:honeycomb:params:xml:ns:yang:data:impl?module=data-impl&amp;revision=2016-04-11</capability>
@@ -116,7 +116,7 @@
 
         <!-- DOM data broker which provides transaction functionality for HC using BI format-->
         <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:honeycomb-dom-data-broker</type>
+          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:honeycomb-dom-data-broker</type>
           <name>honeycomb-dom-data-broker</name>
           <config-data-tree>
             <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:honeycomb-modifiable-data-tree</type>
@@ -150,8 +150,8 @@
         </module>
 
         <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:v3po</type>
-          <name>v3po-default</name>
+          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:honeycomb</type>
+          <name>honeycomb-default</name>
           <dom-broker>
             <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">prefix:dom-broker-osgi-registry</type>
             <name>dom-broker</name>
@@ -242,8 +242,8 @@
             dom:dom-broker-osgi-registry
           </type>
           <instance>
-            <name>vpp-dom-broker</name>
-            <provider>/modules/module[type='v3po'][name='v3po-default']</provider>
+            <name>honeycomb-dom-broker</name>
+            <provider>/modules/module[type='honeycomb'][name='honeycomb-default']</provider>
           </instance>
         </service>
 
diff --git a/infra/impl/src/main/config/initializer-config.xml b/infra/impl/src/main/config/initializer-config.xml
index f46069340..0b87e42dc 100644
--- a/infra/impl/src/main/config/initializer-config.xml
+++ b/infra/impl/src/main/config/initializer-config.xml
@@ -19,9 +19,9 @@
 
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&amp;revision=2014-12-10</capability>
+      <capability>urn:opendaylight:params:xml:ns:yang:honeycomb:impl?module=honeycomb-impl&amp;revision=2014-12-10</capability>
       <capability>urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&amp;revision=2016-04-06</capability>
-      <capability>urn:honeycomb:params:xml:ns:yang:vpp:data:init?module=vpp-cfg-init&amp;revision=2016-04-07</capability>
+      <capability>urn:honeycomb:params:xml:ns:yang:data:init?module=cfg-init&amp;revision=2016-04-07</capability>
       <capability>urn:honeycomb:params:xml:ns:yang:data:api?module=data-api&amp;revision=2016-04-11</capability>
       <capability>urn:honeycomb:params:xml:ns:yang:data:impl?module=data-impl&amp;revision=2016-04-11</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
@@ -60,7 +60,7 @@
         </module>
         <!-- DOM data broker for config initialization -->
         <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:honeycomb-dom-data-broker</type>
+          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:honeycomb-dom-data-broker</type>
           <name>cfg-init-dom-data-broker</name>
           <config-data-tree>
             <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:honeycomb-modifiable-data-tree</type>
@@ -92,7 +92,7 @@
         </module>
 
         <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:persisted-file-initializer</type>
+          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:persisted-file-initializer</type>
           <name>persisted-context-initializer</name>
           <dom-data-broker>
             <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
@@ -107,7 +107,7 @@
           <datastore-type>oper</datastore-type>
         </module>
         <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:persisted-file-initializer</type>
+          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:persisted-file-initializer</type>
           <name>persisted-config-initializer</name>
           <dom-data-broker>
             <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">prefix:dom-async-data-broker</type>
@@ -123,14 +123,14 @@
         </module>
 
         <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer-registry</type>
+          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer-registry</type>
           <name>initializer-registry</name>
           <persisted-context-initializer>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
+            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type>
             <name>persisted-context-initializer</name>
           </persisted-context-initializer>
           <persisted-config-initializer>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
+            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type>
             <name>persisted-config-initializer</name>
           </persisted-config-initializer>
         </module>
@@ -170,7 +170,7 @@
         </service>
 
         <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type>
+          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type>
           <instance>
             <name>persisted-context-initializer</name>
             <provider>/modules/module[type='persisted-file-initializer'][name='persisted-context-initializer']
diff --git a/infra/impl/src/main/config/netconf-north-config.xml b/infra/impl/src/main/config/netconf-north-config.xml
index 35bd5ff04..8e6f17019 100644
--- a/infra/impl/src/main/config/netconf-north-config.xml
+++ b/infra/impl/src/main/config/netconf-north-config.xml
@@ -83,7 +83,7 @@
                 </module>
                 <module>
                     <!--binding-broker-osgi-registry-->
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:binding-broker-netconf</type>
+                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:binding-broker-netconf</type>
                     <name>binding-broker-netconf</name>
                     <netconf-binding-broker>
                         <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
@@ -96,7 +96,7 @@
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper">
                         prefix:netconf-mdsal-mapper
                     </type>
-                    <name>netconf-vpp-mapper</name>
+                    <name>netconf-honeycomb-mapper</name>
                     <root-schema-service>
                         <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service
                         </type>
@@ -112,13 +112,13 @@
                         <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">
                             dom:dom-broker-osgi-registry
                         </type>
-                        <name>vpp-dom-broker</name>
+                        <name>honeycomb-dom-broker</name>
                     </dom-broker>
                     <mapper-aggregator xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper">
                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
                             prefix:netconf-mapper-registry
                         </type>
-                        <name>vpp-mapper-aggregator-registry</name>
+                        <name>honeycomb-mapper-aggregator-registry</name>
                     </mapper-aggregator>
                 </module>
 
@@ -126,19 +126,19 @@
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
                         prefix:netconf-server-dispatcher-impl
                     </type>
-                    <name>netconf-vpp-server-dispatcher</name>
+                    <name>netconf-honeycomb-server-dispatcher</name>
                     <mappers xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
                         <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
                             dom:netconf-northbound-mapper
                         </type>
-                        <name>vpp-mapper-aggregator</name>
+                        <name>honeycomb-mapper-aggregator</name>
                     </mappers>
                     <server-monitor
                             xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound">
                             prefix:netconf-server-monitoring
                         </type>
-                        <name>vpp-server-monitor</name>
+                        <name>honeycomb-server-monitor</name>
                     </server-monitor>
                     <boss-thread-group
                             xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
@@ -165,12 +165,12 @@
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring">
                         prefix:netconf-mdsal-monitoring-mapper
                     </type>
-                    <name>netconf-vpp-monitoring-mapper</name>
+                    <name>netconf-honeycomb-monitoring-mapper</name>
                     <server-monitoring xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring">
                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound">
                             prefix:netconf-server-monitoring
                         </type>
-                        <name>vpp-server-monitor</name>
+                        <name>honeycomb-server-monitor</name>
                     </server-monitoring>
                     <binding-aware-broker
                             xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring">
@@ -183,7 +183,7 @@
                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
                             prefix:netconf-mapper-registry
                         </type>
-                        <name>vpp-mapper-aggregator-registry</name>
+                        <name>honeycomb-mapper-aggregator-registry</name>
                     </aggregator>
                 </module>
 
@@ -191,19 +191,19 @@
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
                         prefix:netconf-mapper-aggregator
                     </type>
-                    <name>vpp-mapper-aggregator</name>
+                    <name>honeycomb-mapper-aggregator</name>
                 </module>
 
                 <module>
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
                         prefix:netconf-server-monitoring-impl
                     </type>
-                    <name>vpp-server-monitor</name>
+                    <name>honeycomb-server-monitor</name>
                     <aggregator xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl">
                         <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
                             dom:netconf-northbound-mapper
                         </type>
-                        <name>vpp-mapper-aggregator</name>
+                        <name>honeycomb-mapper-aggregator</name>
                     </aggregator>
                 </module>
 
@@ -218,7 +218,7 @@
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">
                         prefix:netconf-northbound-ssh
                     </type>
-                    <name>netconf-vpp-ssh-server</name>
+                    <name>netconf-honeycomb-ssh-server</name>
 
                     <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">2830</port>
                     <event-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">
@@ -243,7 +243,7 @@
                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound">
                             prefix:netconf-server-dispatcher
                         </type>
-                        <name>netconf-vpp-server-dispatcher</name>
+                        <name>netconf-honeycomb-server-dispatcher</name>
                     </dispatcher>
                     <auth-provider xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">
                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:auth">
@@ -257,14 +257,14 @@
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification:impl">
                         prefix:netconf-notification-manager
                     </type>
-                    <name>vpp-netconf-notification-manager</name>
+                    <name>honeycomb-netconf-notification-manager</name>
                 </module>
 
                 <module>
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification">
                         prefix:netconf-mdsal-notification-mapper
                     </type>
-                    <name>netconf-vpp-notification-mapper</name>
+                    <name>netconf-honeycomb-notification-mapper</name>
                     <!--This is used to listen to netconf-state/capabilities changes to send out notifications-->
                     <data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification">
                         <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
@@ -284,20 +284,20 @@
                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper">
                             prefix:netconf-mapper-registry
                         </type>
-                        <name>vpp-mapper-aggregator-registry</name>
+                        <name>honeycomb-mapper-aggregator-registry</name>
                     </aggregator>
                     <notification-registry
                             xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification">
                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification">
                             prefix:netconf-notification-registry
                         </type>
-                        <name>vpp-netconf-notification-manager</name>
+                        <name>honeycomb-netconf-notification-manager</name>
                     </notification-registry>
                     <notification-collector>
                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification">
                             prefix:netconf-notification-collector
                         </type>
-                        <name>vpp-netconf-notification-manager</name>
+                        <name>honeycomb-netconf-notification-manager</name>
                     </notification-collector>
                 </module>
 
@@ -307,12 +307,12 @@
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp">
                         prefix:netconf-northbound-tcp
                     </type>
-                    <name>netconf-vpp-tcp-server</name>
+                    <name>netconf-honeycomb-tcp-server</name>
                     <dispatcher xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp">
                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound">
                             prefix:netconf-server-dispatcher
                         </type>
-                        <name>netconf-vpp-server-dispatcher</name>
+                        <name>netconf-honeycomb-server-dispatcher</name>
                     </dispatcher>
                     <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp">7777</port>
                 </module>
@@ -321,7 +321,7 @@
                 However netconf is wired to our reader registry, so we need to delegate the reads of netconf-monitoring
                 through our readers to the dedicated DS-->
                 <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:netconf-monitoring-reader</type>
+                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:netconf-monitoring-reader</type>
                     <name>netconf-monitoring-reader</name>
                     <netconf-monitoring-binding-broker>
                         <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
@@ -394,8 +394,8 @@
                        prefix:netconf-server-monitoring
                    </type>
                    <instance>
-                       <name>vpp-server-monitor</name>
-                       <provider>/modules/module[type='netconf-server-monitoring-impl'][name='vpp-server-monitor']
+                       <name>honeycomb-server-monitor</name>
+                       <provider>/modules/module[type='netconf-server-monitoring-impl'][name='honeycomb-server-monitor']
                        </provider>
                    </instance>
                </service>
@@ -404,8 +404,8 @@
                        prefix:netconf-northbound-mapper
                    </type>
                    <instance>
-                       <name>netconf-vpp-mapper</name>
-                       <provider>/modules/module[type='netconf-mdsal-mapper'][name='netconf-vpp-mapper']</provider>
+                       <name>netconf-honeycomb-mapper</name>
+                       <provider>/modules/module[type='netconf-mdsal-mapper'][name='netconf-honeycomb-mapper']</provider>
                    </instance>
                </service>
                <service>
@@ -413,8 +413,8 @@
                        prefix:netconf-northbound-mapper
                    </type>
                    <instance>
-                       <name>vpp-mapper-aggregator</name>
-                       <provider>/modules/module[type='netconf-mapper-aggregator'][name='vpp-mapper-aggregator']</provider>
+                       <name>honeycomb-mapper-aggregator</name>
+                       <provider>/modules/module[type='netconf-mapper-aggregator'][name='honeycomb-mapper-aggregator']</provider>
                    </instance>
                </service>
                <service>
@@ -422,8 +422,8 @@
                        prefix:netconf-mapper-registry
                    </type>
                    <instance>
-                       <name>vpp-mapper-aggregator-registry</name>
-                       <provider>/modules/module[type='netconf-mapper-aggregator'][name='vpp-mapper-aggregator']</provider>
+                       <name>honeycomb-mapper-aggregator-registry</name>
+                       <provider>/modules/module[type='netconf-mapper-aggregator'][name='honeycomb-mapper-aggregator']</provider>
                    </instance>
                </service>
                <service>
@@ -431,9 +431,9 @@
                        prefix:netconf-server-dispatcher
                    </type>
                    <instance>
-                       <name>netconf-vpp-server-dispatcher</name>
+                       <name>netconf-honeycomb-server-dispatcher</name>
                        <provider>
-                           /modules/module[type='netconf-server-dispatcher-impl'][name='netconf-vpp-server-dispatcher']
+                           /modules/module[type='netconf-server-dispatcher-impl'][name='netconf-honeycomb-server-dispatcher']
                        </provider>
                    </instance>
                </service>
@@ -442,9 +442,9 @@
                        prefix:netconf-northbound-mapper
                    </type>
                    <instance>
-                       <name>netconf-vpp-notification-mapper</name>
+                       <name>netconf-honeycomb-notification-mapper</name>
                        <provider>
-                           /modules/module[type='netconf-mdsal-notification-mapper'][name='netconf-vpp-notification-mapper']
+                           /modules/module[type='netconf-mdsal-notification-mapper'][name='netconf-honeycomb-notification-mapper']
                        </provider>
                    </instance>
                </service>
@@ -453,9 +453,9 @@
                        prefix:netconf-notification-collector
                    </type>
                    <instance>
-                       <name>vpp-netconf-notification-manager</name>
+                       <name>honeycomb-netconf-notification-manager</name>
                        <provider>
-                           /modules/module[type='netconf-notification-manager'][name='vpp-netconf-notification-manager']
+                           /modules/module[type='netconf-notification-manager'][name='honeycomb-netconf-notification-manager']
                        </provider>
                    </instance>
                </service>
@@ -464,9 +464,9 @@
                        prefix:netconf-notification-registry
                    </type>
                    <instance>
-                       <name>vpp-netconf-notification-manager</name>
+                       <name>honeycomb-netconf-notification-manager</name>
                        <provider>
-                           /modules/module[type='netconf-notification-manager'][name='vpp-netconf-notification-manager']
+                           /modules/module[type='netconf-notification-manager'][name='honeycomb-netconf-notification-manager']
                        </provider>
                    </instance>
                </service>
@@ -475,7 +475,7 @@
        </data>
    </configuration>
    <required-capabilities>
-       <capability>urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&amp;revision=2014-12-10</capability>
+       <capability>urn:opendaylight:params:xml:ns:yang:honeycomb:impl?module=honeycomb-impl&amp;revision=2014-12-10</capability>
        <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
        <capability>urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper?module=netconf-mdsal-mapper&amp;revision=2015-01-14</capability>
        <capability>
diff --git a/infra/impl/src/main/config/restconf-north-config.xml b/infra/impl/src/main/config/restconf-north-config.xml
index ff2cdac18..00599b62c 100644
--- a/infra/impl/src/main/config/restconf-north-config.xml
+++ b/infra/impl/src/main/config/restconf-north-config.xml
@@ -24,7 +24,7 @@
                     <!-- Reconfiguring the default restconf northbound instance, to wire it just to honeycomb broker facade -->
                     <dom-broker>
                         <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
-                        <name>vpp-dom-broker</name>
+                        <name>honeycomb-dom-broker</name>
                     </dom-broker>
                 </module>
             </modules>