diff --git a/apps/acl/src/main/java/org/onosproject/acl/impl/AclManager.java b/apps/acl/src/main/java/org/onosproject/acl/impl/AclManager.java
index 638f079..cbe415d 100644
--- a/apps/acl/src/main/java/org/onosproject/acl/impl/AclManager.java
+++ b/apps/acl/src/main/java/org/onosproject/acl/impl/AclManager.java
@@ -156,6 +156,7 @@
     @Deactivate
     public void deactivate() {
         hostService.removeListener(hostListener);
+        // TODO can be replaced with this.clearAcl()
         flowRuleService.removeFlowRulesById(appId);
         aclStore.clearAcl();
         log.info("Stopped");
diff --git a/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java b/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
index da3cc13..1d170d6 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
@@ -72,7 +72,7 @@
 
     @Activate
     public void activate() {
-        appId = coreService.registerApplication("org.onosproject.fwd");
+        appId = coreService.registerApplication("org.onosproject.lambdafwd");
 
         uglyMap.put(DeviceId.deviceId("of:0000ffffffffff01"), 1);
         uglyMap.put(DeviceId.deviceId("of:0000ffffffffff02"), 2);
diff --git a/apps/optical/src/main/java/org/onosproject/optical/testapp/MplsForwarding.java b/apps/optical/src/main/java/org/onosproject/optical/testapp/MplsForwarding.java
index b9a4b0c..13c7787 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/testapp/MplsForwarding.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/testapp/MplsForwarding.java
@@ -68,8 +68,7 @@
 
     @Activate
     public void activate() {
-        appId = coreService.registerApplication("org.onosproject.testapp" +
-                                                        ".mplsfwd");
+        appId = coreService.registerApplication("org.onosproject.mplsfwd");
 
         uglyMap.put(DeviceId.deviceId("of:0000000000000001"), 1);
         uglyMap.put(DeviceId.deviceId("of:0000000000000002"), 2);