diff --git a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
index f4d5122..63f22ff 100644
--- a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
+++ b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.metrics.intent;
+package org.onosproject.metrics.intent;
 
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -29,11 +29,11 @@
 import org.apache.felix.scr.annotations.Service;
 import org.onlab.metrics.EventMetric;
 import org.onlab.metrics.MetricsService;
-import org.onlab.onos.core.ApplicationId;
-import org.onlab.onos.core.CoreService;
-import org.onlab.onos.net.intent.IntentEvent;
-import org.onlab.onos.net.intent.IntentListener;
-import org.onlab.onos.net.intent.IntentService;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+import org.onosproject.net.intent.IntentEvent;
+import org.onosproject.net.intent.IntentListener;
+import org.onosproject.net.intent.IntentService;
 import org.slf4j.Logger;
 
 /**
@@ -83,7 +83,7 @@
     @Activate
     protected void activate() {
         appId =
-            coreService.registerApplication("org.onlab.onos.metrics.intent");
+            coreService.registerApplication("org.onosproject.metrics.intent");
 
         clear();
         registerMetrics();
diff --git a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetricsService.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetricsService.java
index dca3bac..df0b94c 100644
--- a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetricsService.java
+++ b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetricsService.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.metrics.intent;
+package org.onosproject.metrics.intent;
 
 import java.util.List;
 import org.onlab.metrics.EventMetric;
-import org.onlab.onos.net.intent.IntentEvent;
+import org.onosproject.net.intent.IntentEvent;
 
 /**
  * Service interface exported by IntentMetrics.
diff --git a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsListCommand.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsListCommand.java
index e7abe76..3c8457a 100644
--- a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsListCommand.java
+++ b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsListCommand.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.metrics.intent.cli;
+package org.onosproject.metrics.intent.cli;
 
 import java.util.List;
 
@@ -22,9 +22,9 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.karaf.shell.commands.Command;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.metrics.intent.IntentMetricsService;
-import org.onlab.onos.net.intent.IntentEvent;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.metrics.intent.IntentMetricsService;
+import org.onosproject.net.intent.IntentEvent;
 
 /**
  * Command to show the list of last intent events.
diff --git a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsMetricsCommand.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsMetricsCommand.java
index 65df468..932566b 100644
--- a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsMetricsCommand.java
+++ b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsMetricsCommand.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onlab.onos.metrics.intent.cli;
+package org.onosproject.metrics.intent.cli;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
@@ -27,8 +27,8 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.karaf.shell.commands.Command;
 import org.onlab.metrics.EventMetric;
-import org.onlab.onos.cli.AbstractShellCommand;
-import org.onlab.onos.metrics.intent.IntentMetricsService;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.metrics.intent.IntentMetricsService;
 
 /**
  * Command to show the intent events metrics.
diff --git a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/package-info.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/package-info.java
index 9b3e976..ddc7877 100644
--- a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/package-info.java
+++ b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Intent metrics command-line handlers.
  */
-package org.onlab.onos.metrics.intent.cli;
\ No newline at end of file
+package org.onosproject.metrics.intent.cli;
diff --git a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/package-info.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/package-info.java
index 78eaa06..9a7ac66 100644
--- a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/package-info.java
+++ b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/package-info.java
@@ -17,4 +17,4 @@
 /**
  * ONOS Intent Metrics Application that collects intent-related metrics.
  */
-package org.onlab.onos.metrics.intent;
+package org.onosproject.metrics.intent;
diff --git a/apps/metrics/intent/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/metrics/intent/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 4053487..d52ff5a 100644
--- a/apps/metrics/intent/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/apps/metrics/intent/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -17,10 +17,10 @@
 
   <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
     <command>
-      <action class="org.onlab.onos.metrics.intent.cli.IntentEventsListCommand"/>
+      <action class="org.onosproject.metrics.intent.cli.IntentEventsListCommand"/>
     </command>
     <command>
-      <action class="org.onlab.onos.metrics.intent.cli.IntentEventsMetricsCommand"/>
+      <action class="org.onosproject.metrics.intent.cli.IntentEventsMetricsCommand"/>
     </command>
   </command-bundle>