diff --git a/core/api/src/main/java/org/onosproject/store/service/BatchReadRequest.java b/core/api/src/main/java/org/onosproject/store/service/BatchReadRequest.java
index 7cab847..ce08640 100644
--- a/core/api/src/main/java/org/onosproject/store/service/BatchReadRequest.java
+++ b/core/api/src/main/java/org/onosproject/store/service/BatchReadRequest.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import java.util.List;
 
diff --git a/core/api/src/main/java/org/onosproject/store/service/BatchReadResult.java b/core/api/src/main/java/org/onosproject/store/service/BatchReadResult.java
index b12aa16..2b8da75 100644
--- a/core/api/src/main/java/org/onosproject/store/service/BatchReadResult.java
+++ b/core/api/src/main/java/org/onosproject/store/service/BatchReadResult.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import java.util.List;
 
diff --git a/core/api/src/main/java/org/onosproject/store/service/BatchWriteRequest.java b/core/api/src/main/java/org/onosproject/store/service/BatchWriteRequest.java
index e6ff26e..7686c7c 100644
--- a/core/api/src/main/java/org/onosproject/store/service/BatchWriteRequest.java
+++ b/core/api/src/main/java/org/onosproject/store/service/BatchWriteRequest.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import java.util.List;
 
diff --git a/core/api/src/main/java/org/onosproject/store/service/BatchWriteResult.java b/core/api/src/main/java/org/onosproject/store/service/BatchWriteResult.java
index fa2e7c4..805c8fc 100644
--- a/core/api/src/main/java/org/onosproject/store/service/BatchWriteResult.java
+++ b/core/api/src/main/java/org/onosproject/store/service/BatchWriteResult.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import java.util.List;
 
diff --git a/core/api/src/main/java/org/onosproject/store/service/DatabaseAdminService.java b/core/api/src/main/java/org/onosproject/store/service/DatabaseAdminService.java
index ef7ea67..8a00fe4 100644
--- a/core/api/src/main/java/org/onosproject/store/service/DatabaseAdminService.java
+++ b/core/api/src/main/java/org/onosproject/store/service/DatabaseAdminService.java
@@ -1,10 +1,10 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import java.util.Collection;
 import java.util.Optional;
 import java.util.Set;
 
-import org.onlab.onos.cluster.ControllerNode;
+import org.onosproject.cluster.ControllerNode;
 
 /**
  * Service interface for running administrative tasks on a Database.
diff --git a/core/api/src/main/java/org/onosproject/store/service/DatabaseException.java b/core/api/src/main/java/org/onosproject/store/service/DatabaseException.java
index 1468d1b..26a28b0 100644
--- a/core/api/src/main/java/org/onosproject/store/service/DatabaseException.java
+++ b/core/api/src/main/java/org/onosproject/store/service/DatabaseException.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 /**
  * Base exception type for database failures.
@@ -33,4 +33,4 @@
             super(t);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/store/service/DatabaseService.java b/core/api/src/main/java/org/onosproject/store/service/DatabaseService.java
index b5a56a1..2dec72d 100644
--- a/core/api/src/main/java/org/onosproject/store/service/DatabaseService.java
+++ b/core/api/src/main/java/org/onosproject/store/service/DatabaseService.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import java.util.Map;
 
diff --git a/core/api/src/main/java/org/onosproject/store/service/Lock.java b/core/api/src/main/java/org/onosproject/store/service/Lock.java
index 7558ae2..6b9ea8e 100644
--- a/core/api/src/main/java/org/onosproject/store/service/Lock.java
+++ b/core/api/src/main/java/org/onosproject/store/service/Lock.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import java.util.concurrent.CompletableFuture;
 
diff --git a/core/api/src/main/java/org/onosproject/store/service/LockEventListener.java b/core/api/src/main/java/org/onosproject/store/service/LockEventListener.java
index 73f78fe..4929dde 100644
--- a/core/api/src/main/java/org/onosproject/store/service/LockEventListener.java
+++ b/core/api/src/main/java/org/onosproject/store/service/LockEventListener.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 /**
  * Listener for lock events.
diff --git a/core/api/src/main/java/org/onosproject/store/service/LockService.java b/core/api/src/main/java/org/onosproject/store/service/LockService.java
index a4ac30b..c123273 100644
--- a/core/api/src/main/java/org/onosproject/store/service/LockService.java
+++ b/core/api/src/main/java/org/onosproject/store/service/LockService.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 /**
  * Service interface for mutual exclusion primitives.
@@ -25,4 +25,4 @@
      * @param listener listener to be removed.
      */
     void removeListener(LockEventListener listener);
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/store/service/NoSuchTableException.java b/core/api/src/main/java/org/onosproject/store/service/NoSuchTableException.java
index 6e02252..785685f 100644
--- a/core/api/src/main/java/org/onosproject/store/service/NoSuchTableException.java
+++ b/core/api/src/main/java/org/onosproject/store/service/NoSuchTableException.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 
 /**
@@ -7,4 +7,4 @@
  */
 @SuppressWarnings("serial")
 public class NoSuchTableException extends DatabaseException {
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/store/service/OptionalResult.java b/core/api/src/main/java/org/onosproject/store/service/OptionalResult.java
index a9341cb..88ba273 100644
--- a/core/api/src/main/java/org/onosproject/store/service/OptionalResult.java
+++ b/core/api/src/main/java/org/onosproject/store/service/OptionalResult.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 /**
  * A container object which either has a result or an exception.
diff --git a/core/api/src/main/java/org/onosproject/store/service/ReadRequest.java b/core/api/src/main/java/org/onosproject/store/service/ReadRequest.java
index f30529e..b1ec06f 100644
--- a/core/api/src/main/java/org/onosproject/store/service/ReadRequest.java
+++ b/core/api/src/main/java/org/onosproject/store/service/ReadRequest.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -75,4 +75,4 @@
         return Objects.equals(this.key, other.key) &&
                 Objects.equals(this.tableName, other.tableName);
     }
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/store/service/ReadResult.java b/core/api/src/main/java/org/onosproject/store/service/ReadResult.java
index 868dda5..3e13b0b 100644
--- a/core/api/src/main/java/org/onosproject/store/service/ReadResult.java
+++ b/core/api/src/main/java/org/onosproject/store/service/ReadResult.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/core/api/src/main/java/org/onosproject/store/service/ReadStatus.java b/core/api/src/main/java/org/onosproject/store/service/ReadStatus.java
index 67d8a57..128ce09 100644
--- a/core/api/src/main/java/org/onosproject/store/service/ReadStatus.java
+++ b/core/api/src/main/java/org/onosproject/store/service/ReadStatus.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 /**
  * Status of completed read request.
diff --git a/core/api/src/main/java/org/onosproject/store/service/VersionedValue.java b/core/api/src/main/java/org/onosproject/store/service/VersionedValue.java
index 9a78252..d224309 100644
--- a/core/api/src/main/java/org/onosproject/store/service/VersionedValue.java
+++ b/core/api/src/main/java/org/onosproject/store/service/VersionedValue.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import java.util.Arrays;
 
diff --git a/core/api/src/main/java/org/onosproject/store/service/WriteRequest.java b/core/api/src/main/java/org/onosproject/store/service/WriteRequest.java
index d687fa5..123b5c8 100644
--- a/core/api/src/main/java/org/onosproject/store/service/WriteRequest.java
+++ b/core/api/src/main/java/org/onosproject/store/service/WriteRequest.java
@@ -1,8 +1,8 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onlab.onos.store.service.WriteRequest.Type.*;
+import static org.onosproject.store.service.WriteRequest.Type.*;
 
 import java.util.Objects;
 
diff --git a/core/api/src/main/java/org/onosproject/store/service/WriteResult.java b/core/api/src/main/java/org/onosproject/store/service/WriteResult.java
index 3f61061..4a2b8bc 100644
--- a/core/api/src/main/java/org/onosproject/store/service/WriteResult.java
+++ b/core/api/src/main/java/org/onosproject/store/service/WriteResult.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 import com.google.common.base.MoreObjects;
 
diff --git a/core/api/src/main/java/org/onosproject/store/service/WriteStatus.java b/core/api/src/main/java/org/onosproject/store/service/WriteStatus.java
index 9f3e999..9d584c2 100644
--- a/core/api/src/main/java/org/onosproject/store/service/WriteStatus.java
+++ b/core/api/src/main/java/org/onosproject/store/service/WriteStatus.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;
 
 /**
  * Status of completed write request.
diff --git a/core/api/src/main/java/org/onosproject/store/service/package-info.java b/core/api/src/main/java/org/onosproject/store/service/package-info.java
index 5f65452..3d86e35 100644
--- a/core/api/src/main/java/org/onosproject/store/service/package-info.java
+++ b/core/api/src/main/java/org/onosproject/store/service/package-info.java
@@ -17,5 +17,5 @@
 /**
  * Distributed core state management services.
  */
-package org.onlab.onos.store.service;
+package org.onosproject.store.service;