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;