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-cmd/src/main/assemble/authz-cmd.xml                        | 3 +--
 authz-cmd/src/main/assemble/swm.xml                              | 3 +--
 authz-cmd/src/main/config/log4j.properties                       | 3 +--
 authz-cmd/src/main/java/com/att/cmd/AAFcli.java                  | 3 +--
 authz-cmd/src/main/java/com/att/cmd/BaseCmd.java                 | 3 +--
 authz-cmd/src/main/java/com/att/cmd/BasicAuth.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/Cmd.java                     | 3 +--
 authz-cmd/src/main/java/com/att/cmd/Help.java                    | 3 +--
 authz-cmd/src/main/java/com/att/cmd/MessageException.java        | 3 +--
 authz-cmd/src/main/java/com/att/cmd/Param.java                   | 3 +--
 authz-cmd/src/main/java/com/att/cmd/Version.java                 | 3 +--
 authz-cmd/src/main/java/com/att/cmd/mgmt/Cache.java              | 3 +--
 authz-cmd/src/main/java/com/att/cmd/mgmt/Clear.java              | 3 +--
 authz-cmd/src/main/java/com/att/cmd/mgmt/Deny.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/mgmt/Log.java                | 3 +--
 authz-cmd/src/main/java/com/att/cmd/mgmt/Mgmt.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/mgmt/SessClear.java          | 3 +--
 authz-cmd/src/main/java/com/att/cmd/mgmt/Session.java            | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/Admin.java                | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/Attrib.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/Create.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/Delete.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/Describe.java             | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/List.java                 | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/ListActivity.java         | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/ListAdminResponsible.java | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/ListByName.java           | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/ListChildren.java         | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/ListNsKeysByAttrib.java   | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/ListUsers.java            | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/ListUsersInRole.java      | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/ListUsersWithPerm.java    | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/NS.java                   | 3 +--
 authz-cmd/src/main/java/com/att/cmd/ns/Responsible.java          | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/Create.java             | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/Delete.java             | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/Describe.java           | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/Grant.java              | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/List.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/ListActivity.java       | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/ListByNS.java           | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/ListByName.java         | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/ListByRole.java         | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/ListByUser.java         | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/Perm.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/perm/Rename.java             | 3 +--
 authz-cmd/src/main/java/com/att/cmd/role/CreateDelete.java       | 3 +--
 authz-cmd/src/main/java/com/att/cmd/role/Describe.java           | 3 +--
 authz-cmd/src/main/java/com/att/cmd/role/List.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/role/ListActivity.java       | 3 +--
 authz-cmd/src/main/java/com/att/cmd/role/ListByNS.java           | 3 +--
 authz-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java     | 3 +--
 authz-cmd/src/main/java/com/att/cmd/role/ListByPerm.java         | 3 +--
 authz-cmd/src/main/java/com/att/cmd/role/ListByRole.java         | 3 +--
 authz-cmd/src/main/java/com/att/cmd/role/ListByUser.java         | 3 +--
 authz-cmd/src/main/java/com/att/cmd/role/Role.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/role/User.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/user/Cred.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/user/Delg.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/user/List.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/user/ListActivity.java       | 3 +--
 authz-cmd/src/main/java/com/att/cmd/user/ListApprovals.java      | 3 +--
 authz-cmd/src/main/java/com/att/cmd/user/ListDelegates.java      | 3 +--
 authz-cmd/src/main/java/com/att/cmd/user/ListForCreds.java       | 3 +--
 authz-cmd/src/main/java/com/att/cmd/user/ListForPermission.java  | 3 +--
 authz-cmd/src/main/java/com/att/cmd/user/ListForRoles.java       | 3 +--
 authz-cmd/src/main/java/com/att/cmd/user/Role.java               | 3 +--
 authz-cmd/src/main/java/com/att/cmd/user/User.java               | 3 +--
 68 files changed, 68 insertions(+), 136 deletions(-)

(limited to 'authz-cmd/src/main')

diff --git a/authz-cmd/src/main/assemble/authz-cmd.xml b/authz-cmd/src/main/assemble/authz-cmd.xml
index 4fa723eb..c1f2ad6f 100644
--- a/authz-cmd/src/main/assemble/authz-cmd.xml
+++ b/authz-cmd/src/main/assemble/authz-cmd.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/authz-cmd/src/main/assemble/swm.xml b/authz-cmd/src/main/assemble/swm.xml
index 089cfbe5..f2e86838 100644
--- a/authz-cmd/src/main/assemble/swm.xml
+++ b/authz-cmd/src/main/assemble/swm.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/authz-cmd/src/main/config/log4j.properties b/authz-cmd/src/main/config/log4j.properties
index 054ad57a..fcd9da85 100644
--- a/authz-cmd/src/main/config/log4j.properties
+++ b/authz-cmd/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-cmd/src/main/java/com/att/cmd/AAFcli.java b/authz-cmd/src/main/java/com/att/cmd/AAFcli.java
index e499aa48..357d312a 100644
--- a/authz-cmd/src/main/java/com/att/cmd/AAFcli.java
+++ b/authz-cmd/src/main/java/com/att/cmd/AAFcli.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/BaseCmd.java b/authz-cmd/src/main/java/com/att/cmd/BaseCmd.java
index 44724dc5..8fc6ebaa 100644
--- a/authz-cmd/src/main/java/com/att/cmd/BaseCmd.java
+++ b/authz-cmd/src/main/java/com/att/cmd/BaseCmd.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/BasicAuth.java b/authz-cmd/src/main/java/com/att/cmd/BasicAuth.java
index 3dce84c3..68826c69 100644
--- a/authz-cmd/src/main/java/com/att/cmd/BasicAuth.java
+++ b/authz-cmd/src/main/java/com/att/cmd/BasicAuth.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/Cmd.java b/authz-cmd/src/main/java/com/att/cmd/Cmd.java
index 0439eb86..49ffaeb7 100644
--- a/authz-cmd/src/main/java/com/att/cmd/Cmd.java
+++ b/authz-cmd/src/main/java/com/att/cmd/Cmd.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/Help.java b/authz-cmd/src/main/java/com/att/cmd/Help.java
index ae3c4c11..a9a9dfc9 100644
--- a/authz-cmd/src/main/java/com/att/cmd/Help.java
+++ b/authz-cmd/src/main/java/com/att/cmd/Help.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/MessageException.java b/authz-cmd/src/main/java/com/att/cmd/MessageException.java
index 329f0194..c9324625 100644
--- a/authz-cmd/src/main/java/com/att/cmd/MessageException.java
+++ b/authz-cmd/src/main/java/com/att/cmd/MessageException.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/Param.java b/authz-cmd/src/main/java/com/att/cmd/Param.java
index a944859a..9a5995e9 100644
--- a/authz-cmd/src/main/java/com/att/cmd/Param.java
+++ b/authz-cmd/src/main/java/com/att/cmd/Param.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/Version.java b/authz-cmd/src/main/java/com/att/cmd/Version.java
index 318d223e..7e31a378 100644
--- a/authz-cmd/src/main/java/com/att/cmd/Version.java
+++ b/authz-cmd/src/main/java/com/att/cmd/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-cmd/src/main/java/com/att/cmd/mgmt/Cache.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Cache.java
index 2ef030fb..7dcd5a1e 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Cache.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/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-cmd/src/main/java/com/att/cmd/mgmt/Clear.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Clear.java
index 89a99f96..670beec3 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Clear.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/Clear.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/mgmt/Deny.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Deny.java
index f345cfa7..c3ce9d2b 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Deny.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/Deny.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/mgmt/Log.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Log.java
index aa10c584..544ed0ce 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Log.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/Log.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/mgmt/Mgmt.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Mgmt.java
index b428af80..e43bd786 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Mgmt.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/Mgmt.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/mgmt/SessClear.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/SessClear.java
index 8258422f..d2671a1a 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/SessClear.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/SessClear.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/mgmt/Session.java b/authz-cmd/src/main/java/com/att/cmd/mgmt/Session.java
index fb60f274..73ae9234 100644
--- a/authz-cmd/src/main/java/com/att/cmd/mgmt/Session.java
+++ b/authz-cmd/src/main/java/com/att/cmd/mgmt/Session.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/Admin.java b/authz-cmd/src/main/java/com/att/cmd/ns/Admin.java
index a67ff2ee..2406f8ed 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Admin.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/Admin.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/Attrib.java b/authz-cmd/src/main/java/com/att/cmd/ns/Attrib.java
index ffe9b087..9877580e 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Attrib.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/Attrib.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/Create.java b/authz-cmd/src/main/java/com/att/cmd/ns/Create.java
index c314a107..8a28741d 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Create.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/Create.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/Delete.java b/authz-cmd/src/main/java/com/att/cmd/ns/Delete.java
index a957def6..ab717eb0 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Delete.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/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/authz-cmd/src/main/java/com/att/cmd/ns/Describe.java b/authz-cmd/src/main/java/com/att/cmd/ns/Describe.java
index 6e57b094..56db604f 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Describe.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/Describe.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/List.java b/authz-cmd/src/main/java/com/att/cmd/ns/List.java
index fe80d62e..72ca77a1 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/List.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/List.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/ListActivity.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListActivity.java
index afc041fb..f8d87af0 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListActivity.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListActivity.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/ListAdminResponsible.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListAdminResponsible.java
index 9e559a9c..c8bc07e0 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListAdminResponsible.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListAdminResponsible.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/ListByName.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListByName.java
index 7459c221..c711e28e 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListByName.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListByName.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/ListChildren.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListChildren.java
index 7ad60a71..43b1008f 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListChildren.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListChildren.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/ListNsKeysByAttrib.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListNsKeysByAttrib.java
index 3ce9d7de..43b83495 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListNsKeysByAttrib.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListNsKeysByAttrib.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/ListUsers.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsers.java
index e77df593..0dc12128 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListUsers.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsers.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/ListUsersInRole.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersInRole.java
index d4c5a59d..3a5f73f2 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersInRole.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersInRole.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/ListUsersWithPerm.java b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersWithPerm.java
index c8cbe5eb..bb41bd10 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersWithPerm.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/ListUsersWithPerm.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/NS.java b/authz-cmd/src/main/java/com/att/cmd/ns/NS.java
index 7ebe3f9a..c5557bae 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/NS.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/NS.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/ns/Responsible.java b/authz-cmd/src/main/java/com/att/cmd/ns/Responsible.java
index b7f4406d..ddbb752d 100644
--- a/authz-cmd/src/main/java/com/att/cmd/ns/Responsible.java
+++ b/authz-cmd/src/main/java/com/att/cmd/ns/Responsible.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/perm/Create.java b/authz-cmd/src/main/java/com/att/cmd/perm/Create.java
index a6bd6802..2c6231f9 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Create.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/Create.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/perm/Delete.java b/authz-cmd/src/main/java/com/att/cmd/perm/Delete.java
index d5c5401f..b1f09959 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Delete.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/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/authz-cmd/src/main/java/com/att/cmd/perm/Describe.java b/authz-cmd/src/main/java/com/att/cmd/perm/Describe.java
index 757c0172..3d6646fa 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Describe.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/Describe.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/perm/Grant.java b/authz-cmd/src/main/java/com/att/cmd/perm/Grant.java
index f9780dde..0b15fbe6 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Grant.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/Grant.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/perm/List.java b/authz-cmd/src/main/java/com/att/cmd/perm/List.java
index d65bfcc1..d87c29e4 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/List.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/List.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/perm/ListActivity.java b/authz-cmd/src/main/java/com/att/cmd/perm/ListActivity.java
index be653fad..58affb24 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/ListActivity.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/ListActivity.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/perm/ListByNS.java b/authz-cmd/src/main/java/com/att/cmd/perm/ListByNS.java
index 23b1d422..44eefa38 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/ListByNS.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/ListByNS.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/perm/ListByName.java b/authz-cmd/src/main/java/com/att/cmd/perm/ListByName.java
index d85447cf..1a5566d1 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/ListByName.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/ListByName.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/perm/ListByRole.java b/authz-cmd/src/main/java/com/att/cmd/perm/ListByRole.java
index ec76137a..143c2612 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/ListByRole.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/ListByRole.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/perm/ListByUser.java b/authz-cmd/src/main/java/com/att/cmd/perm/ListByUser.java
index b1c70557..31ce2275 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/ListByUser.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/ListByUser.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/perm/Perm.java b/authz-cmd/src/main/java/com/att/cmd/perm/Perm.java
index ecac7ff5..0c331542 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Perm.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/Perm.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/perm/Rename.java b/authz-cmd/src/main/java/com/att/cmd/perm/Rename.java
index 05538706..7d22a2ec 100644
--- a/authz-cmd/src/main/java/com/att/cmd/perm/Rename.java
+++ b/authz-cmd/src/main/java/com/att/cmd/perm/Rename.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/role/CreateDelete.java b/authz-cmd/src/main/java/com/att/cmd/role/CreateDelete.java
index 9f47c61a..450682d0 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/CreateDelete.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/CreateDelete.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/role/Describe.java b/authz-cmd/src/main/java/com/att/cmd/role/Describe.java
index 3802cc77..52eaac75 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/Describe.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/Describe.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/role/List.java b/authz-cmd/src/main/java/com/att/cmd/role/List.java
index 72cf2037..8980d72c 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/List.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/List.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/role/ListActivity.java b/authz-cmd/src/main/java/com/att/cmd/role/ListActivity.java
index 253a5376..dd5a0c64 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListActivity.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListActivity.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/role/ListByNS.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByNS.java
index 67c2c508..87edee69 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByNS.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListByNS.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java
index b47db017..912be45c 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/role/ListByPerm.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByPerm.java
index 50dff9bb..f57c542b 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByPerm.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListByPerm.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/role/ListByRole.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByRole.java
index fad9347d..c75bdf43 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByRole.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListByRole.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/role/ListByUser.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByUser.java
index 03db10fa..08466a67 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByUser.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/ListByUser.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/role/Role.java b/authz-cmd/src/main/java/com/att/cmd/role/Role.java
index a3336aef..288cd11c 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/Role.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/Role.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/role/User.java b/authz-cmd/src/main/java/com/att/cmd/role/User.java
index ea8276c1..97689131 100644
--- a/authz-cmd/src/main/java/com/att/cmd/role/User.java
+++ b/authz-cmd/src/main/java/com/att/cmd/role/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/authz-cmd/src/main/java/com/att/cmd/user/Cred.java b/authz-cmd/src/main/java/com/att/cmd/user/Cred.java
index 13198890..daa68e0b 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/Cred.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/Cred.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/user/Delg.java b/authz-cmd/src/main/java/com/att/cmd/user/Delg.java
index af4095f3..f61e66ca 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/Delg.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/Delg.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/user/List.java b/authz-cmd/src/main/java/com/att/cmd/user/List.java
index d88c15dc..fc5afecf 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/List.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/List.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/user/ListActivity.java b/authz-cmd/src/main/java/com/att/cmd/user/ListActivity.java
index bf384f6e..31c0149b 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListActivity.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListActivity.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/user/ListApprovals.java b/authz-cmd/src/main/java/com/att/cmd/user/ListApprovals.java
index 85569f41..410085a1 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListApprovals.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListApprovals.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/user/ListDelegates.java b/authz-cmd/src/main/java/com/att/cmd/user/ListDelegates.java
index 779f6253..a35191ad 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListDelegates.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListDelegates.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/user/ListForCreds.java b/authz-cmd/src/main/java/com/att/cmd/user/ListForCreds.java
index 8ede1187..3ce4ac79 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListForCreds.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListForCreds.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/user/ListForPermission.java b/authz-cmd/src/main/java/com/att/cmd/user/ListForPermission.java
index fb13bbbb..e05813a5 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListForPermission.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListForPermission.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/user/ListForRoles.java b/authz-cmd/src/main/java/com/att/cmd/user/ListForRoles.java
index e2a89905..f2eb855e 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/ListForRoles.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/ListForRoles.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/user/Role.java b/authz-cmd/src/main/java/com/att/cmd/user/Role.java
index 1d660c6c..af884377 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/Role.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/Role.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed 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-cmd/src/main/java/com/att/cmd/user/User.java b/authz-cmd/src/main/java/com/att/cmd/user/User.java
index 13f11117..27be7777 100644
--- a/authz-cmd/src/main/java/com/att/cmd/user/User.java
+++ b/authz-cmd/src/main/java/com/att/cmd/user/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.
-- 
cgit 1.2.3-korg