From c548cc96e7cf048894686a12dce8d77111378317 Mon Sep 17 00:00:00 2001
From: sg481n <sg481n@att.com>
Date: Wed, 9 Aug 2017 23:25:05 -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: I07906b48431c94131ec95dad79a42fb9b6399382
Signed-off-by: sg481n <sg481n@att.com>
---
 authz-core/.gitignore                                                | 5 -----
 authz-core/pom.xml                                                   | 3 +--
 authz-core/src/main/java/com/att/authz/common/Define.java            | 3 +--
 authz-core/src/main/java/com/att/authz/env/AuthzEnv.java             | 3 +--
 authz-core/src/main/java/com/att/authz/env/AuthzTrans.java           | 3 +--
 authz-core/src/main/java/com/att/authz/env/AuthzTransFilter.java     | 3 +--
 authz-core/src/main/java/com/att/authz/env/AuthzTransImpl.java       | 3 +--
 authz-core/src/main/java/com/att/authz/env/AuthzTransOnlyFilter.java | 3 +--
 authz-core/src/main/java/com/att/authz/env/NullTrans.java            | 3 +--
 authz-core/src/main/java/com/att/authz/layer/FacadeImpl.java         | 3 +--
 authz-core/src/main/java/com/att/authz/layer/Result.java             | 3 +--
 authz-core/src/main/java/com/att/authz/local/AbsData.java            | 3 +--
 authz-core/src/main/java/com/att/authz/local/DataFile.java           | 3 +--
 authz-core/src/main/java/com/att/authz/local/TextIndex.java          | 3 +--
 authz-core/src/main/java/com/att/authz/org/EmailWarnings.java        | 3 +--
 authz-core/src/main/java/com/att/authz/org/Executor.java             | 3 +--
 authz-core/src/main/java/com/att/authz/org/Organization.java         | 3 +--
 .../src/main/java/com/att/authz/org/OrganizationException.java       | 3 +--
 authz-core/src/main/java/com/att/authz/org/OrganizationFactory.java  | 3 +--
 authz-core/src/main/java/com/att/authz/server/AbsServer.java         | 3 +--
 authz-core/src/main/java/com/att/cache/Cache.java                    | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/Acceptor.java            | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/CachingFileAccess.java   | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/CodeSetter.java          | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/Content.java             | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/HttpCode.java            | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/HttpMethods.java         | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/Match.java               | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/Pair.java                | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/RServlet.java            | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/Route.java               | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/RouteReport.java         | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/Routes.java              | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/TransFilter.java         | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/TransOnlyFilter.java     | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/TypedCode.java           | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/Version.java             | 3 +--
 authz-core/src/main/java/com/att/cssa/rserv/doc/ApiDoc.java          | 3 +--
 authz-core/src/test/java/com/att/authz/common/JU_Define.java         | 3 +--
 authz-core/src/test/java/com/att/authz/env/JU_AuthzEnv.java          | 3 +--
 authz-core/src/test/java/com/att/authz/env/JU_AuthzTransFilter.java  | 3 +--
 authz-core/src/test/java/com/att/authz/env/JU_AuthzTransImpl.java    | 3 +--
 .../src/test/java/com/att/authz/env/JU_AuthzTransOnlyFilter.java     | 3 +--
 authz-core/src/test/java/com/att/authz/env/JU_NullTrans.java         | 3 +--
 authz-core/src/test/java/com/att/authz/layer/JU_Result.java          | 3 +--
 authz-core/src/test/java/com/att/authz/local/JU_DataFile.java        | 3 +--
 authz-core/src/test/java/com/att/authz/local/JU_TextIndex.java       | 3 +--
 .../src/test/java/com/att/authz/org/JU_OrganizationException.java    | 3 +--
 .../src/test/java/com/att/authz/org/JU_OrganizationFactory.java      | 3 +--
 .../src/test/java/com/att/cssa/rserv/JU_CachingFileAccess.java       | 3 +--
 authz-core/src/test/java/com/att/cssa/rserv/JU_CodeSetter.java       | 3 +--
 authz-core/src/test/java/com/att/cssa/rserv/JU_Pair.java             | 3 +--
 authz-core/src/test/java/com/att/cssa/rserv/JU_Routes.java           | 3 +--
 authz-core/src/test/java/com/att/cssa/rserv/JU_TypedCode.java        | 3 +--
 authz-core/src/test/java/com/att/cssa/rserv/JU_Version.java          | 3 +--
 authz-core/src/test/java/com/att/cssa/rserv/test/JU_BetterMatch.java | 3 +--
 authz-core/src/test/java/com/att/cssa/rserv/test/JU_Content.java     | 3 +--
 57 files changed, 56 insertions(+), 117 deletions(-)
 delete mode 100644 authz-core/.gitignore

(limited to 'authz-core')

diff --git a/authz-core/.gitignore b/authz-core/.gitignore
deleted file mode 100644
index f99ab6a2..00000000
--- a/authz-core/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-core/pom.xml b/authz-core/pom.xml
index 7120f350..10a47f2b 100644
--- a/authz-core/pom.xml
+++ b/authz-core/pom.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START====================================================
-  * org.onap.aai
+  * org.onap.aaf
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  * Copyright © 2017 Amdocs
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/common/Define.java b/authz-core/src/main/java/com/att/authz/common/Define.java
index 747ab508..58f6d9a8 100644
--- a/authz-core/src/main/java/com/att/authz/common/Define.java
+++ b/authz-core/src/main/java/com/att/authz/common/Define.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/env/AuthzEnv.java b/authz-core/src/main/java/com/att/authz/env/AuthzEnv.java
index b5015b0c..caae1143 100644
--- a/authz-core/src/main/java/com/att/authz/env/AuthzEnv.java
+++ b/authz-core/src/main/java/com/att/authz/env/AuthzEnv.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/env/AuthzTrans.java b/authz-core/src/main/java/com/att/authz/env/AuthzTrans.java
index 129ddddc..b835d64b 100644
--- a/authz-core/src/main/java/com/att/authz/env/AuthzTrans.java
+++ b/authz-core/src/main/java/com/att/authz/env/AuthzTrans.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/env/AuthzTransFilter.java b/authz-core/src/main/java/com/att/authz/env/AuthzTransFilter.java
index 46bec117..a546af7a 100644
--- a/authz-core/src/main/java/com/att/authz/env/AuthzTransFilter.java
+++ b/authz-core/src/main/java/com/att/authz/env/AuthzTransFilter.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/env/AuthzTransImpl.java b/authz-core/src/main/java/com/att/authz/env/AuthzTransImpl.java
index 77f94a41..68597886 100644
--- a/authz-core/src/main/java/com/att/authz/env/AuthzTransImpl.java
+++ b/authz-core/src/main/java/com/att/authz/env/AuthzTransImpl.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/env/AuthzTransOnlyFilter.java b/authz-core/src/main/java/com/att/authz/env/AuthzTransOnlyFilter.java
index ecc95774..bec92318 100644
--- a/authz-core/src/main/java/com/att/authz/env/AuthzTransOnlyFilter.java
+++ b/authz-core/src/main/java/com/att/authz/env/AuthzTransOnlyFilter.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/env/NullTrans.java b/authz-core/src/main/java/com/att/authz/env/NullTrans.java
index b65994b6..1158ad4c 100644
--- a/authz-core/src/main/java/com/att/authz/env/NullTrans.java
+++ b/authz-core/src/main/java/com/att/authz/env/NullTrans.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/layer/FacadeImpl.java b/authz-core/src/main/java/com/att/authz/layer/FacadeImpl.java
index 07394454..6e657e54 100644
--- a/authz-core/src/main/java/com/att/authz/layer/FacadeImpl.java
+++ b/authz-core/src/main/java/com/att/authz/layer/FacadeImpl.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/layer/Result.java b/authz-core/src/main/java/com/att/authz/layer/Result.java
index 1af9a26b..29344914 100644
--- a/authz-core/src/main/java/com/att/authz/layer/Result.java
+++ b/authz-core/src/main/java/com/att/authz/layer/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/authz-core/src/main/java/com/att/authz/local/AbsData.java b/authz-core/src/main/java/com/att/authz/local/AbsData.java
index cc00efff..69d6d698 100644
--- a/authz-core/src/main/java/com/att/authz/local/AbsData.java
+++ b/authz-core/src/main/java/com/att/authz/local/AbsData.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/local/DataFile.java b/authz-core/src/main/java/com/att/authz/local/DataFile.java
index a54e8563..1513c583 100644
--- a/authz-core/src/main/java/com/att/authz/local/DataFile.java
+++ b/authz-core/src/main/java/com/att/authz/local/DataFile.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/local/TextIndex.java b/authz-core/src/main/java/com/att/authz/local/TextIndex.java
index a6899642..83043299 100644
--- a/authz-core/src/main/java/com/att/authz/local/TextIndex.java
+++ b/authz-core/src/main/java/com/att/authz/local/TextIndex.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/org/EmailWarnings.java b/authz-core/src/main/java/com/att/authz/org/EmailWarnings.java
index 0f87eb21..20738005 100644
--- a/authz-core/src/main/java/com/att/authz/org/EmailWarnings.java
+++ b/authz-core/src/main/java/com/att/authz/org/EmailWarnings.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/org/Executor.java b/authz-core/src/main/java/com/att/authz/org/Executor.java
index dcdf6462..c3c0e407 100644
--- a/authz-core/src/main/java/com/att/authz/org/Executor.java
+++ b/authz-core/src/main/java/com/att/authz/org/Executor.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/org/Organization.java b/authz-core/src/main/java/com/att/authz/org/Organization.java
index e8938cdc..4163e3c0 100644
--- a/authz-core/src/main/java/com/att/authz/org/Organization.java
+++ b/authz-core/src/main/java/com/att/authz/org/Organization.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/org/OrganizationException.java b/authz-core/src/main/java/com/att/authz/org/OrganizationException.java
index a3928fb9..14be05ba 100644
--- a/authz-core/src/main/java/com/att/authz/org/OrganizationException.java
+++ b/authz-core/src/main/java/com/att/authz/org/OrganizationException.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/org/OrganizationFactory.java b/authz-core/src/main/java/com/att/authz/org/OrganizationFactory.java
index c97111e9..81f53762 100644
--- a/authz-core/src/main/java/com/att/authz/org/OrganizationFactory.java
+++ b/authz-core/src/main/java/com/att/authz/org/OrganizationFactory.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/authz/server/AbsServer.java b/authz-core/src/main/java/com/att/authz/server/AbsServer.java
index aa935d09..75db79ba 100644
--- a/authz-core/src/main/java/com/att/authz/server/AbsServer.java
+++ b/authz-core/src/main/java/com/att/authz/server/AbsServer.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cache/Cache.java b/authz-core/src/main/java/com/att/cache/Cache.java
index 2930e09c..74b15771 100644
--- a/authz-core/src/main/java/com/att/cache/Cache.java
+++ b/authz-core/src/main/java/com/att/cache/Cache.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/Acceptor.java b/authz-core/src/main/java/com/att/cssa/rserv/Acceptor.java
index ea2850aa..6b6399d3 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Acceptor.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Acceptor.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/CachingFileAccess.java b/authz-core/src/main/java/com/att/cssa/rserv/CachingFileAccess.java
index 80de2692..29328fb7 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/CachingFileAccess.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/CachingFileAccess.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/CodeSetter.java b/authz-core/src/main/java/com/att/cssa/rserv/CodeSetter.java
index 01ecf38d..f4108bb7 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/CodeSetter.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/CodeSetter.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/Content.java b/authz-core/src/main/java/com/att/cssa/rserv/Content.java
index fd6c8a58..f58cd42e 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Content.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/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/authz-core/src/main/java/com/att/cssa/rserv/HttpCode.java b/authz-core/src/main/java/com/att/cssa/rserv/HttpCode.java
index ca078431..72213f38 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/HttpCode.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/HttpCode.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/HttpMethods.java b/authz-core/src/main/java/com/att/cssa/rserv/HttpMethods.java
index c247aad0..0aa053f8 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/HttpMethods.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/HttpMethods.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/Match.java b/authz-core/src/main/java/com/att/cssa/rserv/Match.java
index 1f5a60f5..5c40df5a 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Match.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/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/authz-core/src/main/java/com/att/cssa/rserv/Pair.java b/authz-core/src/main/java/com/att/cssa/rserv/Pair.java
index 7d3b88c6..8291dc78 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Pair.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Pair.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/RServlet.java b/authz-core/src/main/java/com/att/cssa/rserv/RServlet.java
index ed116e64..330dffb5 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/RServlet.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/RServlet.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/Route.java b/authz-core/src/main/java/com/att/cssa/rserv/Route.java
index 0a8cffe0..644ee72e 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Route.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Route.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/RouteReport.java b/authz-core/src/main/java/com/att/cssa/rserv/RouteReport.java
index 6dee8d32..7093407f 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/RouteReport.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/RouteReport.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/Routes.java b/authz-core/src/main/java/com/att/cssa/rserv/Routes.java
index c2d7fb82..e7d559bd 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Routes.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Routes.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/TransFilter.java b/authz-core/src/main/java/com/att/cssa/rserv/TransFilter.java
index 244609bc..8d045be9 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/TransFilter.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/TransFilter.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/TransOnlyFilter.java b/authz-core/src/main/java/com/att/cssa/rserv/TransOnlyFilter.java
index 1ef5456a..c2b37caa 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/TransOnlyFilter.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/TransOnlyFilter.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/TypedCode.java b/authz-core/src/main/java/com/att/cssa/rserv/TypedCode.java
index 6fd7049a..5094e08e 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/TypedCode.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/TypedCode.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/Version.java b/authz-core/src/main/java/com/att/cssa/rserv/Version.java
index e24c48eb..183d3beb 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/Version.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/Version.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/main/java/com/att/cssa/rserv/doc/ApiDoc.java b/authz-core/src/main/java/com/att/cssa/rserv/doc/ApiDoc.java
index 76e589a9..5e254dfd 100644
--- a/authz-core/src/main/java/com/att/cssa/rserv/doc/ApiDoc.java
+++ b/authz-core/src/main/java/com/att/cssa/rserv/doc/ApiDoc.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/authz/common/JU_Define.java b/authz-core/src/test/java/com/att/authz/common/JU_Define.java
index af0cd267..92da6ead 100644
--- a/authz-core/src/test/java/com/att/authz/common/JU_Define.java
+++ b/authz-core/src/test/java/com/att/authz/common/JU_Define.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/authz/env/JU_AuthzEnv.java b/authz-core/src/test/java/com/att/authz/env/JU_AuthzEnv.java
index bda84f0b..1c63915d 100644
--- a/authz-core/src/test/java/com/att/authz/env/JU_AuthzEnv.java
+++ b/authz-core/src/test/java/com/att/authz/env/JU_AuthzEnv.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransFilter.java b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransFilter.java
index c00ff684..b6d04906 100644
--- a/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransFilter.java
+++ b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransFilter.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransImpl.java b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransImpl.java
index f9a934e0..dbee3fa1 100644
--- a/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransImpl.java
+++ b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransImpl.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransOnlyFilter.java b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransOnlyFilter.java
index 640fbdca..f5f33dd6 100644
--- a/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransOnlyFilter.java
+++ b/authz-core/src/test/java/com/att/authz/env/JU_AuthzTransOnlyFilter.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/authz/env/JU_NullTrans.java b/authz-core/src/test/java/com/att/authz/env/JU_NullTrans.java
index 7853a205..6cb56450 100644
--- a/authz-core/src/test/java/com/att/authz/env/JU_NullTrans.java
+++ b/authz-core/src/test/java/com/att/authz/env/JU_NullTrans.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/authz/layer/JU_Result.java b/authz-core/src/test/java/com/att/authz/layer/JU_Result.java
index 8bebfa7d..415aee62 100644
--- a/authz-core/src/test/java/com/att/authz/layer/JU_Result.java
+++ b/authz-core/src/test/java/com/att/authz/layer/JU_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/authz-core/src/test/java/com/att/authz/local/JU_DataFile.java b/authz-core/src/test/java/com/att/authz/local/JU_DataFile.java
index 27c7ad60..40e0400e 100644
--- a/authz-core/src/test/java/com/att/authz/local/JU_DataFile.java
+++ b/authz-core/src/test/java/com/att/authz/local/JU_DataFile.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/authz/local/JU_TextIndex.java b/authz-core/src/test/java/com/att/authz/local/JU_TextIndex.java
index be0746bd..df6a8d28 100644
--- a/authz-core/src/test/java/com/att/authz/local/JU_TextIndex.java
+++ b/authz-core/src/test/java/com/att/authz/local/JU_TextIndex.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/authz/org/JU_OrganizationException.java b/authz-core/src/test/java/com/att/authz/org/JU_OrganizationException.java
index 91a54126..212a3dc3 100644
--- a/authz-core/src/test/java/com/att/authz/org/JU_OrganizationException.java
+++ b/authz-core/src/test/java/com/att/authz/org/JU_OrganizationException.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/authz/org/JU_OrganizationFactory.java b/authz-core/src/test/java/com/att/authz/org/JU_OrganizationFactory.java
index 75f2a52a..8876d509 100644
--- a/authz-core/src/test/java/com/att/authz/org/JU_OrganizationFactory.java
+++ b/authz-core/src/test/java/com/att/authz/org/JU_OrganizationFactory.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/cssa/rserv/JU_CachingFileAccess.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_CachingFileAccess.java
index 3716b19d..a82429a8 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_CachingFileAccess.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_CachingFileAccess.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/cssa/rserv/JU_CodeSetter.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_CodeSetter.java
index d6405c2d..b1555524 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_CodeSetter.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_CodeSetter.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/cssa/rserv/JU_Pair.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_Pair.java
index 5cc362f8..f1859584 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_Pair.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_Pair.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/cssa/rserv/JU_Routes.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_Routes.java
index 67328f6e..f6b2bba0 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_Routes.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_Routes.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/cssa/rserv/JU_TypedCode.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_TypedCode.java
index 76d5553e..cb1502be 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_TypedCode.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_TypedCode.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/cssa/rserv/JU_Version.java b/authz-core/src/test/java/com/att/cssa/rserv/JU_Version.java
index 47ea35be..12815b2d 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/JU_Version.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/JU_Version.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/cssa/rserv/test/JU_BetterMatch.java b/authz-core/src/test/java/com/att/cssa/rserv/test/JU_BetterMatch.java
index 5a825917..b0f270f4 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/test/JU_BetterMatch.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/test/JU_BetterMatch.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/authz-core/src/test/java/com/att/cssa/rserv/test/JU_Content.java b/authz-core/src/test/java/com/att/cssa/rserv/test/JU_Content.java
index dd2a33e1..7bc51b55 100644
--- a/authz-core/src/test/java/com/att/cssa/rserv/test/JU_Content.java
+++ b/authz-core/src/test/java/com/att/cssa/rserv/test/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.
-- 
cgit 1.2.3-korg