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",