[AAF-21] Updated Copyright Headers for AAF

Change-Id: I07906b48431c94131ec95dad79a42fb9b6399382
Signed-off-by: sg481n <sg481n@att.com>

35 files changed, 34 insertions, 73 deletions

diff --git a/authz-certman/.gitignore b/authz-certman/.gitignore
deleted file mode 100644
index f99ab6a2..00000000
--- a/authz-certman/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.metadata
-.settings
-.classpath
-.project
-target
diff --git a/authz-certman/pom.xml b/authz-certman/pom.xml
index 53e07816..91b5dae4 100644
--- a/authz-certman/pom.xml
+++ b/authz-certman/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-certman/src/main/config/log4j.properties b/authz-certman/src/main/config/log4j.properties
index ad853f54..ed7f1ca4 100644
--- a/authz-certman/src/main/config/log4j.properties
+++ b/authz-certman/src/main/config/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/authz-certman/src/main/config/lrm-authz-certman.xml b/authz-certman/src/main/config/lrm-authz-certman.xml
index 689c2db3..9fd99a3f 100644
--- a/authz-certman/src/main/config/lrm-authz-certman.xml
+++ b/authz-certman/src/main/config/lrm-authz-certman.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

 <!--

   ============LICENSE_START====================================================

-  * org.onap.aai

+  * org.onap.aaf

   * ===========================================================================

   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

-  * Copyright © 2017 Amdocs

   * ===========================================================================

   * Licensed 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-certman/src/main/java/com/att/authz/cm/api/API_Artifact.java b/authz-certman/src/main/java/com/att/authz/cm/api/API_Artifact.java
index be417515..26c86143 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/api/API_Artifact.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/api/API_Artifact.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/api/API_Cert.java b/authz-certman/src/main/java/com/att/authz/cm/api/API_Cert.java
index 3a7bbe16..067bedd4 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/api/API_Cert.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/api/API_Cert.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/ca/AppCA.java b/authz-certman/src/main/java/com/att/authz/cm/ca/AppCA.java
index 761867d7..485684e1 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/ca/AppCA.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/ca/AppCA.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/ca/CA.java b/authz-certman/src/main/java/com/att/authz/cm/ca/CA.java
index fab89941..b41801d6 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/ca/CA.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/ca/CA.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/ca/DevlCA.java b/authz-certman/src/main/java/com/att/authz/cm/ca/DevlCA.java
index bc999f29..df0b6407 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/ca/DevlCA.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/ca/DevlCA.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/cert/BCFactory.java b/authz-certman/src/main/java/com/att/authz/cm/cert/BCFactory.java
index 52621e54..53a7c7e0 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/cert/BCFactory.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/cert/BCFactory.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/cert/CSRMeta.java b/authz-certman/src/main/java/com/att/authz/cm/cert/CSRMeta.java
index 91168dc9..c3a32ea2 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/cert/CSRMeta.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/cert/CSRMeta.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/cert/StandardFields.java b/authz-certman/src/main/java/com/att/authz/cm/cert/StandardFields.java
index e9c2457a..30926034 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/cert/StandardFields.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/cert/StandardFields.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/data/CertDrop.java b/authz-certman/src/main/java/com/att/authz/cm/data/CertDrop.java
index c0a219db..9fe9562a 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/data/CertDrop.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/data/CertDrop.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/data/CertRenew.java b/authz-certman/src/main/java/com/att/authz/cm/data/CertRenew.java
index 4c13ab40..7a93259e 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/data/CertRenew.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/data/CertRenew.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/data/CertReq.java b/authz-certman/src/main/java/com/att/authz/cm/data/CertReq.java
index 6806a588..9c245389 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/data/CertReq.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/data/CertReq.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/data/CertResp.java b/authz-certman/src/main/java/com/att/authz/cm/data/CertResp.java
index 8257e5cf..2c0edc7d 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/data/CertResp.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/data/CertResp.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/facade/Facade.java b/authz-certman/src/main/java/com/att/authz/cm/facade/Facade.java
index 249f218e..36e391ab 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/facade/Facade.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/facade/Facade.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/facade/Facade1_0.java b/authz-certman/src/main/java/com/att/authz/cm/facade/Facade1_0.java
index 6dd012dd..80024695 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/facade/Facade1_0.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/facade/Facade1_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/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeFactory.java b/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeFactory.java
index e9e5d54a..af02f13e 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeFactory.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeFactory.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/facade/FacadeImpl.java b/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeImpl.java
index 22421442..7fbc8bf4 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/facade/FacadeImpl.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/facade/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-certman/src/main/java/com/att/authz/cm/mapper/Mapper.java b/authz-certman/src/main/java/com/att/authz/cm/mapper/Mapper.java
index 7218b150..47e48726 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/mapper/Mapper.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/mapper/Mapper.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/mapper/Mapper1_0.java b/authz-certman/src/main/java/com/att/authz/cm/mapper/Mapper1_0.java
index 63c4f6a9..9f5a6772 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/mapper/Mapper1_0.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/mapper/Mapper1_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/authz-certman/src/main/java/com/att/authz/cm/service/CMService.java b/authz-certman/src/main/java/com/att/authz/cm/service/CMService.java
index 9e6d5fa9..3c60f215 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/service/CMService.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/service/CMService.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/service/CertManAPI.java b/authz-certman/src/main/java/com/att/authz/cm/service/CertManAPI.java
index fa8ac6fd..adf65edd 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/service/CertManAPI.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/service/CertManAPI.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/service/Code.java b/authz-certman/src/main/java/com/att/authz/cm/service/Code.java
index c29404e2..587d235c 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/service/Code.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/service/Code.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/main/java/com/att/authz/cm/validation/Validator.java b/authz-certman/src/main/java/com/att/authz/cm/validation/Validator.java
index 85163f09..d9f360f6 100644
--- a/authz-certman/src/main/java/com/att/authz/cm/validation/Validator.java
+++ b/authz-certman/src/main/java/com/att/authz/cm/validation/Validator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/test/java/com/att/authz/cm/api/JU_API_Artifact.java b/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Artifact.java
index 73e7160d..d48afb6b 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Artifact.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Artifact.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/test/java/com/att/authz/cm/api/JU_API_Cert.java b/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Cert.java
index 31465a8b..756f0d44 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Cert.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/api/JU_API_Cert.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/test/java/com/att/authz/cm/ca/JU_AppCA.java b/authz-certman/src/test/java/com/att/authz/cm/ca/JU_AppCA.java
index 898ddf65..1f0d2454 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/ca/JU_AppCA.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/ca/JU_AppCA.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/test/java/com/att/authz/cm/ca/JU_DevlCA.java b/authz-certman/src/test/java/com/att/authz/cm/ca/JU_DevlCA.java
index c18afe5c..b877e484 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/ca/JU_DevlCA.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/ca/JU_DevlCA.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/test/java/com/att/authz/cm/cert/JU_BCFactory.java b/authz-certman/src/test/java/com/att/authz/cm/cert/JU_BCFactory.java
index b504f6a8..00c83fd6 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/cert/JU_BCFactory.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/cert/JU_BCFactory.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/test/java/com/att/authz/cm/cert/JU_CSRMeta.java b/authz-certman/src/test/java/com/att/authz/cm/cert/JU_CSRMeta.java
index 541d5fb7..bdae91ba 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/cert/JU_CSRMeta.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/cert/JU_CSRMeta.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/test/java/com/att/authz/cm/data/JU_CertReq.java b/authz-certman/src/test/java/com/att/authz/cm/data/JU_CertReq.java
index f40268d9..7e2f9d00 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/data/JU_CertReq.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/data/JU_CertReq.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed 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-certman/src/test/java/com/att/authz/cm/facade/JU_FacadeImpl.java b/authz-certman/src/test/java/com/att/authz/cm/facade/JU_FacadeImpl.java
index e613e594..126d0f68 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/facade/JU_FacadeImpl.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/facade/JU_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-certman/src/test/java/com/att/authz/cm/validation/JU_Validator.java b/authz-certman/src/test/java/com/att/authz/cm/validation/JU_Validator.java
index e3a428aa..3ee02180 100644
--- a/authz-certman/src/test/java/com/att/authz/cm/validation/JU_Validator.java
+++ b/authz-certman/src/test/java/com/att/authz/cm/validation/JU_Validator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************

  * ============LICENSE_START====================================================

- * * org.onap.aai

+ * * org.onap.aaf

  * * ===========================================================================

  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

- * * Copyright © 2017 Amdocs

  * * ===========================================================================

  * * Licensed under the Apache License, Version 2.0 (the "License");

  * * you may not use this file except in compliance with the License.