diff --git a/web/api/src/main/java/org/onosproject/codec/impl/AnnotatedCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/AnnotatedCodec.java
index 1a6c511..a3d0663 100644
--- a/web/api/src/main/java/org/onosproject/codec/impl/AnnotatedCodec.java
+++ b/web/api/src/main/java/org/onosproject/codec/impl/AnnotatedCodec.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.codec.impl;
+package org.onosproject.codec.impl;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onlab.onos.codec.CodecContext;
-import org.onlab.onos.codec.JsonCodec;
-import org.onlab.onos.net.Annotated;
-import org.onlab.onos.net.Annotations;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.Annotated;
+import org.onosproject.net.Annotations;
 
 /**
  * Base JSON codec for annotated entities.
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/AnnotationsCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/AnnotationsCodec.java
index a8d2907..73590e7 100644
--- a/web/api/src/main/java/org/onosproject/codec/impl/AnnotationsCodec.java
+++ b/web/api/src/main/java/org/onosproject/codec/impl/AnnotationsCodec.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.codec.impl;
+package org.onosproject.codec.impl;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onlab.onos.codec.CodecContext;
-import org.onlab.onos.codec.JsonCodec;
-import org.onlab.onos.net.Annotations;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.Annotations;
 
 /**
  * Annotations JSON codec.
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java b/web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java
index 30be730..4d3a9d0 100644
--- a/web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java
+++ b/web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.codec.impl;
+package org.onosproject.codec.impl;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.codec.CodecService;
-import org.onlab.onos.codec.JsonCodec;
-import org.onlab.onos.net.Annotations;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Port;
+import org.onosproject.codec.CodecService;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.Annotations;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Device;
+import org.onosproject.net.Link;
+import org.onosproject.net.Port;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/ConnectPointCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/ConnectPointCodec.java
index 3b5bf02..41a7629 100644
--- a/web/api/src/main/java/org/onosproject/codec/impl/ConnectPointCodec.java
+++ b/web/api/src/main/java/org/onosproject/codec/impl/ConnectPointCodec.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.codec.impl;
+package org.onosproject.codec.impl;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onlab.onos.codec.CodecContext;
-import org.onlab.onos.codec.JsonCodec;
-import org.onlab.onos.net.ConnectPoint;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.ConnectPoint;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/DeviceCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/DeviceCodec.java
index 5835382..45998e3 100644
--- a/web/api/src/main/java/org/onosproject/codec/impl/DeviceCodec.java
+++ b/web/api/src/main/java/org/onosproject/codec/impl/DeviceCodec.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.codec.impl;
+package org.onosproject.codec.impl;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onlab.onos.codec.CodecContext;
-import org.onlab.onos.net.Device;
-import org.onlab.onos.net.device.DeviceService;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.net.Device;
+import org.onosproject.net.device.DeviceService;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/LinkCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/LinkCodec.java
index ad09663..55a50d3 100644
--- a/web/api/src/main/java/org/onosproject/codec/impl/LinkCodec.java
+++ b/web/api/src/main/java/org/onosproject/codec/impl/LinkCodec.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.codec.impl;
+package org.onosproject.codec.impl;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onlab.onos.codec.CodecContext;
-import org.onlab.onos.codec.JsonCodec;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.device.DeviceService;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.Link;
+import org.onosproject.net.device.DeviceService;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/PortCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/PortCodec.java
index 4bfcc6a..f517cd6 100644
--- a/web/api/src/main/java/org/onosproject/codec/impl/PortCodec.java
+++ b/web/api/src/main/java/org/onosproject/codec/impl/PortCodec.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.codec.impl;
+package org.onosproject.codec.impl;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onlab.onos.codec.CodecContext;
-import org.onlab.onos.net.Port;
-import org.onlab.onos.net.PortNumber;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
diff --git a/web/api/src/main/java/org/onosproject/codec/impl/package-info.java b/web/api/src/main/java/org/onosproject/codec/impl/package-info.java
index 31db517..4a5ca13 100644
--- a/web/api/src/main/java/org/onosproject/codec/impl/package-info.java
+++ b/web/api/src/main/java/org/onosproject/codec/impl/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Implementations of the codec broker and built-in entity JSON codecs.
  */
-package org.onlab.onos.codec.impl;
\ No newline at end of file
+package org.onosproject.codec.impl;