diff --git a/src/main/java/org/onosproject/aaa/AaaConfig.java b/src/main/java/org/opencord/aaa/AaaConfig.java
similarity index 99%
rename from src/main/java/org/onosproject/aaa/AaaConfig.java
rename to src/main/java/org/opencord/aaa/AaaConfig.java
index a23e0e4..e31e996 100644
--- a/src/main/java/org/onosproject/aaa/AaaConfig.java
+++ b/src/main/java/org/opencord/aaa/AaaConfig.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.aaa;
+package org.opencord.aaa;
 
 import org.onosproject.core.ApplicationId;
 import org.onosproject.net.config.Config;
diff --git a/src/main/java/org/onosproject/aaa/AaaManager.java b/src/main/java/org/opencord/aaa/AaaManager.java
similarity index 99%
rename from src/main/java/org/onosproject/aaa/AaaManager.java
rename to src/main/java/org/opencord/aaa/AaaManager.java
index 1bf629b..2aedc5f 100755
--- a/src/main/java/org/onosproject/aaa/AaaManager.java
+++ b/src/main/java/org/opencord/aaa/AaaManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.aaa;
+package org.opencord.aaa;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
diff --git a/src/main/java/org/onosproject/aaa/AaaShowUsersCommand.java b/src/main/java/org/opencord/aaa/AaaShowUsersCommand.java
similarity index 97%
rename from src/main/java/org/onosproject/aaa/AaaShowUsersCommand.java
rename to src/main/java/org/opencord/aaa/AaaShowUsersCommand.java
index e242982..25c5886 100644
--- a/src/main/java/org/onosproject/aaa/AaaShowUsersCommand.java
+++ b/src/main/java/org/opencord/aaa/AaaShowUsersCommand.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.aaa;
+package org.opencord.aaa;
 
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
diff --git a/src/main/java/org/onosproject/aaa/StateMachine.java b/src/main/java/org/opencord/aaa/StateMachine.java
similarity index 99%
rename from src/main/java/org/onosproject/aaa/StateMachine.java
rename to src/main/java/org/opencord/aaa/StateMachine.java
index cb9291c..1caf835 100644
--- a/src/main/java/org/onosproject/aaa/StateMachine.java
+++ b/src/main/java/org/opencord/aaa/StateMachine.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.onosproject.aaa;
+package org.opencord.aaa;
 
 import java.util.BitSet;
 import java.util.Map;
diff --git a/src/main/java/org/onosproject/aaa/StateMachineException.java b/src/main/java/org/opencord/aaa/StateMachineException.java
similarity index 96%
rename from src/main/java/org/onosproject/aaa/StateMachineException.java
rename to src/main/java/org/opencord/aaa/StateMachineException.java
index d4a4da7..d132c2a 100644
--- a/src/main/java/org/onosproject/aaa/StateMachineException.java
+++ b/src/main/java/org/opencord/aaa/StateMachineException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.onosproject.aaa;
+package org.opencord.aaa;
 
 /**
  * Exception for the State Machine.
diff --git a/src/main/java/org/onosproject/aaa/StateMachineInvalidTransitionException.java b/src/main/java/org/opencord/aaa/StateMachineInvalidTransitionException.java
similarity index 96%
rename from src/main/java/org/onosproject/aaa/StateMachineInvalidTransitionException.java
rename to src/main/java/org/opencord/aaa/StateMachineInvalidTransitionException.java
index 9f41a34..a97b02f 100644
--- a/src/main/java/org/onosproject/aaa/StateMachineInvalidTransitionException.java
+++ b/src/main/java/org/opencord/aaa/StateMachineInvalidTransitionException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.onosproject.aaa;
+package org.opencord.aaa;
 
 /**
  * Exception raised when the transition from one state to another is invalid.
diff --git a/src/main/java/org/onosproject/aaa/package-info.java b/src/main/java/org/opencord/aaa/package-info.java
similarity index 95%
rename from src/main/java/org/onosproject/aaa/package-info.java
rename to src/main/java/org/opencord/aaa/package-info.java
index cfc0114..f22c70f 100644
--- a/src/main/java/org/onosproject/aaa/package-info.java
+++ b/src/main/java/org/opencord/aaa/package-info.java
@@ -17,4 +17,4 @@
 /**
  * AAA implmentation.
  */
-package org.onosproject.aaa;
+package org.opencord.aaa;
diff --git a/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 117660b..17f60cd 100644
--- a/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -17,7 +17,7 @@
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.onosproject.aaa.AaaShowUsersCommand"/>
+            <action class="org.opencord.aaa.AaaShowUsersCommand"/>
         </command>
     </command-bundle>
 </blueprint>
diff --git a/src/test/java/org/onosproject/aaa/AaaIntegrationTest.java b/src/test/java/org/opencord/aaa/AaaIntegrationTest.java
similarity index 99%
rename from src/test/java/org/onosproject/aaa/AaaIntegrationTest.java
rename to src/test/java/org/opencord/aaa/AaaIntegrationTest.java
index 359d76b..cbdc000 100644
--- a/src/test/java/org/onosproject/aaa/AaaIntegrationTest.java
+++ b/src/test/java/org/opencord/aaa/AaaIntegrationTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.aaa;
+package org.opencord.aaa;
 
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/src/test/java/org/onosproject/aaa/AaaManagerTest.java b/src/test/java/org/opencord/aaa/AaaManagerTest.java
similarity index 99%
rename from src/test/java/org/onosproject/aaa/AaaManagerTest.java
rename to src/test/java/org/opencord/aaa/AaaManagerTest.java
index 8df7da5..241e57e 100644
--- a/src/test/java/org/onosproject/aaa/AaaManagerTest.java
+++ b/src/test/java/org/opencord/aaa/AaaManagerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.aaa;
+package org.opencord.aaa;
 
 import com.google.common.base.Charsets;
 import org.junit.After;
diff --git a/src/test/java/org/onosproject/aaa/AaaTestBase.java b/src/test/java/org/opencord/aaa/AaaTestBase.java
similarity index 99%
rename from src/test/java/org/onosproject/aaa/AaaTestBase.java
rename to src/test/java/org/opencord/aaa/AaaTestBase.java
index db369f6..5a38999 100644
--- a/src/test/java/org/onosproject/aaa/AaaTestBase.java
+++ b/src/test/java/org/opencord/aaa/AaaTestBase.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.aaa;
+package org.opencord.aaa;
 
 import org.onlab.packet.BasePacket;
 import org.onlab.packet.EAP;
diff --git a/src/test/java/org/onosproject/aaa/StateMachineTest.java b/src/test/java/org/opencord/aaa/StateMachineTest.java
similarity index 75%
rename from src/test/java/org/onosproject/aaa/StateMachineTest.java
rename to src/test/java/org/opencord/aaa/StateMachineTest.java
index 19e6fef..6626537 100644
--- a/src/test/java/org/onosproject/aaa/StateMachineTest.java
+++ b/src/test/java/org/opencord/aaa/StateMachineTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.onosproject.aaa;
+package org.opencord.aaa;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -51,19 +51,19 @@
      */
     public void basic() throws StateMachineException {
         System.out.println("======= BASIC =======.");
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
+        assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
 
         stateMachine.start();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
 
         stateMachine.requestAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
+        assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
 
         stateMachine.authorizeAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_AUTHORIZED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_AUTHORIZED);
 
         stateMachine.logoff();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
+        assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
     }
 
     @Test
@@ -73,19 +73,19 @@
     public void testIdleState() throws StateMachineException {
         System.out.println("======= IDLE STATE TEST =======.");
         stateMachine.requestAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
+        assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
 
         stateMachine.authorizeAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
+        assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
 
         stateMachine.denyAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
+        assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
 
         stateMachine.logoff();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
+        assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
 
         stateMachine.start();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
     }
 
     @Test
@@ -97,19 +97,19 @@
         stateMachine.start();
 
         stateMachine.authorizeAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
 
         stateMachine.denyAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
 
         stateMachine.logoff();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
 
         stateMachine.start();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
 
         stateMachine.requestAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
+        assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
     }
 
     @Test
@@ -123,19 +123,19 @@
         stateMachine.requestAccess();
 
         stateMachine.logoff();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
+        assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
 
         stateMachine.start();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
+        assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
 
         stateMachine.requestAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
+        assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
 
         stateMachine.authorizeAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_AUTHORIZED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_AUTHORIZED);
 
         stateMachine.denyAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_AUTHORIZED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_AUTHORIZED);
     }
 
     @Test
@@ -149,19 +149,19 @@
         stateMachine.requestAccess();
 
         stateMachine.logoff();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
+        assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
 
         stateMachine.start();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
+        assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
 
         stateMachine.requestAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
+        assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
 
         stateMachine.denyAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
 
         stateMachine.authorizeAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
     }
 
     @Test
@@ -175,19 +175,19 @@
         stateMachine.authorizeAccess();
 
         stateMachine.start();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_STARTED);
 
         stateMachine.requestAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
+        assertEquals(stateMachine.state(), StateMachine.STATE_PENDING);
 
         stateMachine.authorizeAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_AUTHORIZED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_AUTHORIZED);
 
         stateMachine.denyAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_AUTHORIZED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_AUTHORIZED);
 
         stateMachine.logoff();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
+        assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
     }
 
     @Test
@@ -201,19 +201,19 @@
         stateMachine.denyAccess();
 
         stateMachine.start();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
 
         stateMachine.requestAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
 
         stateMachine.authorizeAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
 
         stateMachine.denyAccess();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
+        assertEquals(stateMachine.state(), StateMachine.STATE_UNAUTHORIZED);
 
         stateMachine.logoff();
-        Assert.assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
+        assertEquals(stateMachine.state(), StateMachine.STATE_IDLE);
     }