From be977ba3cfefdc1576f92994e282119cc6d4fd96 Mon Sep 17 00:00:00 2001
From: sg481n <sg481n@att.com>
Date: Wed, 9 Aug 2017 23:34:20 -0400
Subject:  [AAF-21] Updated Copyright Headers for AAF
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I6075e7a49fc6ad61db0c89a980d39e8d8691fd5f
Signed-off-by: sg481n <sg481n@att.com>
---
 LICENSE                                            | 23 ++++++++++++++++++++++
 aaf/.gitignore                                     |  5 -----
 aaf/pom.xml                                        |  3 +--
 aaf/src/assemble/cadi-aaf-test.xml                 |  3 +--
 aaf/src/assemble/cadi-aaf.xml                      |  3 +--
 aaf/src/main/java/Examples.java                    |  3 +--
 .../main/java/com/att/cadi/aaf/AAFPermission.java  |  3 +--
 .../main/java/com/att/cadi/aaf/AAFTransmutate.java |  3 +--
 .../java/com/att/cadi/aaf/ConnectivityTest.java    |  3 +--
 aaf/src/main/java/com/att/cadi/aaf/PermEval.java   |  3 +--
 .../att/cadi/aaf/cert/AAFListedCertIdentity.java   |  3 +--
 .../java/com/att/cadi/aaf/client/ErrMessage.java   |  3 +--
 .../java/com/att/cadi/aaf/client/Examples.java     |  3 +--
 .../java/com/att/cadi/aaf/marshal/CertMarshal.java |  3 +--
 .../com/att/cadi/aaf/marshal/CertsMarshal.java     |  3 +--
 .../main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java  |  3 +--
 .../main/java/com/att/cadi/aaf/v2_0/AAFCon.java    |  3 +--
 .../java/com/att/cadi/aaf/v2_0/AAFConDME2.java     |  3 +--
 .../java/com/att/cadi/aaf/v2_0/AAFConHttp.java     |  3 +--
 .../java/com/att/cadi/aaf/v2_0/AAFLurPerm.java     |  3 +--
 .../main/java/com/att/cadi/aaf/v2_0/AAFTaf.java    |  3 +--
 .../com/att/cadi/aaf/v2_0/AAFTrustChecker.java     |  3 +--
 .../main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java |  3 +--
 aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java |  3 +--
 .../main/java/com/att/cadi/cm/CertException.java   |  3 +--
 aaf/src/main/java/com/att/cadi/cm/CmAgent.java     |  3 +--
 aaf/src/main/java/com/att/cadi/cm/Factory.java     |  3 +--
 .../main/java/com/att/cadi/cm/PlaceArtifact.java   |  3 +--
 .../java/com/att/cadi/cm/PlaceArtifactInFiles.java |  3 +--
 .../com/att/cadi/cm/PlaceArtifactInKeystore.java   |  3 +--
 .../com/att/cadi/cm/PlaceArtifactOnStream.java     |  3 +--
 .../java/com/att/cadi/cm/PlaceArtifactScripts.java |  3 +--
 aaf/src/main/java/com/att/cadi/sso/AAFSSO.java     |  3 +--
 aaf/src/src/assemble/cadi-aaf-test.xml             |  3 +--
 aaf/src/src/assemble/cadi-aaf.xml                  |  3 +--
 aaf/src/src/main/java/Examples.java                |  3 +--
 .../main/java/com/att/cadi/aaf/AAFPermission.java  |  3 +--
 .../main/java/com/att/cadi/aaf/AAFTransmutate.java |  3 +--
 .../src/main/java/com/att/cadi/aaf/PermEval.java   |  3 +--
 .../java/com/att/cadi/aaf/client/ErrMessage.java   |  3 +--
 .../java/com/att/cadi/aaf/client/Examples.java     |  3 +--
 .../java/com/att/cadi/aaf/marshal/CertMarshal.java |  3 +--
 .../com/att/cadi/aaf/marshal/CertsMarshal.java     |  3 +--
 .../main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java  |  3 +--
 .../main/java/com/att/cadi/aaf/v2_0/AAFCon.java    |  3 +--
 .../java/com/att/cadi/aaf/v2_0/AAFConDME2.java     |  3 +--
 .../java/com/att/cadi/aaf/v2_0/AAFConHttp.java     |  3 +--
 .../java/com/att/cadi/aaf/v2_0/AAFLurPerm.java     |  3 +--
 .../main/java/com/att/cadi/aaf/v2_0/AAFTaf.java    |  3 +--
 .../com/att/cadi/aaf/v2_0/AAFTrustChecker.java     |  3 +--
 .../main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java |  3 +--
 .../src/main/java/com/att/cadi/cm/ArtifactDir.java |  3 +--
 .../main/java/com/att/cadi/cm/CertException.java   |  3 +--
 aaf/src/src/main/java/com/att/cadi/cm/CmAgent.java |  3 +--
 aaf/src/src/main/java/com/att/cadi/cm/Factory.java |  3 +--
 .../main/java/com/att/cadi/cm/PlaceArtifact.java   |  3 +--
 .../java/com/att/cadi/cm/PlaceArtifactInFiles.java |  3 +--
 .../com/att/cadi/cm/PlaceArtifactInKeystore.java   |  3 +--
 .../com/att/cadi/cm/PlaceArtifactOnStream.java     |  3 +--
 .../java/com/att/cadi/cm/PlaceArtifactScripts.java |  3 +--
 .../java/com/att/cadi/lur/aaf/test/TestAccess.java |  3 +--
 aaf/src/src/test/resources/cadi.properties         |  3 +--
 aaf/src/src/test/resources/log4j.properties        |  3 +--
 .../test/java/com/att/aaf/content/JU_Content.java  |  3 +--
 .../test/java/com/att/aaf/example/CadiTest.java    |  3 +--
 .../java/com/att/aaf/example/ExampleAuthCheck.java |  3 +--
 .../java/com/att/aaf/example/ExamplePerm2_0.java   |  3 +--
 .../com/att/aaf/example/ExamplePerm2_0_DME2.java   |  3 +--
 .../test/java/com/att/aaf/example/X509Test.java    |  3 +--
 .../java/com/att/cadi/lur/aaf/test/JU_JMeter.java  |  3 +--
 .../com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java   |  3 +--
 .../com/att/cadi/lur/aaf/test/JU_PermEval.java     |  3 +--
 .../att/cadi/lur/aaf/test/MultiThreadPermHit.java  |  3 +--
 .../java/com/att/cadi/lur/aaf/test/TestAccess.java |  3 +--
 aaf/src/test/resources/cadi.properties             |  3 +--
 aaf/src/test/resources/log4j.properties            |  3 +--
 cass/.gitignore                                    |  5 -----
 cass/etc/cadi.properties                           |  3 +--
 cass/pom.xml                                       |  3 +--
 .../att/cadi/aaf/cass/AAFAuthenticatedUser.java    |  3 +--
 .../com/att/cadi/aaf/cass/AAFAuthenticator.java    |  3 +--
 .../java/com/att/cadi/aaf/cass/AAFAuthorizer.java  |  3 +--
 .../main/java/com/att/cadi/aaf/cass/AAFBase.java   |  3 +--
 cass/src/test/java/com/att/aaf/cass/JU_CASS.java   |  3 +--
 .../java/com/att/cadi/aaf/cass/test/JU_CASS.java   |  3 +--
 client/.gitignore                                  |  5 -----
 client/pom.xml                                     |  3 +--
 .../main/java/com/att/cadi/client/AAFClient.java   |  3 +--
 .../java/com/att/cadi/client/AbsBasicAuth.java     |  3 +--
 .../java/com/att/cadi/client/AbsTransferSS.java    |  3 +--
 .../src/main/java/com/att/cadi/client/Delete.java  |  3 +--
 .../src/main/java/com/att/cadi/client/EClient.java |  3 +--
 .../main/java/com/att/cadi/client/EnvAccess.java   |  3 +--
 .../src/main/java/com/att/cadi/client/Future.java  |  3 +--
 client/src/main/java/com/att/cadi/client/Get.java  |  3 +--
 .../src/main/java/com/att/cadi/client/Holder.java  |  3 +--
 client/src/main/java/com/att/cadi/client/Post.java |  3 +--
 .../java/com/att/cadi/client/PropertyLocator.java  |  3 +--
 client/src/main/java/com/att/cadi/client/Put.java  |  3 +--
 .../main/java/com/att/cadi/client/RawClient.java   |  3 +--
 client/src/main/java/com/att/cadi/client/Rcli.java |  3 +--
 .../src/main/java/com/att/cadi/client/Result.java  |  3 +--
 .../main/java/com/att/cadi/client/Retryable.java   |  3 +--
 .../src/main/java/com/att/cadi/dme2/DEClient.java  |  3 +--
 .../main/java/com/att/cadi/dme2/DME2BasicAuth.java |  3 +--
 .../main/java/com/att/cadi/dme2/DME2ClientSS.java  |  3 +--
 .../main/java/com/att/cadi/dme2/DME2Locator.java   |  3 +--
 .../java/com/att/cadi/dme2/DME2TransferSS.java     |  3 +--
 .../main/java/com/att/cadi/dme2/DME2x509SS.java    |  3 +--
 client/src/main/java/com/att/cadi/dme2/DRcli.java  |  3 +--
 .../main/java/com/att/cadi/dnsloc/DNSLocator.java  |  3 +--
 .../main/java/com/att/cadi/http/HBasicAuthSS.java  |  3 +--
 .../src/main/java/com/att/cadi/http/HClient.java   |  3 +--
 client/src/main/java/com/att/cadi/http/HMangr.java |  3 +--
 client/src/main/java/com/att/cadi/http/HRcli.java  |  3 +--
 .../main/java/com/att/cadi/http/HTransferSS.java   |  3 +--
 .../src/main/java/com/att/cadi/http/HX509SS.java   |  3 +--
 .../java/com/att/cadi/locator/DME2Locator.java     |  3 +--
 .../main/java/com/att/cadi/locator/DNSLocator.java |  3 +--
 .../att/cadi/locator/HClientHotPeerLocator.java    |  3 +--
 .../java/com/att/cadi/locator/HotPeerLocator.java  |  3 +--
 .../java/com/att/cadi/locator/PropertyLocator.java |  3 +--
 .../java/com/att/cadi/routing/GreatCircle.java     |  3 +--
 .../test/java/com/client/test/BasicDME2Client.java |  3 +--
 .../test/java/com/client/test/JU_DNSLocator.java   |  3 +--
 .../java/com/client/test/JU_PropertyLocator.java   |  3 +--
 client/src/test/java/com/client/test/PaulUzee.java |  3 +--
 .../src/test/java/com/client/test/TestAccess.java  |  3 +--
 .../test/java/com/client/test/TestDME2Client.java  |  3 +--
 .../java/com/client/test/TestDME2RcliClient.java   |  3 +--
 .../src/test/java/com/client/test/TestHClient.java |  3 +--
 core/.gitignore                                    |  5 -----
 core/conf/cadi.properties                          |  3 +--
 core/pom.xml                                       |  3 +--
 core/src/assemble/cadi.xml                         |  3 +--
 core/src/assemble/poll.xml                         |  3 +--
 core/src/main/java/com/att/cadi/AES.java           |  3 +--
 .../main/java/com/att/cadi/AbsCachedPrincipal.java |  3 +--
 core/src/main/java/com/att/cadi/AbsUserCache.java  |  3 +--
 core/src/main/java/com/att/cadi/Access.java        |  3 +--
 core/src/main/java/com/att/cadi/BasicCred.java     |  3 +--
 .../main/java/com/att/cadi/BufferedCadiWrap.java   |  3 +--
 .../com/att/cadi/BufferedServletInputStream.java   |  3 +--
 .../main/java/com/att/cadi/CachedPrincipal.java    |  3 +--
 core/src/main/java/com/att/cadi/CachingLur.java    |  3 +--
 core/src/main/java/com/att/cadi/CadiException.java |  3 +--
 core/src/main/java/com/att/cadi/CadiWrap.java      |  3 +--
 core/src/main/java/com/att/cadi/Capacitor.java     |  3 +--
 core/src/main/java/com/att/cadi/CmdLine.java       |  3 +--
 core/src/main/java/com/att/cadi/Connector.java     |  3 +--
 core/src/main/java/com/att/cadi/CredVal.java       |  3 +--
 core/src/main/java/com/att/cadi/GetCred.java       |  3 +--
 core/src/main/java/com/att/cadi/Hash.java          |  3 +--
 core/src/main/java/com/att/cadi/Locator.java       |  3 +--
 .../main/java/com/att/cadi/LocatorException.java   |  3 +--
 core/src/main/java/com/att/cadi/Lur.java           |  3 +--
 core/src/main/java/com/att/cadi/Permission.java    |  3 +--
 core/src/main/java/com/att/cadi/PropAccess.java    |  3 +--
 core/src/main/java/com/att/cadi/Revalidator.java   |  3 +--
 core/src/main/java/com/att/cadi/SLF4JAccess.java   |  3 +--
 .../src/main/java/com/att/cadi/SecuritySetter.java |  3 +--
 .../java/com/att/cadi/ServletContextAccess.java    |  3 +--
 core/src/main/java/com/att/cadi/StrLur.java        |  3 +--
 core/src/main/java/com/att/cadi/Symm.java          |  3 +--
 core/src/main/java/com/att/cadi/Taf.java           |  3 +--
 core/src/main/java/com/att/cadi/Transmutate.java   |  3 +--
 core/src/main/java/com/att/cadi/TrustChecker.java  |  3 +--
 core/src/main/java/com/att/cadi/User.java          |  3 +--
 core/src/main/java/com/att/cadi/UserChain.java     |  3 +--
 core/src/main/java/com/att/cadi/config/Config.java |  3 +--
 core/src/main/java/com/att/cadi/config/Get.java    |  3 +--
 .../main/java/com/att/cadi/config/GetAccess.java   |  3 +--
 .../main/java/com/att/cadi/config/MultiGet.java    |  3 +--
 .../java/com/att/cadi/config/SecurityInfo.java     |  3 +--
 .../java/com/att/cadi/config/SecurityInfoC.java    |  3 +--
 .../main/java/com/att/cadi/config/UsersDump.java   |  3 +--
 core/src/main/java/com/att/cadi/filter/AUTHZ.java  |  3 +--
 .../java/com/att/cadi/filter/AUTHZServlet.java     |  3 +--
 .../java/com/att/cadi/filter/AccessGetter.java     |  3 +--
 .../main/java/com/att/cadi/filter/CadiAccess.java  |  3 +--
 .../main/java/com/att/cadi/filter/CadiFilter.java  |  3 +--
 .../java/com/att/cadi/filter/CadiHTTPManip.java    |  3 +--
 core/src/main/java/com/att/cadi/filter/FCGet.java  |  3 +--
 .../java/com/att/cadi/filter/MapPermConverter.java |  3 +--
 .../com/att/cadi/filter/NullPermConverter.java     |  3 +--
 .../main/java/com/att/cadi/filter/PathFilter.java  |  3 +--
 .../java/com/att/cadi/filter/PermConverter.java    |  3 +--
 .../java/com/att/cadi/filter/RolesAllowed.java     |  3 +--
 .../main/java/com/att/cadi/filter/ServletImpl.java |  3 +--
 .../java/com/att/cadi/lur/ConfigPrincipal.java     |  3 +--
 core/src/main/java/com/att/cadi/lur/EpiLur.java    |  3 +--
 core/src/main/java/com/att/cadi/lur/LocalLur.java  |  3 +--
 .../java/com/att/cadi/lur/LocalPermission.java     |  3 +--
 core/src/main/java/com/att/cadi/lur/NullLur.java   |  3 +--
 .../com/att/cadi/principal/BasicPrincipal.java     |  3 +--
 .../com/att/cadi/principal/BearerPrincipal.java    |  3 +--
 .../com/att/cadi/principal/CSPPrincipal_T.java     |  3 +--
 .../att/cadi/principal/CachedBasicPrincipal.java   |  3 +--
 .../com/att/cadi/principal/TGuardPrincipal.java    |  3 +--
 .../com/att/cadi/principal/TGuardPrincipal_T.java  |  3 +--
 .../com/att/cadi/principal/TrustPrincipal.java     |  3 +--
 .../java/com/att/cadi/principal/X509Principal.java |  3 +--
 .../src/main/java/com/att/cadi/taf/AbsTafResp.java |  3 +--
 core/src/main/java/com/att/cadi/taf/EpiTaf.java    |  3 +--
 .../src/main/java/com/att/cadi/taf/HttpEpiTaf.java |  3 +--
 core/src/main/java/com/att/cadi/taf/HttpTaf.java   |  3 +--
 .../java/com/att/cadi/taf/LoginPageTafResp.java    |  3 +--
 core/src/main/java/com/att/cadi/taf/NullTaf.java   |  3 +--
 .../main/java/com/att/cadi/taf/NullTafResp.java    |  3 +--
 .../main/java/com/att/cadi/taf/PuntTafResp.java    |  3 +--
 .../main/java/com/att/cadi/taf/Redirectable.java   |  3 +--
 core/src/main/java/com/att/cadi/taf/TafResp.java   |  3 +--
 .../java/com/att/cadi/taf/TrustNotTafResp.java     |  3 +--
 .../main/java/com/att/cadi/taf/TrustTafResp.java   |  3 +--
 .../java/com/att/cadi/taf/basic/BasicHttpTaf.java  |  3 +--
 .../com/att/cadi/taf/basic/BasicHttpTafResp.java   |  3 +--
 .../java/com/att/cadi/taf/cert/CertIdentity.java   |  3 +--
 .../com/att/cadi/taf/cert/X509HttpTafResp.java     |  3 +--
 .../main/java/com/att/cadi/taf/cert/X509Taf.java   |  3 +--
 .../com/att/cadi/taf/dos/DenialOfServiceTaf.java   |  3 +--
 .../att/cadi/taf/dos/DenialOfServiceTafResp.java   |  3 +--
 .../com/att/cadi/taf/localhost/LocalhostTaf.java   |  3 +--
 .../att/cadi/taf/localhost/LocalhostTafResp.java   |  3 +--
 core/src/main/java/com/att/cadi/util/Chmod.java    |  3 +--
 .../java/com/att/cadi/util/JsonOutputStream.java   |  3 +--
 .../com/att/cadi/util/MaskFormatException.java     |  3 +--
 .../src/main/java/com/att/cadi/util/MyConsole.java |  3 +--
 core/src/main/java/com/att/cadi/util/NetMask.java  |  3 +--
 core/src/main/java/com/att/cadi/util/Split.java    |  3 +--
 .../java/com/att/cadi/util/SubStandardConsole.java |  3 +--
 .../main/java/com/att/cadi/util/TheConsole.java    |  3 +--
 .../java/com/att/cadi/util/UserChainManip.java     |  3 +--
 core/src/main/java/com/att/cadi/util/Vars.java     |  3 +--
 core/src/main/java/com/att/cadi/wsse/Action.java   |  3 +--
 core/src/main/java/com/att/cadi/wsse/Match.java    |  3 +--
 .../main/java/com/att/cadi/wsse/WSSEParser.java    |  3 +--
 core/src/main/java/com/att/cadi/wsse/XEvent.java   |  3 +--
 core/src/main/java/com/att/cadi/wsse/XReader.java  |  3 +--
 core/src/test/java/com/att/cadi/JU_AES.java        |  3 +--
 .../java/com/att/cadi/lur/test/JU_LocalLur.java    |  3 +--
 .../java/com/att/cadi/lur/test/TestAccess.java     |  3 +--
 .../src/test/java/com/att/cadi/test/JU_Base64.java |  3 +--
 .../cadi/test/JU_BufferedServletInputStream.java   |  3 +--
 .../test/java/com/att/cadi/test/JU_Capacitor.java  |  3 +--
 core/src/test/java/com/att/cadi/test/JU_Hash.java  |  3 +--
 .../test/java/com/att/cadi/test/JU_Passcode.java   |  3 +--
 .../java/com/att/cadi/test/JU_UserChainManip.java  |  3 +--
 core/src/test/java/com/att/cadi/test/JU_Vars.java  |  3 +--
 core/src/test/java/com/att/cadi/test/Test.java     |  3 +--
 .../java/com/att/cadi/wsse/test/JU_WSSE_Read.java  |  3 +--
 .../java/com/att/cadi/wsse/test/JU_XReader.java    |  3 +--
 251 files changed, 269 insertions(+), 512 deletions(-)
 create mode 100644 LICENSE
 delete mode 100644 aaf/.gitignore
 delete mode 100644 cass/.gitignore
 delete mode 100644 client/.gitignore
 delete mode 100644 core/.gitignore

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..cd88bf0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,23 @@
+<!--
+ ============LICENSE_START====================================================
+* org.onap.aaf
+* ===========================================================================
+* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+* ===========================================================================
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+* 
+ * Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+* ============LICENSE_END====================================================
+*
+* ECOMP is a trademark and service mark of AT&T Intellectual Property.
+*
+
+-->
\ No newline at end of file
diff --git a/aaf/.gitignore b/aaf/.gitignore
deleted file mode 100644
index cf85207..0000000
--- a/aaf/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/bin/
-/target/
-/.classpath
-/.project
-.settings
diff --git a/aaf/pom.xml b/aaf/pom.xml
index 9673067..5803cb9 100644
--- a/aaf/pom.xml
+++ b/aaf/pom.xml
@@ -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/aaf/src/assemble/cadi-aaf-test.xml b/aaf/src/assemble/cadi-aaf-test.xml
index a6671ba..20626ad 100644
--- a/aaf/src/assemble/cadi-aaf-test.xml
+++ b/aaf/src/assemble/cadi-aaf-test.xml
@@ -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/aaf/src/assemble/cadi-aaf.xml b/aaf/src/assemble/cadi-aaf.xml
index 578037b..3460028 100644
--- a/aaf/src/assemble/cadi-aaf.xml
+++ b/aaf/src/assemble/cadi-aaf.xml
@@ -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/aaf/src/main/java/Examples.java b/aaf/src/main/java/Examples.java
index 91f313f..7ea379b 100644
--- a/aaf/src/main/java/Examples.java
+++ b/aaf/src/main/java/Examples.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/aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java b/aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java
index e604053..79dd9ee 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/AAFPermission.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/AAFPermission.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/aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java b/aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java
index a6a9bb7..c7f0e2c 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/AAFTransmutate.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/aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java b/aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java
index 070d48d..7508522 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/ConnectivityTest.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/aaf/src/main/java/com/att/cadi/aaf/PermEval.java b/aaf/src/main/java/com/att/cadi/aaf/PermEval.java
index b661df4..448f60a 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/PermEval.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/PermEval.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/aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java b/aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java
index ecdaf24..e029765 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/cert/AAFListedCertIdentity.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/aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java b/aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java
index 7fc776a..4b619c6 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/client/ErrMessage.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/aaf/src/main/java/com/att/cadi/aaf/client/Examples.java b/aaf/src/main/java/com/att/cadi/aaf/client/Examples.java
index e8a4756..d469805 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/client/Examples.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/client/Examples.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/aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java b/aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java
index 4193d43..ad75dc5 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.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/aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java b/aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java
index 16fc580..3a27a9c 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.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/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java
index db60495..33005a3 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.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/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java
index 573c85e..a9d53f3 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.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/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java
index 7092613..6fce97a 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.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/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java
index 5454773..e126f08 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.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/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java
index db03347..7188224 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.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/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java
index 35df38f..4e189ce 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.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/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java
index 3bc4faf..5ee3199 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.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/aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java
index 8626588..297ad8a 100644
--- a/aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java
+++ b/aaf/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.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/aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java b/aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java
index 39854d6..512be78 100644
--- a/aaf/src/main/java/com/att/cadi/cm/ArtifactDir.java
+++ b/aaf/src/main/java/com/att/cadi/cm/ArtifactDir.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/aaf/src/main/java/com/att/cadi/cm/CertException.java b/aaf/src/main/java/com/att/cadi/cm/CertException.java
index a2694ce..ce38c21 100644
--- a/aaf/src/main/java/com/att/cadi/cm/CertException.java
+++ b/aaf/src/main/java/com/att/cadi/cm/CertException.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/aaf/src/main/java/com/att/cadi/cm/CmAgent.java b/aaf/src/main/java/com/att/cadi/cm/CmAgent.java
index 424ef83..0240962 100644
--- a/aaf/src/main/java/com/att/cadi/cm/CmAgent.java
+++ b/aaf/src/main/java/com/att/cadi/cm/CmAgent.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/aaf/src/main/java/com/att/cadi/cm/Factory.java b/aaf/src/main/java/com/att/cadi/cm/Factory.java
index 178cc81..85b5dfb 100644
--- a/aaf/src/main/java/com/att/cadi/cm/Factory.java
+++ b/aaf/src/main/java/com/att/cadi/cm/Factory.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/aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java b/aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java
index b5a3fb0..60434c3 100644
--- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.java
+++ b/aaf/src/main/java/com/att/cadi/cm/PlaceArtifact.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/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java b/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java
index 219eb4a..c9145ec 100644
--- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java
+++ b/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.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/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java b/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java
index 6859ba5..61374e9 100644
--- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java
+++ b/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.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/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java b/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java
index 7815a8e..4c2c900 100644
--- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java
+++ b/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.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/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java b/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java
index ab77ca2..714b233 100644
--- a/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java
+++ b/aaf/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.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/aaf/src/main/java/com/att/cadi/sso/AAFSSO.java b/aaf/src/main/java/com/att/cadi/sso/AAFSSO.java
index 5d0d342..4f66dd2 100644
--- a/aaf/src/main/java/com/att/cadi/sso/AAFSSO.java
+++ b/aaf/src/main/java/com/att/cadi/sso/AAFSSO.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/aaf/src/src/assemble/cadi-aaf-test.xml b/aaf/src/src/assemble/cadi-aaf-test.xml
index a6671ba..20626ad 100644
--- a/aaf/src/src/assemble/cadi-aaf-test.xml
+++ b/aaf/src/src/assemble/cadi-aaf-test.xml
@@ -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/aaf/src/src/assemble/cadi-aaf.xml b/aaf/src/src/assemble/cadi-aaf.xml
index 578037b..3460028 100644
--- a/aaf/src/src/assemble/cadi-aaf.xml
+++ b/aaf/src/src/assemble/cadi-aaf.xml
@@ -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/aaf/src/src/main/java/Examples.java b/aaf/src/src/main/java/Examples.java
index 91f313f..7ea379b 100644
--- a/aaf/src/src/main/java/Examples.java
+++ b/aaf/src/src/main/java/Examples.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/aaf/src/src/main/java/com/att/cadi/aaf/AAFPermission.java b/aaf/src/src/main/java/com/att/cadi/aaf/AAFPermission.java
index c436db4..7a3f175 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/AAFPermission.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/AAFPermission.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/aaf/src/src/main/java/com/att/cadi/aaf/AAFTransmutate.java b/aaf/src/src/main/java/com/att/cadi/aaf/AAFTransmutate.java
index fca8e8f..cb01068 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/AAFTransmutate.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/AAFTransmutate.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/aaf/src/src/main/java/com/att/cadi/aaf/PermEval.java b/aaf/src/src/main/java/com/att/cadi/aaf/PermEval.java
index b721968..e581745 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/PermEval.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/PermEval.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/aaf/src/src/main/java/com/att/cadi/aaf/client/ErrMessage.java b/aaf/src/src/main/java/com/att/cadi/aaf/client/ErrMessage.java
index 7fc776a..4b619c6 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/client/ErrMessage.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/client/ErrMessage.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/aaf/src/src/main/java/com/att/cadi/aaf/client/Examples.java b/aaf/src/src/main/java/com/att/cadi/aaf/client/Examples.java
index e8a4756..d469805 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/client/Examples.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/client/Examples.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/aaf/src/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java b/aaf/src/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java
index 4193d43..ad75dc5 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/marshal/CertMarshal.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/aaf/src/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java b/aaf/src/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java
index 16fc580..3a27a9c 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/marshal/CertsMarshal.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/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java
index 0c72dcd..263f730 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFAuthn.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/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java
index c58dd9a..9b458c7 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFCon.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/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java
index 07bc390..0ff8958 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFConDME2.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/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java
index ffe1331..8a63680 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFConHttp.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/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java
index c1c25c2..aae79f4 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFLurPerm.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/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java
index a36c11a..c294ed1 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFTaf.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/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java
index cc1e16c..175f699 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AAFTrustChecker.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/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java
index 0e831b9..03f6c70 100644
--- a/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.java
+++ b/aaf/src/src/main/java/com/att/cadi/aaf/v2_0/AbsAAFLur.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/aaf/src/src/main/java/com/att/cadi/cm/ArtifactDir.java b/aaf/src/src/main/java/com/att/cadi/cm/ArtifactDir.java
index 7ddf529..8fe1f7a 100644
--- a/aaf/src/src/main/java/com/att/cadi/cm/ArtifactDir.java
+++ b/aaf/src/src/main/java/com/att/cadi/cm/ArtifactDir.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/aaf/src/src/main/java/com/att/cadi/cm/CertException.java b/aaf/src/src/main/java/com/att/cadi/cm/CertException.java
index a2694ce..ce38c21 100644
--- a/aaf/src/src/main/java/com/att/cadi/cm/CertException.java
+++ b/aaf/src/src/main/java/com/att/cadi/cm/CertException.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/aaf/src/src/main/java/com/att/cadi/cm/CmAgent.java b/aaf/src/src/main/java/com/att/cadi/cm/CmAgent.java
index 9e5e77a..fe76082 100644
--- a/aaf/src/src/main/java/com/att/cadi/cm/CmAgent.java
+++ b/aaf/src/src/main/java/com/att/cadi/cm/CmAgent.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/aaf/src/src/main/java/com/att/cadi/cm/Factory.java b/aaf/src/src/main/java/com/att/cadi/cm/Factory.java
index 6fc9b27..20b77d3 100644
--- a/aaf/src/src/main/java/com/att/cadi/cm/Factory.java
+++ b/aaf/src/src/main/java/com/att/cadi/cm/Factory.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/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifact.java b/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifact.java
index b5a3fb0..60434c3 100644
--- a/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifact.java
+++ b/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifact.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/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java b/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java
index 219eb4a..c9145ec 100644
--- a/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.java
+++ b/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactInFiles.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/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java b/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java
index abe0586..c1c8c89 100644
--- a/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.java
+++ b/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactInKeystore.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/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java b/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java
index 7815a8e..4c2c900 100644
--- a/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.java
+++ b/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactOnStream.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/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java b/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java
index 0525739..f09e0bf 100644
--- a/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.java
+++ b/aaf/src/src/main/java/com/att/cadi/cm/PlaceArtifactScripts.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/aaf/src/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java b/aaf/src/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java
index f65f03f..7afb25e 100644
--- a/aaf/src/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java
+++ b/aaf/src/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.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/aaf/src/src/test/resources/cadi.properties b/aaf/src/src/test/resources/cadi.properties
index 4f38cf5..8f1209a 100644
--- a/aaf/src/src/test/resources/cadi.properties
+++ b/aaf/src/src/test/resources/cadi.properties
@@ -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/aaf/src/src/test/resources/log4j.properties b/aaf/src/src/test/resources/log4j.properties
index 91b81ef..c4686fd 100644
--- a/aaf/src/src/test/resources/log4j.properties
+++ b/aaf/src/src/test/resources/log4j.properties
@@ -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/aaf/src/test/java/com/att/aaf/content/JU_Content.java b/aaf/src/test/java/com/att/aaf/content/JU_Content.java
index 676dcc1..80215c9 100644
--- a/aaf/src/test/java/com/att/aaf/content/JU_Content.java
+++ b/aaf/src/test/java/com/att/aaf/content/JU_Content.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/aaf/src/test/java/com/att/aaf/example/CadiTest.java b/aaf/src/test/java/com/att/aaf/example/CadiTest.java
index f6cbce2..f50d6ac 100644
--- a/aaf/src/test/java/com/att/aaf/example/CadiTest.java
+++ b/aaf/src/test/java/com/att/aaf/example/CadiTest.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/aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java b/aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java
index 78b5e99..53f8c8e 100644
--- a/aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.java
+++ b/aaf/src/test/java/com/att/aaf/example/ExampleAuthCheck.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/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java b/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java
index 11092df..5f6179e 100644
--- a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.java
+++ b/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0.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/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java b/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java
index 2012465..5ebbe9f 100644
--- a/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.java
+++ b/aaf/src/test/java/com/att/aaf/example/ExamplePerm2_0_DME2.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/aaf/src/test/java/com/att/aaf/example/X509Test.java b/aaf/src/test/java/com/att/aaf/example/X509Test.java
index e1b6be6..517393f 100644
--- a/aaf/src/test/java/com/att/aaf/example/X509Test.java
+++ b/aaf/src/test/java/com/att/aaf/example/X509Test.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/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java b/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java
index b71a9ba..d5f92c1 100644
--- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.java
+++ b/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_JMeter.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/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java b/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java
index 2608980..f85a4e2 100644
--- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.java
+++ b/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_Lur2_0Call.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/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java b/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java
index efd108f..8dee6cf 100644
--- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.java
+++ b/aaf/src/test/java/com/att/cadi/lur/aaf/test/JU_PermEval.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/aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java b/aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java
index cec5404..c4f5f7c 100644
--- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.java
+++ b/aaf/src/test/java/com/att/cadi/lur/aaf/test/MultiThreadPermHit.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/aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java b/aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java
index 0554d1d..7d83625 100644
--- a/aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.java
+++ b/aaf/src/test/java/com/att/cadi/lur/aaf/test/TestAccess.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/aaf/src/test/resources/cadi.properties b/aaf/src/test/resources/cadi.properties
index 4f38cf5..8f1209a 100644
--- a/aaf/src/test/resources/cadi.properties
+++ b/aaf/src/test/resources/cadi.properties
@@ -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/aaf/src/test/resources/log4j.properties b/aaf/src/test/resources/log4j.properties
index 91b81ef..c4686fd 100644
--- a/aaf/src/test/resources/log4j.properties
+++ b/aaf/src/test/resources/log4j.properties
@@ -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/cass/.gitignore b/cass/.gitignore
deleted file mode 100644
index cf85207..0000000
--- a/cass/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/bin/
-/target/
-/.classpath
-/.project
-.settings
diff --git a/cass/etc/cadi.properties b/cass/etc/cadi.properties
index f9676b0..c5f9c2c 100644
--- a/cass/etc/cadi.properties
+++ b/cass/etc/cadi.properties
@@ -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/cass/pom.xml b/cass/pom.xml
index 89582d6..a20d8e5 100644
--- a/cass/pom.xml
+++ b/cass/pom.xml
@@ -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/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java b/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java
index d720e28..e847bd0 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.java
+++ b/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticatedUser.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/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java b/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java
index 8228899..631a3fa 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.java
+++ b/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthenticator.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/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java b/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java
index a923e9b..650e570 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.java
+++ b/cass/src/main/java/com/att/cadi/aaf/cass/AAFAuthorizer.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/cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java b/cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java
index 32690f4..4d82a6b 100644
--- a/cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.java
+++ b/cass/src/main/java/com/att/cadi/aaf/cass/AAFBase.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/cass/src/test/java/com/att/aaf/cass/JU_CASS.java b/cass/src/test/java/com/att/aaf/cass/JU_CASS.java
index f25a6b5..9eca242 100644
--- a/cass/src/test/java/com/att/aaf/cass/JU_CASS.java
+++ b/cass/src/test/java/com/att/aaf/cass/JU_CASS.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/cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java b/cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java
index 9bfc17e..0eb95be 100644
--- a/cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.java
+++ b/cass/src/test/java/com/att/cadi/aaf/cass/test/JU_CASS.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/client/.gitignore b/client/.gitignore
deleted file mode 100644
index cf85207..0000000
--- a/client/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/bin/
-/target/
-/.classpath
-/.project
-.settings
diff --git a/client/pom.xml b/client/pom.xml
index 562a92a..bb04333 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -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/client/src/main/java/com/att/cadi/client/AAFClient.java b/client/src/main/java/com/att/cadi/client/AAFClient.java
index 843f3b1..3f8fb47 100644
--- a/client/src/main/java/com/att/cadi/client/AAFClient.java
+++ b/client/src/main/java/com/att/cadi/client/AAFClient.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/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java b/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java
index ef8abf4..a0ab06d 100644
--- a/client/src/main/java/com/att/cadi/client/AbsBasicAuth.java
+++ b/client/src/main/java/com/att/cadi/client/AbsBasicAuth.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/client/src/main/java/com/att/cadi/client/AbsTransferSS.java b/client/src/main/java/com/att/cadi/client/AbsTransferSS.java
index 3056187..69647e6 100644
--- a/client/src/main/java/com/att/cadi/client/AbsTransferSS.java
+++ b/client/src/main/java/com/att/cadi/client/AbsTransferSS.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/client/src/main/java/com/att/cadi/client/Delete.java b/client/src/main/java/com/att/cadi/client/Delete.java
index 9367d4d..f780af1 100644
--- a/client/src/main/java/com/att/cadi/client/Delete.java
+++ b/client/src/main/java/com/att/cadi/client/Delete.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/client/src/main/java/com/att/cadi/client/EClient.java b/client/src/main/java/com/att/cadi/client/EClient.java
index f508029..166d150 100644
--- a/client/src/main/java/com/att/cadi/client/EClient.java
+++ b/client/src/main/java/com/att/cadi/client/EClient.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/client/src/main/java/com/att/cadi/client/EnvAccess.java b/client/src/main/java/com/att/cadi/client/EnvAccess.java
index f331c9a..f78f2ff 100644
--- a/client/src/main/java/com/att/cadi/client/EnvAccess.java
+++ b/client/src/main/java/com/att/cadi/client/EnvAccess.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/client/src/main/java/com/att/cadi/client/Future.java b/client/src/main/java/com/att/cadi/client/Future.java
index 1752907..18987a6 100644
--- a/client/src/main/java/com/att/cadi/client/Future.java
+++ b/client/src/main/java/com/att/cadi/client/Future.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/client/src/main/java/com/att/cadi/client/Get.java b/client/src/main/java/com/att/cadi/client/Get.java
index d05654d..a39aaf1 100644
--- a/client/src/main/java/com/att/cadi/client/Get.java
+++ b/client/src/main/java/com/att/cadi/client/Get.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/client/src/main/java/com/att/cadi/client/Holder.java b/client/src/main/java/com/att/cadi/client/Holder.java
index 93067f9..3ad7ce3 100644
--- a/client/src/main/java/com/att/cadi/client/Holder.java
+++ b/client/src/main/java/com/att/cadi/client/Holder.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/client/src/main/java/com/att/cadi/client/Post.java b/client/src/main/java/com/att/cadi/client/Post.java
index 7cc1b8c..001f1b3 100644
--- a/client/src/main/java/com/att/cadi/client/Post.java
+++ b/client/src/main/java/com/att/cadi/client/Post.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/client/src/main/java/com/att/cadi/client/PropertyLocator.java b/client/src/main/java/com/att/cadi/client/PropertyLocator.java
index 37bc7b6..acd3b4a 100644
--- a/client/src/main/java/com/att/cadi/client/PropertyLocator.java
+++ b/client/src/main/java/com/att/cadi/client/PropertyLocator.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/client/src/main/java/com/att/cadi/client/Put.java b/client/src/main/java/com/att/cadi/client/Put.java
index 033216b..b14bfac 100644
--- a/client/src/main/java/com/att/cadi/client/Put.java
+++ b/client/src/main/java/com/att/cadi/client/Put.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/client/src/main/java/com/att/cadi/client/RawClient.java b/client/src/main/java/com/att/cadi/client/RawClient.java
index d1a1fc2..c1ad633 100644
--- a/client/src/main/java/com/att/cadi/client/RawClient.java
+++ b/client/src/main/java/com/att/cadi/client/RawClient.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/client/src/main/java/com/att/cadi/client/Rcli.java b/client/src/main/java/com/att/cadi/client/Rcli.java
index f14645e..c25cb2b 100644
--- a/client/src/main/java/com/att/cadi/client/Rcli.java
+++ b/client/src/main/java/com/att/cadi/client/Rcli.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/client/src/main/java/com/att/cadi/client/Result.java b/client/src/main/java/com/att/cadi/client/Result.java
index 1e4909e..b86d9b9 100644
--- a/client/src/main/java/com/att/cadi/client/Result.java
+++ b/client/src/main/java/com/att/cadi/client/Result.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/client/src/main/java/com/att/cadi/client/Retryable.java b/client/src/main/java/com/att/cadi/client/Retryable.java
index e276837..4f49a72 100644
--- a/client/src/main/java/com/att/cadi/client/Retryable.java
+++ b/client/src/main/java/com/att/cadi/client/Retryable.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/client/src/main/java/com/att/cadi/dme2/DEClient.java b/client/src/main/java/com/att/cadi/dme2/DEClient.java
index 6810916..138fb63 100644
--- a/client/src/main/java/com/att/cadi/dme2/DEClient.java
+++ b/client/src/main/java/com/att/cadi/dme2/DEClient.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/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java b/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java
index 988c92f..3fb1f13 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.java
+++ b/client/src/main/java/com/att/cadi/dme2/DME2BasicAuth.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/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java b/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java
index f64367b..8895e9f 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.java
+++ b/client/src/main/java/com/att/cadi/dme2/DME2ClientSS.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/client/src/main/java/com/att/cadi/dme2/DME2Locator.java b/client/src/main/java/com/att/cadi/dme2/DME2Locator.java
index b81cf4a..f28fe94 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2Locator.java
+++ b/client/src/main/java/com/att/cadi/dme2/DME2Locator.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/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java b/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java
index d4612f1..a8d7ac9 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.java
+++ b/client/src/main/java/com/att/cadi/dme2/DME2TransferSS.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/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java b/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java
index f60f791..45978e4 100644
--- a/client/src/main/java/com/att/cadi/dme2/DME2x509SS.java
+++ b/client/src/main/java/com/att/cadi/dme2/DME2x509SS.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/client/src/main/java/com/att/cadi/dme2/DRcli.java b/client/src/main/java/com/att/cadi/dme2/DRcli.java
index 9ff56ca..8a1f5fb 100644
--- a/client/src/main/java/com/att/cadi/dme2/DRcli.java
+++ b/client/src/main/java/com/att/cadi/dme2/DRcli.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/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java b/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java
index 498b013..3bf9080 100644
--- a/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.java
+++ b/client/src/main/java/com/att/cadi/dnsloc/DNSLocator.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/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java b/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java
index 8d8826e..dfedcc1 100644
--- a/client/src/main/java/com/att/cadi/http/HBasicAuthSS.java
+++ b/client/src/main/java/com/att/cadi/http/HBasicAuthSS.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/client/src/main/java/com/att/cadi/http/HClient.java b/client/src/main/java/com/att/cadi/http/HClient.java
index d17dcc7..6704bf4 100644
--- a/client/src/main/java/com/att/cadi/http/HClient.java
+++ b/client/src/main/java/com/att/cadi/http/HClient.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/client/src/main/java/com/att/cadi/http/HMangr.java b/client/src/main/java/com/att/cadi/http/HMangr.java
index 78aff4e..13fe815 100644
--- a/client/src/main/java/com/att/cadi/http/HMangr.java
+++ b/client/src/main/java/com/att/cadi/http/HMangr.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/client/src/main/java/com/att/cadi/http/HRcli.java b/client/src/main/java/com/att/cadi/http/HRcli.java
index a55b55a..cfbb5c1 100644
--- a/client/src/main/java/com/att/cadi/http/HRcli.java
+++ b/client/src/main/java/com/att/cadi/http/HRcli.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/client/src/main/java/com/att/cadi/http/HTransferSS.java b/client/src/main/java/com/att/cadi/http/HTransferSS.java
index 180a341..89a38c3 100644
--- a/client/src/main/java/com/att/cadi/http/HTransferSS.java
+++ b/client/src/main/java/com/att/cadi/http/HTransferSS.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/client/src/main/java/com/att/cadi/http/HX509SS.java b/client/src/main/java/com/att/cadi/http/HX509SS.java
index 3022c0f..b790ede 100644
--- a/client/src/main/java/com/att/cadi/http/HX509SS.java
+++ b/client/src/main/java/com/att/cadi/http/HX509SS.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/client/src/main/java/com/att/cadi/locator/DME2Locator.java b/client/src/main/java/com/att/cadi/locator/DME2Locator.java
index 72a5f73..c750448 100644
--- a/client/src/main/java/com/att/cadi/locator/DME2Locator.java
+++ b/client/src/main/java/com/att/cadi/locator/DME2Locator.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/client/src/main/java/com/att/cadi/locator/DNSLocator.java b/client/src/main/java/com/att/cadi/locator/DNSLocator.java
index 9fbf2d4..baa65ed 100644
--- a/client/src/main/java/com/att/cadi/locator/DNSLocator.java
+++ b/client/src/main/java/com/att/cadi/locator/DNSLocator.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/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java b/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java
index ecbdfaa..db95d91 100644
--- a/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.java
+++ b/client/src/main/java/com/att/cadi/locator/HClientHotPeerLocator.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/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java b/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java
index f8a1546..5b756b2 100644
--- a/client/src/main/java/com/att/cadi/locator/HotPeerLocator.java
+++ b/client/src/main/java/com/att/cadi/locator/HotPeerLocator.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/client/src/main/java/com/att/cadi/locator/PropertyLocator.java b/client/src/main/java/com/att/cadi/locator/PropertyLocator.java
index 011e42c..216be4f 100644
--- a/client/src/main/java/com/att/cadi/locator/PropertyLocator.java
+++ b/client/src/main/java/com/att/cadi/locator/PropertyLocator.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/client/src/main/java/com/att/cadi/routing/GreatCircle.java b/client/src/main/java/com/att/cadi/routing/GreatCircle.java
index 5a58920..8558f8e 100644
--- a/client/src/main/java/com/att/cadi/routing/GreatCircle.java
+++ b/client/src/main/java/com/att/cadi/routing/GreatCircle.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/client/src/test/java/com/client/test/BasicDME2Client.java b/client/src/test/java/com/client/test/BasicDME2Client.java
index a7b2f41..f26d3b1 100644
--- a/client/src/test/java/com/client/test/BasicDME2Client.java
+++ b/client/src/test/java/com/client/test/BasicDME2Client.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/client/src/test/java/com/client/test/JU_DNSLocator.java b/client/src/test/java/com/client/test/JU_DNSLocator.java
index fcd14c8..04a4f17 100644
--- a/client/src/test/java/com/client/test/JU_DNSLocator.java
+++ b/client/src/test/java/com/client/test/JU_DNSLocator.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/client/src/test/java/com/client/test/JU_PropertyLocator.java b/client/src/test/java/com/client/test/JU_PropertyLocator.java
index be8e587..89bef62 100644
--- a/client/src/test/java/com/client/test/JU_PropertyLocator.java
+++ b/client/src/test/java/com/client/test/JU_PropertyLocator.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/client/src/test/java/com/client/test/PaulUzee.java b/client/src/test/java/com/client/test/PaulUzee.java
index 6f82146..24aeb49 100644
--- a/client/src/test/java/com/client/test/PaulUzee.java
+++ b/client/src/test/java/com/client/test/PaulUzee.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/client/src/test/java/com/client/test/TestAccess.java b/client/src/test/java/com/client/test/TestAccess.java
index 3724f1b..434ae62 100644
--- a/client/src/test/java/com/client/test/TestAccess.java
+++ b/client/src/test/java/com/client/test/TestAccess.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/client/src/test/java/com/client/test/TestDME2Client.java b/client/src/test/java/com/client/test/TestDME2Client.java
index 5e5e822..415f992 100644
--- a/client/src/test/java/com/client/test/TestDME2Client.java
+++ b/client/src/test/java/com/client/test/TestDME2Client.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/client/src/test/java/com/client/test/TestDME2RcliClient.java b/client/src/test/java/com/client/test/TestDME2RcliClient.java
index 61bc76a..6ff5d6f 100644
--- a/client/src/test/java/com/client/test/TestDME2RcliClient.java
+++ b/client/src/test/java/com/client/test/TestDME2RcliClient.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/client/src/test/java/com/client/test/TestHClient.java b/client/src/test/java/com/client/test/TestHClient.java
index 0c6a162..7fcd113 100644
--- a/client/src/test/java/com/client/test/TestHClient.java
+++ b/client/src/test/java/com/client/test/TestHClient.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/core/.gitignore b/core/.gitignore
deleted file mode 100644
index cf85207..0000000
--- a/core/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/bin/
-/target/
-/.classpath
-/.project
-.settings
diff --git a/core/conf/cadi.properties b/core/conf/cadi.properties
index d60fc23..abc4800 100644
--- a/core/conf/cadi.properties
+++ b/core/conf/cadi.properties
@@ -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/core/pom.xml b/core/pom.xml
index 15c7e63..a42cc80 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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/core/src/assemble/cadi.xml b/core/src/assemble/cadi.xml
index 0bbb8e8..16394a0 100644
--- a/core/src/assemble/cadi.xml
+++ b/core/src/assemble/cadi.xml
@@ -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/core/src/assemble/poll.xml b/core/src/assemble/poll.xml
index c33dd83..c5735d6 100644
--- a/core/src/assemble/poll.xml
+++ b/core/src/assemble/poll.xml
@@ -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/core/src/main/java/com/att/cadi/AES.java b/core/src/main/java/com/att/cadi/AES.java
index 4041ae5..7304932 100644
--- a/core/src/main/java/com/att/cadi/AES.java
+++ b/core/src/main/java/com/att/cadi/AES.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/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java b/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java
index bb76e3d..f244d09 100644
--- a/core/src/main/java/com/att/cadi/AbsCachedPrincipal.java
+++ b/core/src/main/java/com/att/cadi/AbsCachedPrincipal.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/core/src/main/java/com/att/cadi/AbsUserCache.java b/core/src/main/java/com/att/cadi/AbsUserCache.java
index 0229a71..d374faa 100644
--- a/core/src/main/java/com/att/cadi/AbsUserCache.java
+++ b/core/src/main/java/com/att/cadi/AbsUserCache.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/core/src/main/java/com/att/cadi/Access.java b/core/src/main/java/com/att/cadi/Access.java
index 34ae9d4..4c238ee 100644
--- a/core/src/main/java/com/att/cadi/Access.java
+++ b/core/src/main/java/com/att/cadi/Access.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/core/src/main/java/com/att/cadi/BasicCred.java b/core/src/main/java/com/att/cadi/BasicCred.java
index f2411c4..6f0aff5 100644
--- a/core/src/main/java/com/att/cadi/BasicCred.java
+++ b/core/src/main/java/com/att/cadi/BasicCred.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/core/src/main/java/com/att/cadi/BufferedCadiWrap.java b/core/src/main/java/com/att/cadi/BufferedCadiWrap.java
index cc9b40d..74dd126 100644
--- a/core/src/main/java/com/att/cadi/BufferedCadiWrap.java
+++ b/core/src/main/java/com/att/cadi/BufferedCadiWrap.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/core/src/main/java/com/att/cadi/BufferedServletInputStream.java b/core/src/main/java/com/att/cadi/BufferedServletInputStream.java
index 88114b2..10e7b1f 100644
--- a/core/src/main/java/com/att/cadi/BufferedServletInputStream.java
+++ b/core/src/main/java/com/att/cadi/BufferedServletInputStream.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/core/src/main/java/com/att/cadi/CachedPrincipal.java b/core/src/main/java/com/att/cadi/CachedPrincipal.java
index 741d579..3968f1b 100644
--- a/core/src/main/java/com/att/cadi/CachedPrincipal.java
+++ b/core/src/main/java/com/att/cadi/CachedPrincipal.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/core/src/main/java/com/att/cadi/CachingLur.java b/core/src/main/java/com/att/cadi/CachingLur.java
index b7a194f..ee87431 100644
--- a/core/src/main/java/com/att/cadi/CachingLur.java
+++ b/core/src/main/java/com/att/cadi/CachingLur.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/core/src/main/java/com/att/cadi/CadiException.java b/core/src/main/java/com/att/cadi/CadiException.java
index 123b394..66b7b5b 100644
--- a/core/src/main/java/com/att/cadi/CadiException.java
+++ b/core/src/main/java/com/att/cadi/CadiException.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/core/src/main/java/com/att/cadi/CadiWrap.java b/core/src/main/java/com/att/cadi/CadiWrap.java
index 1961c6e..64c565f 100644
--- a/core/src/main/java/com/att/cadi/CadiWrap.java
+++ b/core/src/main/java/com/att/cadi/CadiWrap.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/core/src/main/java/com/att/cadi/Capacitor.java b/core/src/main/java/com/att/cadi/Capacitor.java
index 0745875..73fd83c 100644
--- a/core/src/main/java/com/att/cadi/Capacitor.java
+++ b/core/src/main/java/com/att/cadi/Capacitor.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/core/src/main/java/com/att/cadi/CmdLine.java b/core/src/main/java/com/att/cadi/CmdLine.java
index 2d19234..89685e2 100644
--- a/core/src/main/java/com/att/cadi/CmdLine.java
+++ b/core/src/main/java/com/att/cadi/CmdLine.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/core/src/main/java/com/att/cadi/Connector.java b/core/src/main/java/com/att/cadi/Connector.java
index 4f5576d..ab96010 100644
--- a/core/src/main/java/com/att/cadi/Connector.java
+++ b/core/src/main/java/com/att/cadi/Connector.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/core/src/main/java/com/att/cadi/CredVal.java b/core/src/main/java/com/att/cadi/CredVal.java
index 040781d..4fe0a28 100644
--- a/core/src/main/java/com/att/cadi/CredVal.java
+++ b/core/src/main/java/com/att/cadi/CredVal.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/core/src/main/java/com/att/cadi/GetCred.java b/core/src/main/java/com/att/cadi/GetCred.java
index f5289f0..d2c99f2 100644
--- a/core/src/main/java/com/att/cadi/GetCred.java
+++ b/core/src/main/java/com/att/cadi/GetCred.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/core/src/main/java/com/att/cadi/Hash.java b/core/src/main/java/com/att/cadi/Hash.java
index 190049f..b4e114f 100644
--- a/core/src/main/java/com/att/cadi/Hash.java
+++ b/core/src/main/java/com/att/cadi/Hash.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/core/src/main/java/com/att/cadi/Locator.java b/core/src/main/java/com/att/cadi/Locator.java
index a1593bb..ab1a7f9 100644
--- a/core/src/main/java/com/att/cadi/Locator.java
+++ b/core/src/main/java/com/att/cadi/Locator.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/core/src/main/java/com/att/cadi/LocatorException.java b/core/src/main/java/com/att/cadi/LocatorException.java
index b9260b9..9c3b804 100644
--- a/core/src/main/java/com/att/cadi/LocatorException.java
+++ b/core/src/main/java/com/att/cadi/LocatorException.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/core/src/main/java/com/att/cadi/Lur.java b/core/src/main/java/com/att/cadi/Lur.java
index 7ca94c9..d8ae6a3 100644
--- a/core/src/main/java/com/att/cadi/Lur.java
+++ b/core/src/main/java/com/att/cadi/Lur.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/core/src/main/java/com/att/cadi/Permission.java b/core/src/main/java/com/att/cadi/Permission.java
index b8cd56e..adb80a1 100644
--- a/core/src/main/java/com/att/cadi/Permission.java
+++ b/core/src/main/java/com/att/cadi/Permission.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/core/src/main/java/com/att/cadi/PropAccess.java b/core/src/main/java/com/att/cadi/PropAccess.java
index 25573a0..d7c9d99 100644
--- a/core/src/main/java/com/att/cadi/PropAccess.java
+++ b/core/src/main/java/com/att/cadi/PropAccess.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/core/src/main/java/com/att/cadi/Revalidator.java b/core/src/main/java/com/att/cadi/Revalidator.java
index ded7b2d..5d492aa 100644
--- a/core/src/main/java/com/att/cadi/Revalidator.java
+++ b/core/src/main/java/com/att/cadi/Revalidator.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/core/src/main/java/com/att/cadi/SLF4JAccess.java b/core/src/main/java/com/att/cadi/SLF4JAccess.java
index e3d8451..b222e35 100644
--- a/core/src/main/java/com/att/cadi/SLF4JAccess.java
+++ b/core/src/main/java/com/att/cadi/SLF4JAccess.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/core/src/main/java/com/att/cadi/SecuritySetter.java b/core/src/main/java/com/att/cadi/SecuritySetter.java
index dadbd06..295148f 100644
--- a/core/src/main/java/com/att/cadi/SecuritySetter.java
+++ b/core/src/main/java/com/att/cadi/SecuritySetter.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/core/src/main/java/com/att/cadi/ServletContextAccess.java b/core/src/main/java/com/att/cadi/ServletContextAccess.java
index 896f824..2d1cfa1 100644
--- a/core/src/main/java/com/att/cadi/ServletContextAccess.java
+++ b/core/src/main/java/com/att/cadi/ServletContextAccess.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/core/src/main/java/com/att/cadi/StrLur.java b/core/src/main/java/com/att/cadi/StrLur.java
index dc4c992..f191203 100644
--- a/core/src/main/java/com/att/cadi/StrLur.java
+++ b/core/src/main/java/com/att/cadi/StrLur.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/core/src/main/java/com/att/cadi/Symm.java b/core/src/main/java/com/att/cadi/Symm.java
index 0b34b58..1504c2d 100644
--- a/core/src/main/java/com/att/cadi/Symm.java
+++ b/core/src/main/java/com/att/cadi/Symm.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/core/src/main/java/com/att/cadi/Taf.java b/core/src/main/java/com/att/cadi/Taf.java
index 7ba6fb4..4017866 100644
--- a/core/src/main/java/com/att/cadi/Taf.java
+++ b/core/src/main/java/com/att/cadi/Taf.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/core/src/main/java/com/att/cadi/Transmutate.java b/core/src/main/java/com/att/cadi/Transmutate.java
index e392e86..1d6ff6f 100644
--- a/core/src/main/java/com/att/cadi/Transmutate.java
+++ b/core/src/main/java/com/att/cadi/Transmutate.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/core/src/main/java/com/att/cadi/TrustChecker.java b/core/src/main/java/com/att/cadi/TrustChecker.java
index 2cf2203..60b9a17 100644
--- a/core/src/main/java/com/att/cadi/TrustChecker.java
+++ b/core/src/main/java/com/att/cadi/TrustChecker.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/core/src/main/java/com/att/cadi/User.java b/core/src/main/java/com/att/cadi/User.java
index 6903cb3..bde3488 100644
--- a/core/src/main/java/com/att/cadi/User.java
+++ b/core/src/main/java/com/att/cadi/User.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/core/src/main/java/com/att/cadi/UserChain.java b/core/src/main/java/com/att/cadi/UserChain.java
index 90c47c1..df493c5 100644
--- a/core/src/main/java/com/att/cadi/UserChain.java
+++ b/core/src/main/java/com/att/cadi/UserChain.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/core/src/main/java/com/att/cadi/config/Config.java b/core/src/main/java/com/att/cadi/config/Config.java
index dd8e56d..ada6117 100644
--- a/core/src/main/java/com/att/cadi/config/Config.java
+++ b/core/src/main/java/com/att/cadi/config/Config.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/core/src/main/java/com/att/cadi/config/Get.java b/core/src/main/java/com/att/cadi/config/Get.java
index d6bb35b..7a2eab5 100644
--- a/core/src/main/java/com/att/cadi/config/Get.java
+++ b/core/src/main/java/com/att/cadi/config/Get.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/core/src/main/java/com/att/cadi/config/GetAccess.java b/core/src/main/java/com/att/cadi/config/GetAccess.java
index bdd6afd..1df9b0e 100644
--- a/core/src/main/java/com/att/cadi/config/GetAccess.java
+++ b/core/src/main/java/com/att/cadi/config/GetAccess.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/core/src/main/java/com/att/cadi/config/MultiGet.java b/core/src/main/java/com/att/cadi/config/MultiGet.java
index a304319..83cd21d 100644
--- a/core/src/main/java/com/att/cadi/config/MultiGet.java
+++ b/core/src/main/java/com/att/cadi/config/MultiGet.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/core/src/main/java/com/att/cadi/config/SecurityInfo.java b/core/src/main/java/com/att/cadi/config/SecurityInfo.java
index a1ef35b..6d0f3c2 100644
--- a/core/src/main/java/com/att/cadi/config/SecurityInfo.java
+++ b/core/src/main/java/com/att/cadi/config/SecurityInfo.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/core/src/main/java/com/att/cadi/config/SecurityInfoC.java b/core/src/main/java/com/att/cadi/config/SecurityInfoC.java
index 5e2fd54..2b0ec43 100644
--- a/core/src/main/java/com/att/cadi/config/SecurityInfoC.java
+++ b/core/src/main/java/com/att/cadi/config/SecurityInfoC.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/core/src/main/java/com/att/cadi/config/UsersDump.java b/core/src/main/java/com/att/cadi/config/UsersDump.java
index 7d47b7e..992b365 100644
--- a/core/src/main/java/com/att/cadi/config/UsersDump.java
+++ b/core/src/main/java/com/att/cadi/config/UsersDump.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/core/src/main/java/com/att/cadi/filter/AUTHZ.java b/core/src/main/java/com/att/cadi/filter/AUTHZ.java
index 8f33105..ab32a98 100644
--- a/core/src/main/java/com/att/cadi/filter/AUTHZ.java
+++ b/core/src/main/java/com/att/cadi/filter/AUTHZ.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/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java b/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java
index dab6b47..c1ad627 100644
--- a/core/src/main/java/com/att/cadi/filter/AUTHZServlet.java
+++ b/core/src/main/java/com/att/cadi/filter/AUTHZServlet.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/core/src/main/java/com/att/cadi/filter/AccessGetter.java b/core/src/main/java/com/att/cadi/filter/AccessGetter.java
index a36b7c7..37d2c04 100644
--- a/core/src/main/java/com/att/cadi/filter/AccessGetter.java
+++ b/core/src/main/java/com/att/cadi/filter/AccessGetter.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/core/src/main/java/com/att/cadi/filter/CadiAccess.java b/core/src/main/java/com/att/cadi/filter/CadiAccess.java
index c7a9250..e9bc5a8 100644
--- a/core/src/main/java/com/att/cadi/filter/CadiAccess.java
+++ b/core/src/main/java/com/att/cadi/filter/CadiAccess.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/core/src/main/java/com/att/cadi/filter/CadiFilter.java b/core/src/main/java/com/att/cadi/filter/CadiFilter.java
index 578cbba..da24f44 100644
--- a/core/src/main/java/com/att/cadi/filter/CadiFilter.java
+++ b/core/src/main/java/com/att/cadi/filter/CadiFilter.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/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java b/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java
index 821dae9..6969b8c 100644
--- a/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.java
+++ b/core/src/main/java/com/att/cadi/filter/CadiHTTPManip.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/core/src/main/java/com/att/cadi/filter/FCGet.java b/core/src/main/java/com/att/cadi/filter/FCGet.java
index 97840d4..b8f95da 100644
--- a/core/src/main/java/com/att/cadi/filter/FCGet.java
+++ b/core/src/main/java/com/att/cadi/filter/FCGet.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/core/src/main/java/com/att/cadi/filter/MapPermConverter.java b/core/src/main/java/com/att/cadi/filter/MapPermConverter.java
index 19aeb18..09b6f93 100644
--- a/core/src/main/java/com/att/cadi/filter/MapPermConverter.java
+++ b/core/src/main/java/com/att/cadi/filter/MapPermConverter.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/core/src/main/java/com/att/cadi/filter/NullPermConverter.java b/core/src/main/java/com/att/cadi/filter/NullPermConverter.java
index 07c565d..d73008e 100644
--- a/core/src/main/java/com/att/cadi/filter/NullPermConverter.java
+++ b/core/src/main/java/com/att/cadi/filter/NullPermConverter.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/core/src/main/java/com/att/cadi/filter/PathFilter.java b/core/src/main/java/com/att/cadi/filter/PathFilter.java
index 3ea6536..328977d 100644
--- a/core/src/main/java/com/att/cadi/filter/PathFilter.java
+++ b/core/src/main/java/com/att/cadi/filter/PathFilter.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/core/src/main/java/com/att/cadi/filter/PermConverter.java b/core/src/main/java/com/att/cadi/filter/PermConverter.java
index e5bfcb7..ba098c4 100644
--- a/core/src/main/java/com/att/cadi/filter/PermConverter.java
+++ b/core/src/main/java/com/att/cadi/filter/PermConverter.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/core/src/main/java/com/att/cadi/filter/RolesAllowed.java b/core/src/main/java/com/att/cadi/filter/RolesAllowed.java
index ec350fd..97a8f54 100644
--- a/core/src/main/java/com/att/cadi/filter/RolesAllowed.java
+++ b/core/src/main/java/com/att/cadi/filter/RolesAllowed.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/core/src/main/java/com/att/cadi/filter/ServletImpl.java b/core/src/main/java/com/att/cadi/filter/ServletImpl.java
index 3db6d4e..13a251c 100644
--- a/core/src/main/java/com/att/cadi/filter/ServletImpl.java
+++ b/core/src/main/java/com/att/cadi/filter/ServletImpl.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/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java b/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java
index 03a7961..443d7e7 100644
--- a/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.java
+++ b/core/src/main/java/com/att/cadi/lur/ConfigPrincipal.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/core/src/main/java/com/att/cadi/lur/EpiLur.java b/core/src/main/java/com/att/cadi/lur/EpiLur.java
index de6c057..1eff70e 100644
--- a/core/src/main/java/com/att/cadi/lur/EpiLur.java
+++ b/core/src/main/java/com/att/cadi/lur/EpiLur.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/core/src/main/java/com/att/cadi/lur/LocalLur.java b/core/src/main/java/com/att/cadi/lur/LocalLur.java
index 80b302a..5980769 100644
--- a/core/src/main/java/com/att/cadi/lur/LocalLur.java
+++ b/core/src/main/java/com/att/cadi/lur/LocalLur.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/core/src/main/java/com/att/cadi/lur/LocalPermission.java b/core/src/main/java/com/att/cadi/lur/LocalPermission.java
index 8fdaec2..b44f840 100644
--- a/core/src/main/java/com/att/cadi/lur/LocalPermission.java
+++ b/core/src/main/java/com/att/cadi/lur/LocalPermission.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/core/src/main/java/com/att/cadi/lur/NullLur.java b/core/src/main/java/com/att/cadi/lur/NullLur.java
index 91fb7bb..7b01f5a 100644
--- a/core/src/main/java/com/att/cadi/lur/NullLur.java
+++ b/core/src/main/java/com/att/cadi/lur/NullLur.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/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java b/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java
index 58f7d71..800628d 100644
--- a/core/src/main/java/com/att/cadi/principal/BasicPrincipal.java
+++ b/core/src/main/java/com/att/cadi/principal/BasicPrincipal.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/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java b/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java
index 11bc22a..0d215a5 100644
--- a/core/src/main/java/com/att/cadi/principal/BearerPrincipal.java
+++ b/core/src/main/java/com/att/cadi/principal/BearerPrincipal.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/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java b/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java
index 36c75b8..e3ccb42 100644
--- a/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.java
+++ b/core/src/main/java/com/att/cadi/principal/CSPPrincipal_T.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/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java b/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java
index 37c6a83..de1ebaf 100644
--- a/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.java
+++ b/core/src/main/java/com/att/cadi/principal/CachedBasicPrincipal.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/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java b/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java
index aa610d3..e2a6400 100644
--- a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.java
+++ b/core/src/main/java/com/att/cadi/principal/TGuardPrincipal.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/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java b/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java
index 97907ac..cfd8564 100644
--- a/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.java
+++ b/core/src/main/java/com/att/cadi/principal/TGuardPrincipal_T.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/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java b/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java
index 67b76c6..744560f 100644
--- a/core/src/main/java/com/att/cadi/principal/TrustPrincipal.java
+++ b/core/src/main/java/com/att/cadi/principal/TrustPrincipal.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/core/src/main/java/com/att/cadi/principal/X509Principal.java b/core/src/main/java/com/att/cadi/principal/X509Principal.java
index 8e17033..89a8dc2 100644
--- a/core/src/main/java/com/att/cadi/principal/X509Principal.java
+++ b/core/src/main/java/com/att/cadi/principal/X509Principal.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/core/src/main/java/com/att/cadi/taf/AbsTafResp.java b/core/src/main/java/com/att/cadi/taf/AbsTafResp.java
index 94d2e5d..f57b975 100644
--- a/core/src/main/java/com/att/cadi/taf/AbsTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/AbsTafResp.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/core/src/main/java/com/att/cadi/taf/EpiTaf.java b/core/src/main/java/com/att/cadi/taf/EpiTaf.java
index d3f5493..613f317 100644
--- a/core/src/main/java/com/att/cadi/taf/EpiTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/EpiTaf.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/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java b/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java
index 7f6d9af..3036f07 100644
--- a/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/HttpEpiTaf.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/core/src/main/java/com/att/cadi/taf/HttpTaf.java b/core/src/main/java/com/att/cadi/taf/HttpTaf.java
index 4270a81..ad22872 100644
--- a/core/src/main/java/com/att/cadi/taf/HttpTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/HttpTaf.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/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java b/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java
index d9da3fa..8a6acad 100644
--- a/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/LoginPageTafResp.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/core/src/main/java/com/att/cadi/taf/NullTaf.java b/core/src/main/java/com/att/cadi/taf/NullTaf.java
index ec4a15b..0a6f4bb 100644
--- a/core/src/main/java/com/att/cadi/taf/NullTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/NullTaf.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/core/src/main/java/com/att/cadi/taf/NullTafResp.java b/core/src/main/java/com/att/cadi/taf/NullTafResp.java
index c95b195..8dcfc1e 100644
--- a/core/src/main/java/com/att/cadi/taf/NullTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/NullTafResp.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/core/src/main/java/com/att/cadi/taf/PuntTafResp.java b/core/src/main/java/com/att/cadi/taf/PuntTafResp.java
index d9f9b67..8951145 100644
--- a/core/src/main/java/com/att/cadi/taf/PuntTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/PuntTafResp.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/core/src/main/java/com/att/cadi/taf/Redirectable.java b/core/src/main/java/com/att/cadi/taf/Redirectable.java
index e83e7ce..4ef31bc 100644
--- a/core/src/main/java/com/att/cadi/taf/Redirectable.java
+++ b/core/src/main/java/com/att/cadi/taf/Redirectable.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/core/src/main/java/com/att/cadi/taf/TafResp.java b/core/src/main/java/com/att/cadi/taf/TafResp.java
index 3a1a6f4..140ac13 100644
--- a/core/src/main/java/com/att/cadi/taf/TafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/TafResp.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/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java b/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java
index 127450c..29a299f 100644
--- a/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/TrustNotTafResp.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/core/src/main/java/com/att/cadi/taf/TrustTafResp.java b/core/src/main/java/com/att/cadi/taf/TrustTafResp.java
index 27c6034..25c665b 100644
--- a/core/src/main/java/com/att/cadi/taf/TrustTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/TrustTafResp.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/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java b/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java
index 672c463..f954a00 100644
--- a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTaf.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/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java b/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java
index c768587..1d43054 100644
--- a/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/basic/BasicHttpTafResp.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/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java b/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java
index 6e46481..5d9624a 100644
--- a/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.java
+++ b/core/src/main/java/com/att/cadi/taf/cert/CertIdentity.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/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java b/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java
index 3435d52..8148a4e 100644
--- a/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/cert/X509HttpTafResp.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/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java b/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java
index cb93046..6bef245 100644
--- a/core/src/main/java/com/att/cadi/taf/cert/X509Taf.java
+++ b/core/src/main/java/com/att/cadi/taf/cert/X509Taf.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/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java b/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java
index 88a6721..6bb9252 100644
--- a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTaf.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/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java b/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java
index 7cbbf73..1b4efed 100644
--- a/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/dos/DenialOfServiceTafResp.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/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java b/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java
index 89500a6..67754a9 100644
--- a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.java
+++ b/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTaf.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/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java b/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java
index 29ddf92..2a074d1 100644
--- a/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.java
+++ b/core/src/main/java/com/att/cadi/taf/localhost/LocalhostTafResp.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/core/src/main/java/com/att/cadi/util/Chmod.java b/core/src/main/java/com/att/cadi/util/Chmod.java
index 9991616..ddde50b 100644
--- a/core/src/main/java/com/att/cadi/util/Chmod.java
+++ b/core/src/main/java/com/att/cadi/util/Chmod.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/core/src/main/java/com/att/cadi/util/JsonOutputStream.java b/core/src/main/java/com/att/cadi/util/JsonOutputStream.java
index f85efa4..33deed0 100644
--- a/core/src/main/java/com/att/cadi/util/JsonOutputStream.java
+++ b/core/src/main/java/com/att/cadi/util/JsonOutputStream.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/core/src/main/java/com/att/cadi/util/MaskFormatException.java b/core/src/main/java/com/att/cadi/util/MaskFormatException.java
index 7a8c773..fa3f220 100644
--- a/core/src/main/java/com/att/cadi/util/MaskFormatException.java
+++ b/core/src/main/java/com/att/cadi/util/MaskFormatException.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/core/src/main/java/com/att/cadi/util/MyConsole.java b/core/src/main/java/com/att/cadi/util/MyConsole.java
index eb148ee..4083dea 100644
--- a/core/src/main/java/com/att/cadi/util/MyConsole.java
+++ b/core/src/main/java/com/att/cadi/util/MyConsole.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/core/src/main/java/com/att/cadi/util/NetMask.java b/core/src/main/java/com/att/cadi/util/NetMask.java
index befed88..9707047 100644
--- a/core/src/main/java/com/att/cadi/util/NetMask.java
+++ b/core/src/main/java/com/att/cadi/util/NetMask.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/core/src/main/java/com/att/cadi/util/Split.java b/core/src/main/java/com/att/cadi/util/Split.java
index 4a695fb..07332dd 100644
--- a/core/src/main/java/com/att/cadi/util/Split.java
+++ b/core/src/main/java/com/att/cadi/util/Split.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/core/src/main/java/com/att/cadi/util/SubStandardConsole.java b/core/src/main/java/com/att/cadi/util/SubStandardConsole.java
index 3d57332..8a44568 100644
--- a/core/src/main/java/com/att/cadi/util/SubStandardConsole.java
+++ b/core/src/main/java/com/att/cadi/util/SubStandardConsole.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/core/src/main/java/com/att/cadi/util/TheConsole.java b/core/src/main/java/com/att/cadi/util/TheConsole.java
index 60f3f79..05fcd9b 100644
--- a/core/src/main/java/com/att/cadi/util/TheConsole.java
+++ b/core/src/main/java/com/att/cadi/util/TheConsole.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/core/src/main/java/com/att/cadi/util/UserChainManip.java b/core/src/main/java/com/att/cadi/util/UserChainManip.java
index 89851aa..9f6eeec 100644
--- a/core/src/main/java/com/att/cadi/util/UserChainManip.java
+++ b/core/src/main/java/com/att/cadi/util/UserChainManip.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/core/src/main/java/com/att/cadi/util/Vars.java b/core/src/main/java/com/att/cadi/util/Vars.java
index b712e31..8d0b27e 100644
--- a/core/src/main/java/com/att/cadi/util/Vars.java
+++ b/core/src/main/java/com/att/cadi/util/Vars.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/core/src/main/java/com/att/cadi/wsse/Action.java b/core/src/main/java/com/att/cadi/wsse/Action.java
index a9b171c..0ed99c0 100644
--- a/core/src/main/java/com/att/cadi/wsse/Action.java
+++ b/core/src/main/java/com/att/cadi/wsse/Action.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/core/src/main/java/com/att/cadi/wsse/Match.java b/core/src/main/java/com/att/cadi/wsse/Match.java
index 657976a..e1c1078 100644
--- a/core/src/main/java/com/att/cadi/wsse/Match.java
+++ b/core/src/main/java/com/att/cadi/wsse/Match.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/core/src/main/java/com/att/cadi/wsse/WSSEParser.java b/core/src/main/java/com/att/cadi/wsse/WSSEParser.java
index dd8af4d..4c7ba90 100644
--- a/core/src/main/java/com/att/cadi/wsse/WSSEParser.java
+++ b/core/src/main/java/com/att/cadi/wsse/WSSEParser.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/core/src/main/java/com/att/cadi/wsse/XEvent.java b/core/src/main/java/com/att/cadi/wsse/XEvent.java
index d023519..51a2734 100644
--- a/core/src/main/java/com/att/cadi/wsse/XEvent.java
+++ b/core/src/main/java/com/att/cadi/wsse/XEvent.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/core/src/main/java/com/att/cadi/wsse/XReader.java b/core/src/main/java/com/att/cadi/wsse/XReader.java
index 135b28c..833eb60 100644
--- a/core/src/main/java/com/att/cadi/wsse/XReader.java
+++ b/core/src/main/java/com/att/cadi/wsse/XReader.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/core/src/test/java/com/att/cadi/JU_AES.java b/core/src/test/java/com/att/cadi/JU_AES.java
index 2143e5b..fb2482a 100644
--- a/core/src/test/java/com/att/cadi/JU_AES.java
+++ b/core/src/test/java/com/att/cadi/JU_AES.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/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java b/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java
index a4ada86..f11c74d 100644
--- a/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.java
+++ b/core/src/test/java/com/att/cadi/lur/test/JU_LocalLur.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/core/src/test/java/com/att/cadi/lur/test/TestAccess.java b/core/src/test/java/com/att/cadi/lur/test/TestAccess.java
index f8e911c..81d5092 100644
--- a/core/src/test/java/com/att/cadi/lur/test/TestAccess.java
+++ b/core/src/test/java/com/att/cadi/lur/test/TestAccess.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/core/src/test/java/com/att/cadi/test/JU_Base64.java b/core/src/test/java/com/att/cadi/test/JU_Base64.java
index fdafb84..1a82298 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Base64.java
+++ b/core/src/test/java/com/att/cadi/test/JU_Base64.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/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java b/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java
index c30d944..5f299bb 100644
--- a/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.java
+++ b/core/src/test/java/com/att/cadi/test/JU_BufferedServletInputStream.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/core/src/test/java/com/att/cadi/test/JU_Capacitor.java b/core/src/test/java/com/att/cadi/test/JU_Capacitor.java
index c3f6d77..5584911 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Capacitor.java
+++ b/core/src/test/java/com/att/cadi/test/JU_Capacitor.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/core/src/test/java/com/att/cadi/test/JU_Hash.java b/core/src/test/java/com/att/cadi/test/JU_Hash.java
index 85e4209..e5d2d6b 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Hash.java
+++ b/core/src/test/java/com/att/cadi/test/JU_Hash.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/core/src/test/java/com/att/cadi/test/JU_Passcode.java b/core/src/test/java/com/att/cadi/test/JU_Passcode.java
index 68c7dc8..122ecf7 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Passcode.java
+++ b/core/src/test/java/com/att/cadi/test/JU_Passcode.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/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java b/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java
index 40b9266..65f5ebd 100644
--- a/core/src/test/java/com/att/cadi/test/JU_UserChainManip.java
+++ b/core/src/test/java/com/att/cadi/test/JU_UserChainManip.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/core/src/test/java/com/att/cadi/test/JU_Vars.java b/core/src/test/java/com/att/cadi/test/JU_Vars.java
index daf2c0f..e681622 100644
--- a/core/src/test/java/com/att/cadi/test/JU_Vars.java
+++ b/core/src/test/java/com/att/cadi/test/JU_Vars.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/core/src/test/java/com/att/cadi/test/Test.java b/core/src/test/java/com/att/cadi/test/Test.java
index 53729b4..4fe9111 100644
--- a/core/src/test/java/com/att/cadi/test/Test.java
+++ b/core/src/test/java/com/att/cadi/test/Test.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/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java b/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java
index a262780..65338ae 100644
--- a/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.java
+++ b/core/src/test/java/com/att/cadi/wsse/test/JU_WSSE_Read.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/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java b/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java
index 7f38d94..ee69561 100644
--- a/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.java
+++ b/core/src/test/java/com/att/cadi/wsse/test/JU_XReader.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.
-- 
cgit 1.2.3-korg