diff --git a/apps/bgprouter/app.xml b/apps/bgprouter/app.xml
index 35292f4..88b38df 100644
--- a/apps/bgprouter/app.xml
+++ b/apps/bgprouter/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.bgprouter" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.bgprouter" origin="Open Networking Foundation" version="${project.version}"
      category="Traffic Steering" url="http://onosproject.org" title="BGP Router App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}" apps="fibinstaller">
diff --git a/apps/castor/app.xml b/apps/castor/app.xml
index dd3c1ee..5e6a427 100644
--- a/apps/castor/app.xml
+++ b/apps/castor/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.castor" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.castor" origin="Open Networking Foundation" version="${project.version}"
      category="default" url="http://onosproject.org"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
diff --git a/apps/configsync-netconf/pom.xml b/apps/configsync-netconf/pom.xml
index 7a23711..4c91dd4 100644
--- a/apps/configsync-netconf/pom.xml
+++ b/apps/configsync-netconf/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <onos.version>${project.version}</onos.version>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.requires>org.onosproject.configsync, org.onosproject.yang, org.onosproject.netconf</onos.app.requires>
         <onos.app.category>Utility</onos.app.category>
         <onos.app.title>Dynamic Device Config device synchronizer for NETCONF</onos.app.title>
diff --git a/apps/configsync/pom.xml b/apps/configsync/pom.xml
index 1376461..6b8e75b 100644
--- a/apps/configsync/pom.xml
+++ b/apps/configsync/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <onos.version>${project.version}</onos.version>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.requires>org.onosproject.config</onos.app.requires>
         <onos.app.category>Utility</onos.app.category>
         <onos.app.title>Dynamic Device Config device synchronizer</onos.app.title>
diff --git a/apps/cpman/app/app.xml b/apps/cpman/app/app.xml
index 5375a41..0185280 100644
--- a/apps/cpman/app/app.xml
+++ b/apps/cpman/app/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.cpman" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.cpman" origin="Open Networking Foundation" version="${project.version}"
      category="Monitoring" url="http://onosproject.org" title="Control Plane Management App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}" apps="org.onosproject.openflow-message">
diff --git a/apps/dhcp/app/app.xml b/apps/dhcp/app/app.xml
index f7c7c44..3fe4eff 100644
--- a/apps/dhcp/app/app.xml
+++ b/apps/dhcp/app/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.dhcp" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.dhcp" origin="Open Networking Foundation" version="${project.version}"
      category="Utility" url="http://onosproject.org" title="DHCP App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
diff --git a/apps/dhcprelay/pom.xml b/apps/dhcprelay/pom.xml
index 565f69d..d0f54c7 100644
--- a/apps/dhcprelay/pom.xml
+++ b/apps/dhcprelay/pom.xml
@@ -34,7 +34,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <onos.app.name>org.onosproject.dhcprelay</onos.app.name>
         <onos.app.title>DHCP Relay Agent App</onos.app.title>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>default</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>DHCP Relay Agent Application.</onos.app.readme>
diff --git a/apps/learning-switch/pom.xml b/apps/learning-switch/pom.xml
index 8301ab0..c0527d3 100644
--- a/apps/learning-switch/pom.xml
+++ b/apps/learning-switch/pom.xml
@@ -34,7 +34,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <onos.app.name>org.onosproject.learningswitch</onos.app.name>
         <onos.app.title>Learning Switch</onos.app.title>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Tutorial</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Learning Switch Tutorial Implementation.</onos.app.readme>
diff --git a/apps/netconf/client/pom.xml b/apps/netconf/client/pom.xml
index eba0375..4cf9372 100644
--- a/apps/netconf/client/pom.xml
+++ b/apps/netconf/client/pom.xml
@@ -34,7 +34,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <onos.version>${project.version}</onos.version>
         <onos.app.name>org.onosproject.netconfsb</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.requires>org.onosproject.yang,org.onosproject.config,org.onosproject.netconf</onos.app.requires>
         <onos.app.category>Protocols</onos.app.category>
         <onos.app.title>NETCONF Device Configuration</onos.app.title>
diff --git a/apps/newoptical/pom.xml b/apps/newoptical/pom.xml
index b8a2c68..03a4284 100644
--- a/apps/newoptical/pom.xml
+++ b/apps/newoptical/pom.xml
@@ -35,7 +35,7 @@
         <onos.app.title>Packet/Optical Use-Case App</onos.app.title>
         <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>https://wiki.onosproject.org/display/ONOS/Packet+Optical+Convergence</onos.app.url>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.requires>
             org.onosproject.optical-model
         </onos.app.requires>
diff --git a/apps/openstacknetworking/app/app.xml b/apps/openstacknetworking/app/app.xml
index cb178ed..781a92c 100644
--- a/apps/openstacknetworking/app/app.xml
+++ b/apps/openstacknetworking/app/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.openstacknetworking" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.openstacknetworking" origin="Open Networking Foundation" version="${project.version}"
      category="Utility" url="https://wiki.onosproject.org/display/ONOS/SONA%3A+DC+Network+Virtualization"
      title="OpenStack Networking App" features="${project.artifactId}" apps="org.onosproject.openstacknode"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features">
diff --git a/apps/openstacknode/app/app.xml b/apps/openstacknode/app/app.xml
index 6ca312b..6b78b5e 100644
--- a/apps/openstacknode/app/app.xml
+++ b/apps/openstacknode/app/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.openstacknode" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.openstacknode" origin="Open Networking Foundation" version="${project.version}"
      category="Utility" url="https://wiki.onosproject.org/display/ONOS/SONA%3A+DC+Network+Virtualization"
      title="OpenStack Node App" features="${project.artifactId}"
      apps="org.onosproject.ovsdb-base,org.onosproject.drivers.ovsdb"
diff --git a/apps/optical-model/pom.xml b/apps/optical-model/pom.xml
index f073a0c..e5d31bd 100644
--- a/apps/optical-model/pom.xml
+++ b/apps/optical-model/pom.xml
@@ -31,7 +31,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.optical-model</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Optical</onos.app.category>
         <onos.app.title>Optical information model</onos.app.title>
         <onos.app.url>https://wiki.onosproject.org/x/C4m</onos.app.url>
diff --git a/apps/rabbitmq/app.xml b/apps/rabbitmq/app.xml
index 8bcd6b2..0039bd9 100644
--- a/apps/rabbitmq/app.xml
+++ b/apps/rabbitmq/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.rabbitmq" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.rabbitmq" origin="Open Networking Foundation" version="${project.version}"
      category="Traffic Steering" url="http://onosproject.org" title="Rabbit MQ App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
diff --git a/apps/route-service/app/app.xml b/apps/route-service/app/app.xml
index e01e0f8..3ed0537 100644
--- a/apps/route-service/app/app.xml
+++ b/apps/route-service/app/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.routeservice" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.routeservice" origin="Open Networking Foundation" version="${project.version}"
      category="Utility" url="http://onosproject.org" title="Route Service App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
diff --git a/apps/sdnip/app.xml b/apps/sdnip/app.xml
index 166c045..3911d3f 100644
--- a/apps/sdnip/app.xml
+++ b/apps/sdnip/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.sdnip" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.sdnip" origin="Open Networking Foundation" version="${project.version}"
      category="Traffic Steering" url="http://onosproject.org" title="SDN-IP App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}" apps="intentsynchronizer">
diff --git a/apps/simplefabric/app.xml b/apps/simplefabric/app.xml
index 1984e56..3898661 100644
--- a/apps/simplefabric/app.xml
+++ b/apps/simplefabric/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.simplefabric" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.simplefabric" origin="Open Networking Foundation" version="${project.version}"
      category="Traffic Steering" url="http://onosproject.org" title="Simple Leaf-Spine Network App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}" apps="org.onosproject.openflow-base,org.onosproject.lldpprovider,org.onosproject.hostprovider">
diff --git a/apps/vrouter/app.xml b/apps/vrouter/app.xml
index 30bfb0c..653abfc 100644
--- a/apps/vrouter/app.xml
+++ b/apps/vrouter/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.vrouter" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.vrouter" origin="Open Networking Foundation" version="${project.version}"
      category="Traffic Steering" url="http://onosproject.org" title="Virtual Router App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
diff --git a/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java b/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java
index b269751..0a839a9 100644
--- a/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java
@@ -250,7 +250,7 @@
 
         @Override
         public String manufacturer() {
-            return "On.Lab";
+            return "Open Networking Foundation";
         }
 
         @Override
diff --git a/core/store/dist/src/main/java/org/onosproject/store/serializers/custom/DistributedStoreSerializers.java b/core/store/dist/src/main/java/org/onosproject/store/serializers/custom/DistributedStoreSerializers.java
index 6390b0f..c24e99f 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/serializers/custom/DistributedStoreSerializers.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/serializers/custom/DistributedStoreSerializers.java
@@ -27,7 +27,7 @@
     public static final int STORE_CUSTOM_BEGIN = KryoNamespaces.BEGIN_USER_CUSTOM_ID + 10;
 
     /**
-     * KryoNamespace which can serialize ON.lab misc classes.
+     * KryoNamespace which can serialize ONF misc classes.
      */
     public static final KryoNamespace STORE_COMMON = KryoNamespace.newBuilder()
             .register(KryoNamespaces.API)
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index d383df0..90bb979 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -352,7 +352,7 @@
             .build("BASIC");
 
     /**
-     * KryoNamespace which can serialize ON.lab misc classes.
+     * KryoNamespace which can serialize ONF misc classes.
      */
     public static final int MISC_MAX_SIZE = 30;
 
diff --git a/drivers/bmv2/pom.xml b/drivers/bmv2/pom.xml
index 68391bf..191cde6 100644
--- a/drivers/bmv2/pom.xml
+++ b/drivers/bmv2/pom.xml
@@ -70,7 +70,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.bmv2</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.title>BMv2 Device Drivers</onos.app.title>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/ciena/pom.xml b/drivers/ciena/pom.xml
index fa4b404..53c195b 100644
--- a/drivers/ciena/pom.xml
+++ b/drivers/ciena/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.ciena</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.title>Ciena Device Drivers</onos.app.title>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/cisco/netconf/pom.xml b/drivers/cisco/netconf/pom.xml
index 177d09b..77373c7 100644
--- a/drivers/cisco/netconf/pom.xml
+++ b/drivers/cisco/netconf/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.cisco.netconf</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.title>Cisco NETCONF Device Drivers</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/cisco/rest/pom.xml b/drivers/cisco/rest/pom.xml
index 84c7cb1..3209013 100644
--- a/drivers/cisco/rest/pom.xml
+++ b/drivers/cisco/rest/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.cisco.rest</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.title>Cisco REST Device Drivers</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/corsa/pom.xml b/drivers/corsa/pom.xml
index 07af90d..d113fc1 100644
--- a/drivers/corsa/pom.xml
+++ b/drivers/corsa/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.corsa</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.title>Corsa Device Drivers</onos.app.title>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/default/pom.xml b/drivers/default/pom.xml
index dd649e7..e9709e7 100644
--- a/drivers/default/pom.xml
+++ b/drivers/default/pom.xml
@@ -31,7 +31,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.title>Default Device Drivers</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/default/src/main/resources/onos-drivers.xml b/drivers/default/src/main/resources/onos-drivers.xml
index 4ba788e..f4d928e 100644
--- a/drivers/default/src/main/resources/onos-drivers.xml
+++ b/drivers/default/src/main/resources/onos-drivers.xml
@@ -16,7 +16,7 @@
   -->
 <drivers>
     <driver name="default"
-            manufacturer="ON.Lab" hwVersion="0.0.1" swVersion="0.0.1">
+            manufacturer="Open Networking Foundation" hwVersion="0.0.1" swVersion="0.0.1">
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.DefaultSingleTablePipeline"/>
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
diff --git a/drivers/flowspec/pom.xml b/drivers/flowspec/pom.xml
index 2112cca..5e4b64b 100644
--- a/drivers/flowspec/pom.xml
+++ b/drivers/flowspec/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.flowspec</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.title>Flow specification Device Drivers</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/fujitsu/pom.xml b/drivers/fujitsu/pom.xml
index 92ed1e1..1cc72d5 100644
--- a/drivers/fujitsu/pom.xml
+++ b/drivers/fujitsu/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.fujitsu</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.title>Fujitsu Device Drivers</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/gnmi/pom.xml b/drivers/gnmi/pom.xml
index b7d169e..aea45a0 100644
--- a/drivers/gnmi/pom.xml
+++ b/drivers/gnmi/pom.xml
@@ -55,7 +55,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.gnmi</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.title>gNMI Device Drivers</onos.app.title>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/hp/pom.xml b/drivers/hp/pom.xml
index df6dbb4..a6a80e9 100644
--- a/drivers/hp/pom.xml
+++ b/drivers/hp/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.hp</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.title>HP Driver</onos.app.title>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/lisp/pom.xml b/drivers/lisp/pom.xml
index 5e50d61..e2bfc0d 100644
--- a/drivers/lisp/pom.xml
+++ b/drivers/lisp/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.lisp</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.title>LISP Device Drivers</onos.app.title>
         <onos.app.url>https://wiki.onosproject.org/display/ONOS/LISP+as+SBI</onos.app.url>
diff --git a/drivers/lumentum/pom.xml b/drivers/lumentum/pom.xml
index 8c7617d..59acc7a 100644
--- a/drivers/lumentum/pom.xml
+++ b/drivers/lumentum/pom.xml
@@ -31,7 +31,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.lumentum</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.title>Lumentum Device Drivers</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/netconf/pom.xml b/drivers/netconf/pom.xml
index e15b8d1..ed786e7 100644
--- a/drivers/netconf/pom.xml
+++ b/drivers/netconf/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.netconf</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.title>NETCONF Device Drivers</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/optical/pom.xml b/drivers/optical/pom.xml
index 9544df4..33ac270 100644
--- a/drivers/optical/pom.xml
+++ b/drivers/optical/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.optical</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.title>Other optical Device Drivers</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/ovsdb/pom.xml b/drivers/ovsdb/pom.xml
index 5a44cb9..c023745 100644
--- a/drivers/ovsdb/pom.xml
+++ b/drivers/ovsdb/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.ovsdb</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.title>OVSDB Device Drivers</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/drivers/ovsdb/src/main/resources/ovsdb-drivers.xml b/drivers/ovsdb/src/main/resources/ovsdb-drivers.xml
index 092d8ec..8763e2d 100644
--- a/drivers/ovsdb/src/main/resources/ovsdb-drivers.xml
+++ b/drivers/ovsdb/src/main/resources/ovsdb-drivers.xml
@@ -16,7 +16,7 @@
   -->
 <drivers>
     <driver name="default"
-            manufacturer="ON.Lab" hwVersion="0.0.1" swVersion="0.0.1">
+            manufacturer="Open Networking Foundation" hwVersion="0.0.1" swVersion="0.0.1">
         <behaviour api="org.onosproject.net.behaviour.BridgeConfig"
                    impl="org.onosproject.drivers.ovsdb.OvsdbBridgeConfig"/>
         <behaviour api="org.onosproject.net.behaviour.InterfaceConfig"
diff --git a/drivers/p4runtime/pom.xml b/drivers/p4runtime/pom.xml
index c1af001..8a1f5f7 100644
--- a/drivers/p4runtime/pom.xml
+++ b/drivers/p4runtime/pom.xml
@@ -55,7 +55,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivers.p4runtime</onos.app.name>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.title>P4Runtime Device Drivers</onos.app.title>
         <onos.app.category>Drivers</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
diff --git a/providers/host/pom.xml b/providers/host/pom.xml
index a83a321..7abf1bb 100644
--- a/providers/host/pom.xml
+++ b/providers/host/pom.xml
@@ -31,7 +31,7 @@
     <properties>
         <onos.app.name>org.onosproject.hostprovider</onos.app.name>
         <onos.app.title>Host Location Provider</onos.app.title>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS host location provider.</onos.app.readme>
diff --git a/providers/lldp/app.xml b/providers/lldp/app.xml
index 17ea0d6..69a2f39 100644
--- a/providers/lldp/app.xml
+++ b/providers/lldp/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.lldpprovider" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.lldpprovider" origin="Open Networking Foundation" version="${project.version}"
      category="Provider" url="http://onosproject.org" title="LLDP Link Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
diff --git a/providers/lldp/pom.xml b/providers/lldp/pom.xml
index 7336ae8..27601aa 100644
--- a/providers/lldp/pom.xml
+++ b/providers/lldp/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <onos.app.name>org.onosproject.lldpprovider</onos.app.name>
         <onos.app.title>LLDP Link Provider</onos.app.title>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS LLDP link provider.</onos.app.readme>
diff --git a/providers/netcfghost/pom.xml b/providers/netcfghost/pom.xml
index d1ab740..01dc93e 100644
--- a/providers/netcfghost/pom.xml
+++ b/providers/netcfghost/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <onos.app.name>org.onosproject.netcfghostprovider</onos.app.name>
         <onos.app.title>Network Config Host Provider</onos.app.title>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Host provider that uses network config service to discover hosts.</onos.app.readme>
diff --git a/providers/netcfglinks/app.xml b/providers/netcfglinks/app.xml
index f400bf4..83ebb521 100644
--- a/providers/netcfglinks/app.xml
+++ b/providers/netcfglinks/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.netcfglinksprovider" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.netcfglinksprovider" origin="Open Networking Foundation" version="${project.version}"
      category="Provider" url="http://onosproject.org" title="Network Config Link Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
diff --git a/providers/null/pom.xml b/providers/null/pom.xml
index 768fd4e..24c0f6e 100644
--- a/providers/null/pom.xml
+++ b/providers/null/pom.xml
@@ -33,7 +33,7 @@
     <properties>
         <onos.app.name>org.onosproject.null</onos.app.name>
         <onos.app.title>Null Southbound Provider</onos.app.title>
-        <onos.app.origin>ON.Lab</onos.app.origin>
+        <onos.app.origin>ONOS Community</onos.app.origin>
         <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS null southbound provider.</onos.app.readme>
diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java b/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java
index 775a2d7..62410a3 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/TopologySimulator.java
@@ -206,7 +206,7 @@
     public void createDevice(DeviceId id, int chassisId, Device.Type type, int portCount) {
         DeviceDescription desc =
                 new DefaultDeviceDescription(id.uri(), type,
-                                             "ON.Lab", "0.1", "0.1", "1234",
+                                             "ONF", "0.1", "0.1", "1234",
                                              new ChassisId(chassisId));
         deviceIds.add(id);
         mastershipAdminService.setRoleSync(localNode, id, MASTER);
diff --git a/providers/openflow/message/app.xml b/providers/openflow/message/app.xml
index d76aad9..dfe4851 100644
--- a/providers/openflow/message/app.xml
+++ b/providers/openflow/message/app.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<app name="org.onosproject.openflow-message" origin="ON.Lab" version="${project.version}"
+<app name="org.onosproject.openflow-message" origin="Open Networking Foundation" version="${project.version}"
      category="Provider" url="http://onosproject.org" title="Control Message Stats Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile
index 474237c..ab95905 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -198,7 +198,7 @@
     done
 }
 
-# ON.Lab shared test cell warden address
+# Open Networking Foundation shared test cell warden address
 export CELL_WARDEN="10.192.19.72"
 export CELL_SLAVE_1=$CELL_WARDEN
 export CELL_SLAVE_2="10.192.19.71"
diff --git a/tools/test/bin/onos-install b/tools/test/bin/onos-install
index ea2ab68..8696119 100755
--- a/tools/test/bin/onos-install
+++ b/tools/test/bin/onos-install
@@ -88,7 +88,7 @@
         echo '.upgrade' >> $ONOS_INSTALL_DIR/VERSION
     fi
 
-    # Remove any previous ON.Lab bits from ~/.m2 repo.
+    # Remove any previous Open Networking Foundation bits from ~/.m2 repo.
     rm -fr ~/.m2/repository/org/onosproject
 
     [ ! -z $mvn_settings ] && cp /tmp/settings.xml ~/.m2/settings.xml
diff --git a/utils/junit/pom.xml b/utils/junit/pom.xml
index c30eaf2..4aa1313 100644
--- a/utils/junit/pom.xml
+++ b/utils/junit/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>onlab-junit</artifactId>
     <packaging>bundle</packaging>
 
-    <description>ON.Lab JUnit test utilities</description>
+    <description>Open Networking Foundation JUnit test utilities</description>
 
     <dependencies>
         <dependency>
diff --git a/utils/misc/pom.xml b/utils/misc/pom.xml
index 1bfc038..4ebf544 100644
--- a/utils/misc/pom.xml
+++ b/utils/misc/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>onlab-misc</artifactId>
     <packaging>bundle</packaging>
 
-    <description>Miscellaneous ON.Lab utilities</description>
+    <description>Miscellaneous Open Networking Foundation utilities</description>
 
     <properties>
     </properties>
diff --git a/utils/osgi/pom.xml b/utils/osgi/pom.xml
index 08f930b..a21cf26 100644
--- a/utils/osgi/pom.xml
+++ b/utils/osgi/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>onlab-osgi</artifactId>
     <packaging>bundle</packaging>
 
-    <description>ON.Lab OSGI utilities</description>
+    <description>Open Networking Foundation OSGI utilities</description>
 
     <dependencies>
         <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 0bebe75..1800db0 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>onlab-utils</artifactId>
     <packaging>pom</packaging>
 
-    <description>Domain agnostic ON.Lab utilities</description>
+    <description>Domain agnostic Open Networking Foundation utilities</description>
 
     <modules>
         <module>junit</module>
diff --git a/utils/rest/pom.xml b/utils/rest/pom.xml
index e49a791..cc182cb 100644
--- a/utils/rest/pom.xml
+++ b/utils/rest/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>onlab-rest</artifactId>
     <packaging>bundle</packaging>
 
-    <description>ON.Lab JAX-RS utilities</description>
+    <description>Open Networking Foundation JAX-RS utilities</description>
 
     <dependencies>
         <dependency>
diff --git a/web/api/src/main/resources/definitions/Application.json b/web/api/src/main/resources/definitions/Application.json
index d55f7b9..a71a9ee 100644
--- a/web/api/src/main/resources/definitions/Application.json
+++ b/web/api/src/main/resources/definitions/Application.json
@@ -44,7 +44,7 @@
     },
     "origin": {
       "type": "string",
-      "example": "ON.Lab"
+      "example": "Open Networking Foundation"
     },
     "url": {
       "type": "string",
diff --git a/web/api/src/main/resources/definitions/ApplicationPost.json b/web/api/src/main/resources/definitions/ApplicationPost.json
index d55f7b9..a71a9ee 100644
--- a/web/api/src/main/resources/definitions/ApplicationPost.json
+++ b/web/api/src/main/resources/definitions/ApplicationPost.json
@@ -44,7 +44,7 @@
     },
     "origin": {
       "type": "string",
-      "example": "ON.Lab"
+      "example": "Open Networking Foundation"
     },
     "url": {
       "type": "string",
diff --git a/web/api/src/main/resources/definitions/Applications.json b/web/api/src/main/resources/definitions/Applications.json
index 9e4f2eb..a8013d1 100644
--- a/web/api/src/main/resources/definitions/Applications.json
+++ b/web/api/src/main/resources/definitions/Applications.json
@@ -57,7 +57,7 @@
           },
           "origin": {
             "type": "string",
-            "example": "ON.Lab"
+            "example": "Open Networking Foundation"
           },
           "url": {
             "type": "string",
diff --git a/web/gui/src/main/webapp/bower.json b/web/gui/src/main/webapp/bower.json
index 440dd58..5031857 100644
--- a/web/gui/src/main/webapp/bower.json
+++ b/web/gui/src/main/webapp/bower.json
@@ -4,7 +4,7 @@
   "main": "index.html",
   "directory": "./vendor",
   "authors": [
-    "ON.Lab"
+    "Open Networking Foundation"
   ],
   "license": "Apache 2.0",
   "homepage": "",
diff --git a/web/gui/src/main/webapp/data/map/README.txt b/web/gui/src/main/webapp/data/map/README.txt
index 5cd2634..a18d691 100644
--- a/web/gui/src/main/webapp/data/map/README.txt
+++ b/web/gui/src/main/webapp/data/map/README.txt
@@ -53,7 +53,7 @@
 
 Summary:
 - some additional work is required to fully generalize maps functionality.
-- it may be worthwhile for ON.LAB to provide the topo files for key regions since producing these
+- it may be worthwhile for ONF to provide the topo files for key regions since producing these
     files is non-trivial
 
 
diff --git a/web/gui/src/main/webapp/package.json b/web/gui/src/main/webapp/package.json
index a5a9f4e..0ad36bb 100644
--- a/web/gui/src/main/webapp/package.json
+++ b/web/gui/src/main/webapp/package.json
@@ -11,7 +11,7 @@
     "dev-server": "node --harmony_destructuring dev_server.js",
     "start": "parallelshell \"npm run dev-server\" \"npm run bs\""
   },
-  "author": "ON.Lab",
+  "author": "Open Networking Foundation",
   "license": "Apache 2.0",
   "devDependencies": {
     "browser-sync": "^2.12.8",