diff --git a/authz-defOrg/.gitignore b/authz-defOrg/.gitignore
deleted file mode 100644
index f99ab6a..0000000
--- a/authz-defOrg/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-defOrg/pom.xml b/authz-defOrg/pom.xml
index a61aa57..abd5d41 100644
--- a/authz-defOrg/pom.xml
+++ b/authz-defOrg/pom.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START====================================================
-  * org.onap.aai
+  * org.onap.aaf
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  * Copyright © 2017 Amdocs
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
diff --git a/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrg.java b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrg.java
index 5a3abc8..fc25260 100644
--- a/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrg.java
+++ b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrg.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgIdentity.java b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgIdentity.java
index 5178779..21ea63e 100644
--- a/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgIdentity.java
+++ b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgIdentity.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgWarnings.java b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgWarnings.java
index cb184e3..3d55ce0 100644
--- a/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgWarnings.java
+++ b/authz-defOrg/src/main/java/com/osaaf/defOrg/DefaultOrgWarnings.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-defOrg/src/main/java/com/osaaf/defOrg/Identities.java b/authz-defOrg/src/main/java/com/osaaf/defOrg/Identities.java
index 73c579b..26ac2a9 100644
--- a/authz-defOrg/src/main/java/com/osaaf/defOrg/Identities.java
+++ b/authz-defOrg/src/main/java/com/osaaf/defOrg/Identities.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.java b/authz-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.java
index e8078e6..68fc15f 100644
--- a/authz-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.java
+++ b/authz-defOrg/src/test/java/com/osaaf/defOrd/test/JU_Identities.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.java
index a86ca4e..2ffa1f7 100644
--- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.java
+++ b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrg.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.java
index 97ae02e..3a51b6f 100644
--- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.java
+++ b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgIdentity.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.java
index d1c3107..164566d 100644
--- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.java
+++ b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_DefaultOrgWarnings.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.java b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.java
index 65c6f1c..2bda77f 100644
--- a/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.java
+++ b/authz-defOrg/src/test/java/com/osaaf/defOrg/JU_Identities.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.