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

Change-Id: Ie0a8b071325243a50270424f398653a62ca2cda6
Signed-off-by: sg481n <sg481n@att.com>
---
 LICENSE                                            | 23 ++++++++++++++++++++++
 env/.gitignore                                     |  5 -----
 env/pom.xml                                        |  3 +--
 .../main/java/com/att/inno/env/APIException.java   |  3 +--
 .../java/com/att/inno/env/BaseDataFactory.java     |  3 +--
 env/src/main/java/com/att/inno/env/Creatable.java  |  3 +--
 env/src/main/java/com/att/inno/env/Data.java       |  3 +--
 .../main/java/com/att/inno/env/DataFactory.java    |  3 +--
 env/src/main/java/com/att/inno/env/Decryptor.java  |  3 +--
 env/src/main/java/com/att/inno/env/Encryptor.java  |  3 +--
 env/src/main/java/com/att/inno/env/Env.java        |  3 +--
 env/src/main/java/com/att/inno/env/EnvJAXB.java    |  3 +--
 .../main/java/com/att/inno/env/EnvJAXBProps.java   |  3 +--
 env/src/main/java/com/att/inno/env/EnvProps.java   |  3 +--
 env/src/main/java/com/att/inno/env/EnvStore.java   |  3 +--
 .../main/java/com/att/inno/env/IOObjectifier.java  |  3 +--
 .../main/java/com/att/inno/env/IOStringifier.java  |  3 +--
 env/src/main/java/com/att/inno/env/LifeCycle.java  |  3 +--
 env/src/main/java/com/att/inno/env/LogTarget.java  |  3 +--
 .../main/java/com/att/inno/env/Objectifier.java    |  3 +--
 env/src/main/java/com/att/inno/env/Slot.java       |  3 +--
 env/src/main/java/com/att/inno/env/StaticSlot.java |  3 +--
 env/src/main/java/com/att/inno/env/Store.java      |  3 +--
 env/src/main/java/com/att/inno/env/StoreImpl.java  |  3 +--
 .../main/java/com/att/inno/env/Stringifier.java    |  3 +--
 env/src/main/java/com/att/inno/env/TimeTaken.java  |  3 +--
 env/src/main/java/com/att/inno/env/Trans.java      |  3 +--
 .../main/java/com/att/inno/env/TransCreate.java    |  3 +--
 env/src/main/java/com/att/inno/env/TransJAXB.java  |  3 +--
 env/src/main/java/com/att/inno/env/TransStore.java |  3 +--
 .../main/java/com/att/inno/env/impl/AbsTrans.java  |  3 +--
 .../java/com/att/inno/env/impl/AbsTransJAXB.java   |  3 +--
 .../main/java/com/att/inno/env/impl/BasicEnv.java  |  3 +--
 .../java/com/att/inno/env/impl/BasicTrans.java     |  3 +--
 .../java/com/att/inno/env/impl/EnvFactory.java     |  3 +--
 .../com/att/inno/env/impl/JavaUtilLogTarget.java   |  3 +--
 .../java/com/att/inno/env/impl/Log4JLogTarget.java |  3 +--
 .../java/com/att/inno/env/impl/NullLifeCycle.java  |  3 +--
 .../main/java/com/att/inno/env/jaxb/JAXBDF.java    |  3 +--
 .../main/java/com/att/inno/env/jaxb/JAXBData.java  |  3 +--
 .../com/att/inno/env/jaxb/JAXBObjectifier.java     |  3 +--
 .../com/att/inno/env/jaxb/JAXBStringifier.java     |  3 +--
 .../main/java/com/att/inno/env/jaxb/JAXBmar.java   |  3 +--
 .../main/java/com/att/inno/env/jaxb/JAXBumar.java  |  3 +--
 .../java/com/att/inno/env/old/IOObjectifier.java   |  3 +--
 .../java/com/att/inno/env/old/IOStringifier.java   |  3 +--
 .../java/com/att/inno/env/old/Objectifier.java     |  3 +--
 .../java/com/att/inno/env/old/OldDataFactory.java  |  3 +--
 .../java/com/att/inno/env/old/Stringifier.java     |  3 +--
 .../main/java/com/att/inno/env/util/Chrono.java    |  3 +--
 .../com/att/inno/env/util/DoubleOutputStream.java  |  3 +--
 .../com/att/inno/env/util/IndentPrintWriter.java   |  3 +--
 env/src/main/java/com/att/inno/env/util/Pool.java  |  3 +--
 .../att/inno/env/util/RefreshableThreadObject.java |  3 +--
 env/src/main/java/com/att/inno/env/util/Split.java |  3 +--
 .../inno/env/util/StringBuilderOutputStream.java   |  3 +--
 .../com/att/inno/env/util/StringBuilderWriter.java |  3 +--
 log4j/.gitignore                                   |  4 ----
 log4j/pom.xml                                      |  3 +--
 .../java/com/att/inno/env/log4j/LogFileNamer.java  |  3 +--
 .../java/com/att/inno/env/log4j/PIDAccess.java     |  3 +--
 .../test/java/com/att/inno/env/log4j/LogTest.java  |  3 +--
 log4j/src/test/resources/log4j-test.properties     |  3 +--
 rosetta/.gitignore                                 |  5 -----
 rosetta/pom.xml                                    |  3 +--
 rosetta/src/main/java/com/att/rosetta/InJson.java  |  3 +--
 rosetta/src/main/java/com/att/rosetta/InXML.java   |  3 +--
 rosetta/src/main/java/com/att/rosetta/JaxEval.java |  3 +--
 rosetta/src/main/java/com/att/rosetta/JaxInfo.java |  3 +--
 rosetta/src/main/java/com/att/rosetta/JaxSet.java  |  3 +--
 rosetta/src/main/java/com/att/rosetta/Ladder.java  |  3 +--
 rosetta/src/main/java/com/att/rosetta/Marshal.java |  3 +--
 rosetta/src/main/java/com/att/rosetta/Nulls.java   |  3 +--
 rosetta/src/main/java/com/att/rosetta/Out.java     |  3 +--
 rosetta/src/main/java/com/att/rosetta/OutJax.java  |  3 +--
 rosetta/src/main/java/com/att/rosetta/OutJson.java |  3 +--
 rosetta/src/main/java/com/att/rosetta/OutRaw.java  |  3 +--
 rosetta/src/main/java/com/att/rosetta/OutXML.java  |  3 +--
 rosetta/src/main/java/com/att/rosetta/Parse.java   |  3 +--
 .../main/java/com/att/rosetta/ParseException.java  |  3 +--
 rosetta/src/main/java/com/att/rosetta/Parsed.java  |  3 +--
 rosetta/src/main/java/com/att/rosetta/Prop.java    |  3 +--
 rosetta/src/main/java/com/att/rosetta/Saved.java   |  3 +--
 .../src/main/java/com/att/rosetta/XmlEscape.java   |  3 +--
 .../main/java/com/att/rosetta/env/RosettaDF.java   |  3 +--
 .../main/java/com/att/rosetta/env/RosettaData.java |  3 +--
 .../main/java/com/att/rosetta/env/RosettaEnv.java  |  3 +--
 .../java/com/att/rosetta/marshal/DataWriter.java   |  3 +--
 .../java/com/att/rosetta/marshal/DocMarshal.java   |  3 +--
 .../java/com/att/rosetta/marshal/FieldArray.java   |  3 +--
 .../java/com/att/rosetta/marshal/FieldBlob.java    |  3 +--
 .../java/com/att/rosetta/marshal/FieldDate.java    |  3 +--
 .../com/att/rosetta/marshal/FieldDateTime.java     |  3 +--
 .../com/att/rosetta/marshal/FieldHexBinary.java    |  3 +--
 .../java/com/att/rosetta/marshal/FieldMarshal.java |  3 +--
 .../java/com/att/rosetta/marshal/FieldNumeric.java |  3 +--
 .../java/com/att/rosetta/marshal/FieldString.java  |  3 +--
 .../java/com/att/rosetta/marshal/ListIterator.java |  3 +--
 .../java/com/att/rosetta/marshal/ObjArray.java     |  3 +--
 .../java/com/att/rosetta/marshal/ObjMarshal.java   |  3 +--
 rosetta/src/main/xsd/inherit.xsd                   |  3 +--
 rosetta/src/main/xsd/s.xsd                         |  3 +--
 rosetta/src/main/xsd/types.xsd                     |  3 +--
 .../src/test/java/com/data/test/JU_FromJSON.java   |  3 +--
 .../src/test/java/com/data/test/JU_FromXML.java    |  3 +--
 rosetta/src/test/java/com/data/test/JU_JSON.java   |  3 +--
 rosetta/src/test/java/com/data/test/JU_Ladder.java |  3 +--
 rosetta/src/test/java/com/data/test/JU_Nulls.java  |  3 +--
 .../src/test/java/com/data/test/JU_RosettaDF.java  |  3 +--
 rosetta/src/test/java/com/data/test/JU_Saved.java  |  3 +--
 .../src/test/java/com/data/test/JU_Stream2Obj.java |  3 +--
 rosetta/src/test/java/com/data/test/JU_Struct.java |  3 +--
 rosetta/src/test/java/com/data/test/JU_Types.java  |  3 +--
 rosetta/src/test/java/com/data/test/OutDump.java   |  3 +--
 rosetta/src/test/java/com/data/test/Report.java    |  3 +--
 .../test/java/com/data/test/obj/MultiMarshal.java  |  3 +--
 .../test/java/com/data/test/obj/SingleMarshal.java |  3 +--
 xgen/.gitignore                                    |  5 -----
 xgen/pom.xml                                       |  3 +--
 xgen/src/main/java/com/att/xgen/Back.java          |  3 +--
 xgen/src/main/java/com/att/xgen/Cache.java         |  3 +--
 xgen/src/main/java/com/att/xgen/CacheGen.java      |  3 +--
 xgen/src/main/java/com/att/xgen/Code.java          |  3 +--
 xgen/src/main/java/com/att/xgen/DynamicCode.java   |  3 +--
 xgen/src/main/java/com/att/xgen/Mark.java          |  3 +--
 xgen/src/main/java/com/att/xgen/Section.java       |  3 +--
 xgen/src/main/java/com/att/xgen/XGen.java          |  3 +--
 xgen/src/main/java/com/att/xgen/XGenBuff.java      |  3 +--
 xgen/src/main/java/com/att/xgen/html/HTML4Gen.java |  3 +--
 xgen/src/main/java/com/att/xgen/html/HTML5Gen.java |  3 +--
 .../main/java/com/att/xgen/html/HTMLCacheGen.java  |  3 +--
 xgen/src/main/java/com/att/xgen/html/HTMLGen.java  |  3 +--
 xgen/src/main/java/com/att/xgen/html/Imports.java  |  3 +--
 xgen/src/main/java/com/att/xgen/html/JSGen.java    |  3 +--
 xgen/src/main/java/com/att/xgen/html/State.java    |  3 +--
 xgen/src/main/java/com/att/xgen/html/Thematic.java |  3 +--
 .../main/java/com/att/xgen/xml/XMLCacheGen.java    |  3 +--
 xgen/src/main/java/com/att/xgen/xml/XMLGen.java    |  3 +--
 138 files changed, 156 insertions(+), 285 deletions(-)
 create mode 100644 LICENSE
 delete mode 100644 env/.gitignore
 delete mode 100644 log4j/.gitignore
 delete mode 100644 rosetta/.gitignore
 delete mode 100644 xgen/.gitignore

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..cd88bf0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,23 @@
+<!--
+ ============LICENSE_START====================================================
+* org.onap.aaf
+* ===========================================================================
+* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+* ===========================================================================
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+* 
+ * Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+* ============LICENSE_END====================================================
+*
+* ECOMP is a trademark and service mark of AT&T Intellectual Property.
+*
+
+-->
\ No newline at end of file
diff --git a/env/.gitignore b/env/.gitignore
deleted file mode 100644
index cf85207..0000000
--- a/env/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/bin/
-/target/
-/.classpath
-/.project
-.settings
diff --git a/env/pom.xml b/env/pom.xml
index 6d87fee..2a99965 100644
--- a/env/pom.xml
+++ b/env/pom.xml
@@ -1,9 +1,8 @@
 <!--
   ============LICENSE_START====================================================
-  * org.onap.aai
+  * org.onap.aaf
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  * Copyright © 2017 Amdocs
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/APIException.java b/env/src/main/java/com/att/inno/env/APIException.java
index 3b5242a..677513b 100644
--- a/env/src/main/java/com/att/inno/env/APIException.java
+++ b/env/src/main/java/com/att/inno/env/APIException.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/BaseDataFactory.java b/env/src/main/java/com/att/inno/env/BaseDataFactory.java
index 3947441..b04f115 100644
--- a/env/src/main/java/com/att/inno/env/BaseDataFactory.java
+++ b/env/src/main/java/com/att/inno/env/BaseDataFactory.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/Creatable.java b/env/src/main/java/com/att/inno/env/Creatable.java
index cce9898..e7d7907 100644
--- a/env/src/main/java/com/att/inno/env/Creatable.java
+++ b/env/src/main/java/com/att/inno/env/Creatable.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/Data.java b/env/src/main/java/com/att/inno/env/Data.java
index 221bf7e..f52eec3 100644
--- a/env/src/main/java/com/att/inno/env/Data.java
+++ b/env/src/main/java/com/att/inno/env/Data.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/DataFactory.java b/env/src/main/java/com/att/inno/env/DataFactory.java
index c2ce717..5243ec9 100644
--- a/env/src/main/java/com/att/inno/env/DataFactory.java
+++ b/env/src/main/java/com/att/inno/env/DataFactory.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/Decryptor.java b/env/src/main/java/com/att/inno/env/Decryptor.java
index ababe37..13e0270 100644
--- a/env/src/main/java/com/att/inno/env/Decryptor.java
+++ b/env/src/main/java/com/att/inno/env/Decryptor.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/Encryptor.java b/env/src/main/java/com/att/inno/env/Encryptor.java
index 3604fc1..8f3877b 100644
--- a/env/src/main/java/com/att/inno/env/Encryptor.java
+++ b/env/src/main/java/com/att/inno/env/Encryptor.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/Env.java b/env/src/main/java/com/att/inno/env/Env.java
index 4078fc6..aa71709 100644
--- a/env/src/main/java/com/att/inno/env/Env.java
+++ b/env/src/main/java/com/att/inno/env/Env.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/EnvJAXB.java b/env/src/main/java/com/att/inno/env/EnvJAXB.java
index 2aef19f..f75203c 100644
--- a/env/src/main/java/com/att/inno/env/EnvJAXB.java
+++ b/env/src/main/java/com/att/inno/env/EnvJAXB.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/EnvJAXBProps.java b/env/src/main/java/com/att/inno/env/EnvJAXBProps.java
index 87b2760..2e0f977 100644
--- a/env/src/main/java/com/att/inno/env/EnvJAXBProps.java
+++ b/env/src/main/java/com/att/inno/env/EnvJAXBProps.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/EnvProps.java b/env/src/main/java/com/att/inno/env/EnvProps.java
index a7801c9..e18787a 100644
--- a/env/src/main/java/com/att/inno/env/EnvProps.java
+++ b/env/src/main/java/com/att/inno/env/EnvProps.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/EnvStore.java b/env/src/main/java/com/att/inno/env/EnvStore.java
index 1629718..5872a3e 100644
--- a/env/src/main/java/com/att/inno/env/EnvStore.java
+++ b/env/src/main/java/com/att/inno/env/EnvStore.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/IOObjectifier.java b/env/src/main/java/com/att/inno/env/IOObjectifier.java
index 6e00031..35358aa 100644
--- a/env/src/main/java/com/att/inno/env/IOObjectifier.java
+++ b/env/src/main/java/com/att/inno/env/IOObjectifier.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/IOStringifier.java b/env/src/main/java/com/att/inno/env/IOStringifier.java
index bcc1530..c1dccce 100644
--- a/env/src/main/java/com/att/inno/env/IOStringifier.java
+++ b/env/src/main/java/com/att/inno/env/IOStringifier.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/LifeCycle.java b/env/src/main/java/com/att/inno/env/LifeCycle.java
index 36f4d34..7a359bd 100644
--- a/env/src/main/java/com/att/inno/env/LifeCycle.java
+++ b/env/src/main/java/com/att/inno/env/LifeCycle.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/LogTarget.java b/env/src/main/java/com/att/inno/env/LogTarget.java
index 03ddff9..ca4f8b3 100644
--- a/env/src/main/java/com/att/inno/env/LogTarget.java
+++ b/env/src/main/java/com/att/inno/env/LogTarget.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/Objectifier.java b/env/src/main/java/com/att/inno/env/Objectifier.java
index 3f69fac..ed3c38e 100644
--- a/env/src/main/java/com/att/inno/env/Objectifier.java
+++ b/env/src/main/java/com/att/inno/env/Objectifier.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/Slot.java b/env/src/main/java/com/att/inno/env/Slot.java
index 3a9157d..8f976d8 100644
--- a/env/src/main/java/com/att/inno/env/Slot.java
+++ b/env/src/main/java/com/att/inno/env/Slot.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/StaticSlot.java b/env/src/main/java/com/att/inno/env/StaticSlot.java
index 584704c..0fe8f36 100644
--- a/env/src/main/java/com/att/inno/env/StaticSlot.java
+++ b/env/src/main/java/com/att/inno/env/StaticSlot.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/Store.java b/env/src/main/java/com/att/inno/env/Store.java
index 5e4a661..fa7e339 100644
--- a/env/src/main/java/com/att/inno/env/Store.java
+++ b/env/src/main/java/com/att/inno/env/Store.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/StoreImpl.java b/env/src/main/java/com/att/inno/env/StoreImpl.java
index 98859c6..482d0d6 100644
--- a/env/src/main/java/com/att/inno/env/StoreImpl.java
+++ b/env/src/main/java/com/att/inno/env/StoreImpl.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/Stringifier.java b/env/src/main/java/com/att/inno/env/Stringifier.java
index ce27289..3d3f43c 100644
--- a/env/src/main/java/com/att/inno/env/Stringifier.java
+++ b/env/src/main/java/com/att/inno/env/Stringifier.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/TimeTaken.java b/env/src/main/java/com/att/inno/env/TimeTaken.java
index 2560dd8..5bdaa1b 100644
--- a/env/src/main/java/com/att/inno/env/TimeTaken.java
+++ b/env/src/main/java/com/att/inno/env/TimeTaken.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/Trans.java b/env/src/main/java/com/att/inno/env/Trans.java
index 138ca91..2e584c1 100644
--- a/env/src/main/java/com/att/inno/env/Trans.java
+++ b/env/src/main/java/com/att/inno/env/Trans.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/TransCreate.java b/env/src/main/java/com/att/inno/env/TransCreate.java
index 804a89e..b6db5b4 100644
--- a/env/src/main/java/com/att/inno/env/TransCreate.java
+++ b/env/src/main/java/com/att/inno/env/TransCreate.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/TransJAXB.java b/env/src/main/java/com/att/inno/env/TransJAXB.java
index ad8beae..ffd25d7 100644
--- a/env/src/main/java/com/att/inno/env/TransJAXB.java
+++ b/env/src/main/java/com/att/inno/env/TransJAXB.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/TransStore.java b/env/src/main/java/com/att/inno/env/TransStore.java
index a1cf6b5..acfcf47 100644
--- a/env/src/main/java/com/att/inno/env/TransStore.java
+++ b/env/src/main/java/com/att/inno/env/TransStore.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/impl/AbsTrans.java b/env/src/main/java/com/att/inno/env/impl/AbsTrans.java
index 23f3c03..4f370c7 100644
--- a/env/src/main/java/com/att/inno/env/impl/AbsTrans.java
+++ b/env/src/main/java/com/att/inno/env/impl/AbsTrans.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/impl/AbsTransJAXB.java b/env/src/main/java/com/att/inno/env/impl/AbsTransJAXB.java
index 5c15500..186d0af 100644
--- a/env/src/main/java/com/att/inno/env/impl/AbsTransJAXB.java
+++ b/env/src/main/java/com/att/inno/env/impl/AbsTransJAXB.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/impl/BasicEnv.java b/env/src/main/java/com/att/inno/env/impl/BasicEnv.java
index e18248a..af2f103 100644
--- a/env/src/main/java/com/att/inno/env/impl/BasicEnv.java
+++ b/env/src/main/java/com/att/inno/env/impl/BasicEnv.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/impl/BasicTrans.java b/env/src/main/java/com/att/inno/env/impl/BasicTrans.java
index c390cd5..ec36b57 100644
--- a/env/src/main/java/com/att/inno/env/impl/BasicTrans.java
+++ b/env/src/main/java/com/att/inno/env/impl/BasicTrans.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/impl/EnvFactory.java b/env/src/main/java/com/att/inno/env/impl/EnvFactory.java
index 6018990..1826265 100644
--- a/env/src/main/java/com/att/inno/env/impl/EnvFactory.java
+++ b/env/src/main/java/com/att/inno/env/impl/EnvFactory.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/impl/JavaUtilLogTarget.java b/env/src/main/java/com/att/inno/env/impl/JavaUtilLogTarget.java
index 6577ef1..87a1b64 100644
--- a/env/src/main/java/com/att/inno/env/impl/JavaUtilLogTarget.java
+++ b/env/src/main/java/com/att/inno/env/impl/JavaUtilLogTarget.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/impl/Log4JLogTarget.java b/env/src/main/java/com/att/inno/env/impl/Log4JLogTarget.java
index 295f3dd..d176cd6 100644
--- a/env/src/main/java/com/att/inno/env/impl/Log4JLogTarget.java
+++ b/env/src/main/java/com/att/inno/env/impl/Log4JLogTarget.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/impl/NullLifeCycle.java b/env/src/main/java/com/att/inno/env/impl/NullLifeCycle.java
index 5725cf1..1897195 100644
--- a/env/src/main/java/com/att/inno/env/impl/NullLifeCycle.java
+++ b/env/src/main/java/com/att/inno/env/impl/NullLifeCycle.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBDF.java b/env/src/main/java/com/att/inno/env/jaxb/JAXBDF.java
index 981f257..d2ef3c6 100644
--- a/env/src/main/java/com/att/inno/env/jaxb/JAXBDF.java
+++ b/env/src/main/java/com/att/inno/env/jaxb/JAXBDF.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBData.java b/env/src/main/java/com/att/inno/env/jaxb/JAXBData.java
index b502331..9f51edb 100644
--- a/env/src/main/java/com/att/inno/env/jaxb/JAXBData.java
+++ b/env/src/main/java/com/att/inno/env/jaxb/JAXBData.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBObjectifier.java b/env/src/main/java/com/att/inno/env/jaxb/JAXBObjectifier.java
index bbd3227..c311c9f 100644
--- a/env/src/main/java/com/att/inno/env/jaxb/JAXBObjectifier.java
+++ b/env/src/main/java/com/att/inno/env/jaxb/JAXBObjectifier.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBStringifier.java b/env/src/main/java/com/att/inno/env/jaxb/JAXBStringifier.java
index c47a392..c98214b 100644
--- a/env/src/main/java/com/att/inno/env/jaxb/JAXBStringifier.java
+++ b/env/src/main/java/com/att/inno/env/jaxb/JAXBStringifier.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBmar.java b/env/src/main/java/com/att/inno/env/jaxb/JAXBmar.java
index 86e3c65..dbdf092 100644
--- a/env/src/main/java/com/att/inno/env/jaxb/JAXBmar.java
+++ b/env/src/main/java/com/att/inno/env/jaxb/JAXBmar.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/jaxb/JAXBumar.java b/env/src/main/java/com/att/inno/env/jaxb/JAXBumar.java
index 5b53429..eab30e6 100644
--- a/env/src/main/java/com/att/inno/env/jaxb/JAXBumar.java
+++ b/env/src/main/java/com/att/inno/env/jaxb/JAXBumar.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/old/IOObjectifier.java b/env/src/main/java/com/att/inno/env/old/IOObjectifier.java
index 928c589..9932e20 100644
--- a/env/src/main/java/com/att/inno/env/old/IOObjectifier.java
+++ b/env/src/main/java/com/att/inno/env/old/IOObjectifier.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/old/IOStringifier.java b/env/src/main/java/com/att/inno/env/old/IOStringifier.java
index 61dc188..18ef170 100644
--- a/env/src/main/java/com/att/inno/env/old/IOStringifier.java
+++ b/env/src/main/java/com/att/inno/env/old/IOStringifier.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/old/Objectifier.java b/env/src/main/java/com/att/inno/env/old/Objectifier.java
index 19e19de..55e9685 100644
--- a/env/src/main/java/com/att/inno/env/old/Objectifier.java
+++ b/env/src/main/java/com/att/inno/env/old/Objectifier.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/old/OldDataFactory.java b/env/src/main/java/com/att/inno/env/old/OldDataFactory.java
index a76e1fb..6bf0995 100644
--- a/env/src/main/java/com/att/inno/env/old/OldDataFactory.java
+++ b/env/src/main/java/com/att/inno/env/old/OldDataFactory.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/old/Stringifier.java b/env/src/main/java/com/att/inno/env/old/Stringifier.java
index fa3cee0..db9401f 100644
--- a/env/src/main/java/com/att/inno/env/old/Stringifier.java
+++ b/env/src/main/java/com/att/inno/env/old/Stringifier.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/util/Chrono.java b/env/src/main/java/com/att/inno/env/util/Chrono.java
index 7d81d3d..8b840d0 100644
--- a/env/src/main/java/com/att/inno/env/util/Chrono.java
+++ b/env/src/main/java/com/att/inno/env/util/Chrono.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/util/DoubleOutputStream.java b/env/src/main/java/com/att/inno/env/util/DoubleOutputStream.java
index 212f0c8..eab33b1 100644
--- a/env/src/main/java/com/att/inno/env/util/DoubleOutputStream.java
+++ b/env/src/main/java/com/att/inno/env/util/DoubleOutputStream.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/util/IndentPrintWriter.java b/env/src/main/java/com/att/inno/env/util/IndentPrintWriter.java
index 48c5243..a312dfa 100644
--- a/env/src/main/java/com/att/inno/env/util/IndentPrintWriter.java
+++ b/env/src/main/java/com/att/inno/env/util/IndentPrintWriter.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/util/Pool.java b/env/src/main/java/com/att/inno/env/util/Pool.java
index e631c98..e8ba8ce 100644
--- a/env/src/main/java/com/att/inno/env/util/Pool.java
+++ b/env/src/main/java/com/att/inno/env/util/Pool.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/util/RefreshableThreadObject.java b/env/src/main/java/com/att/inno/env/util/RefreshableThreadObject.java
index 78adcb9..10bb8aa 100644
--- a/env/src/main/java/com/att/inno/env/util/RefreshableThreadObject.java
+++ b/env/src/main/java/com/att/inno/env/util/RefreshableThreadObject.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/util/Split.java b/env/src/main/java/com/att/inno/env/util/Split.java
index a25f36c..b813ac0 100644
--- a/env/src/main/java/com/att/inno/env/util/Split.java
+++ b/env/src/main/java/com/att/inno/env/util/Split.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/util/StringBuilderOutputStream.java b/env/src/main/java/com/att/inno/env/util/StringBuilderOutputStream.java
index a3f8f4b..0151448 100644
--- a/env/src/main/java/com/att/inno/env/util/StringBuilderOutputStream.java
+++ b/env/src/main/java/com/att/inno/env/util/StringBuilderOutputStream.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/env/src/main/java/com/att/inno/env/util/StringBuilderWriter.java b/env/src/main/java/com/att/inno/env/util/StringBuilderWriter.java
index 833bd7c..632ff60 100644
--- a/env/src/main/java/com/att/inno/env/util/StringBuilderWriter.java
+++ b/env/src/main/java/com/att/inno/env/util/StringBuilderWriter.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/log4j/.gitignore b/log4j/.gitignore
deleted file mode 100644
index b981306..0000000
--- a/log4j/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/target/
-.settings
-.project
-.classpath
diff --git a/log4j/pom.xml b/log4j/pom.xml
index 66e307c..fca6593 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -1,9 +1,8 @@
 <!--
   ============LICENSE_START====================================================
-  * org.onap.aai
+  * org.onap.aaf
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  * Copyright © 2017 Amdocs
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
diff --git a/log4j/src/main/java/com/att/inno/env/log4j/LogFileNamer.java b/log4j/src/main/java/com/att/inno/env/log4j/LogFileNamer.java
index 3ef0f52..335fbcd 100644
--- a/log4j/src/main/java/com/att/inno/env/log4j/LogFileNamer.java
+++ b/log4j/src/main/java/com/att/inno/env/log4j/LogFileNamer.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/log4j/src/main/java/com/att/inno/env/log4j/PIDAccess.java b/log4j/src/main/java/com/att/inno/env/log4j/PIDAccess.java
index 77b77a6..a4f1d98 100644
--- a/log4j/src/main/java/com/att/inno/env/log4j/PIDAccess.java
+++ b/log4j/src/main/java/com/att/inno/env/log4j/PIDAccess.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/log4j/src/test/java/com/att/inno/env/log4j/LogTest.java b/log4j/src/test/java/com/att/inno/env/log4j/LogTest.java
index 69ff8c4..f3594f5 100644
--- a/log4j/src/test/java/com/att/inno/env/log4j/LogTest.java
+++ b/log4j/src/test/java/com/att/inno/env/log4j/LogTest.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/log4j/src/test/resources/log4j-test.properties b/log4j/src/test/resources/log4j-test.properties
index b56e904..ff29059 100644
--- a/log4j/src/test/resources/log4j-test.properties
+++ b/log4j/src/test/resources/log4j-test.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/rosetta/.gitignore b/rosetta/.gitignore
deleted file mode 100644
index cf85207..0000000
--- a/rosetta/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/bin/
-/target/
-/.classpath
-/.project
-.settings
diff --git a/rosetta/pom.xml b/rosetta/pom.xml
index b073fcb..5463aa8 100644
--- a/rosetta/pom.xml
+++ b/rosetta/pom.xml
@@ -1,9 +1,8 @@
 <!--
   ============LICENSE_START====================================================
-  * org.onap.aai
+  * org.onap.aaf
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  * Copyright © 2017 Amdocs
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/InJson.java b/rosetta/src/main/java/com/att/rosetta/InJson.java
index 9462e67..ba14c4a 100644
--- a/rosetta/src/main/java/com/att/rosetta/InJson.java
+++ b/rosetta/src/main/java/com/att/rosetta/InJson.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/InXML.java b/rosetta/src/main/java/com/att/rosetta/InXML.java
index 1c56e14..945fb75 100644
--- a/rosetta/src/main/java/com/att/rosetta/InXML.java
+++ b/rosetta/src/main/java/com/att/rosetta/InXML.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/JaxEval.java b/rosetta/src/main/java/com/att/rosetta/JaxEval.java
index 72a89f2..22bdde2 100644
--- a/rosetta/src/main/java/com/att/rosetta/JaxEval.java
+++ b/rosetta/src/main/java/com/att/rosetta/JaxEval.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/JaxInfo.java b/rosetta/src/main/java/com/att/rosetta/JaxInfo.java
index 23785af..c7c0430 100644
--- a/rosetta/src/main/java/com/att/rosetta/JaxInfo.java
+++ b/rosetta/src/main/java/com/att/rosetta/JaxInfo.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/JaxSet.java b/rosetta/src/main/java/com/att/rosetta/JaxSet.java
index 515c2c1..ff9d696 100644
--- a/rosetta/src/main/java/com/att/rosetta/JaxSet.java
+++ b/rosetta/src/main/java/com/att/rosetta/JaxSet.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/Ladder.java b/rosetta/src/main/java/com/att/rosetta/Ladder.java
index 95f5174..46377db 100644
--- a/rosetta/src/main/java/com/att/rosetta/Ladder.java
+++ b/rosetta/src/main/java/com/att/rosetta/Ladder.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/Marshal.java b/rosetta/src/main/java/com/att/rosetta/Marshal.java
index 52c97c6..07480b3 100644
--- a/rosetta/src/main/java/com/att/rosetta/Marshal.java
+++ b/rosetta/src/main/java/com/att/rosetta/Marshal.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/Nulls.java b/rosetta/src/main/java/com/att/rosetta/Nulls.java
index 74cc56e..a261888 100644
--- a/rosetta/src/main/java/com/att/rosetta/Nulls.java
+++ b/rosetta/src/main/java/com/att/rosetta/Nulls.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/Out.java b/rosetta/src/main/java/com/att/rosetta/Out.java
index c2ad448..e870eb5 100644
--- a/rosetta/src/main/java/com/att/rosetta/Out.java
+++ b/rosetta/src/main/java/com/att/rosetta/Out.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/OutJax.java b/rosetta/src/main/java/com/att/rosetta/OutJax.java
index ec04f43..7f0e1f4 100644
--- a/rosetta/src/main/java/com/att/rosetta/OutJax.java
+++ b/rosetta/src/main/java/com/att/rosetta/OutJax.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/OutJson.java b/rosetta/src/main/java/com/att/rosetta/OutJson.java
index 98dd162..69994d4 100644
--- a/rosetta/src/main/java/com/att/rosetta/OutJson.java
+++ b/rosetta/src/main/java/com/att/rosetta/OutJson.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/OutRaw.java b/rosetta/src/main/java/com/att/rosetta/OutRaw.java
index 1a5d8d0..105d676 100644
--- a/rosetta/src/main/java/com/att/rosetta/OutRaw.java
+++ b/rosetta/src/main/java/com/att/rosetta/OutRaw.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/OutXML.java b/rosetta/src/main/java/com/att/rosetta/OutXML.java
index cfef897..b062d3c 100644
--- a/rosetta/src/main/java/com/att/rosetta/OutXML.java
+++ b/rosetta/src/main/java/com/att/rosetta/OutXML.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/Parse.java b/rosetta/src/main/java/com/att/rosetta/Parse.java
index 93415b4..e66f798 100644
--- a/rosetta/src/main/java/com/att/rosetta/Parse.java
+++ b/rosetta/src/main/java/com/att/rosetta/Parse.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/ParseException.java b/rosetta/src/main/java/com/att/rosetta/ParseException.java
index f086d00..ac51dbd 100644
--- a/rosetta/src/main/java/com/att/rosetta/ParseException.java
+++ b/rosetta/src/main/java/com/att/rosetta/ParseException.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/Parsed.java b/rosetta/src/main/java/com/att/rosetta/Parsed.java
index 412251f..705dd8e 100644
--- a/rosetta/src/main/java/com/att/rosetta/Parsed.java
+++ b/rosetta/src/main/java/com/att/rosetta/Parsed.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/Prop.java b/rosetta/src/main/java/com/att/rosetta/Prop.java
index 78a8125..aa728fe 100644
--- a/rosetta/src/main/java/com/att/rosetta/Prop.java
+++ b/rosetta/src/main/java/com/att/rosetta/Prop.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/Saved.java b/rosetta/src/main/java/com/att/rosetta/Saved.java
index bc7e106..7e27a58 100644
--- a/rosetta/src/main/java/com/att/rosetta/Saved.java
+++ b/rosetta/src/main/java/com/att/rosetta/Saved.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/XmlEscape.java b/rosetta/src/main/java/com/att/rosetta/XmlEscape.java
index c61a80d..a98cf56 100644
--- a/rosetta/src/main/java/com/att/rosetta/XmlEscape.java
+++ b/rosetta/src/main/java/com/att/rosetta/XmlEscape.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/env/RosettaDF.java b/rosetta/src/main/java/com/att/rosetta/env/RosettaDF.java
index 7198c76..6dac5fd 100644
--- a/rosetta/src/main/java/com/att/rosetta/env/RosettaDF.java
+++ b/rosetta/src/main/java/com/att/rosetta/env/RosettaDF.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/env/RosettaData.java b/rosetta/src/main/java/com/att/rosetta/env/RosettaData.java
index e07e883..9b2b508 100644
--- a/rosetta/src/main/java/com/att/rosetta/env/RosettaData.java
+++ b/rosetta/src/main/java/com/att/rosetta/env/RosettaData.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/env/RosettaEnv.java b/rosetta/src/main/java/com/att/rosetta/env/RosettaEnv.java
index 78f963b..42877af 100644
--- a/rosetta/src/main/java/com/att/rosetta/env/RosettaEnv.java
+++ b/rosetta/src/main/java/com/att/rosetta/env/RosettaEnv.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/DataWriter.java b/rosetta/src/main/java/com/att/rosetta/marshal/DataWriter.java
index 8d972d8..f5b13d8 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/DataWriter.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/DataWriter.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/DocMarshal.java b/rosetta/src/main/java/com/att/rosetta/marshal/DocMarshal.java
index 27a4364..555f419 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/DocMarshal.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/DocMarshal.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldArray.java b/rosetta/src/main/java/com/att/rosetta/marshal/FieldArray.java
index 7931e73..6a300dd 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldArray.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/FieldArray.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldBlob.java b/rosetta/src/main/java/com/att/rosetta/marshal/FieldBlob.java
index b80cb48..5c569e6 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldBlob.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/FieldBlob.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldDate.java b/rosetta/src/main/java/com/att/rosetta/marshal/FieldDate.java
index c2a8c03..b23232c 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldDate.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/FieldDate.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldDateTime.java b/rosetta/src/main/java/com/att/rosetta/marshal/FieldDateTime.java
index ce14c7f..4caf247 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldDateTime.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/FieldDateTime.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldHexBinary.java b/rosetta/src/main/java/com/att/rosetta/marshal/FieldHexBinary.java
index 125f332..199e52f 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldHexBinary.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/FieldHexBinary.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldMarshal.java b/rosetta/src/main/java/com/att/rosetta/marshal/FieldMarshal.java
index 63ba3b9..f0916be 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldMarshal.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/FieldMarshal.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldNumeric.java b/rosetta/src/main/java/com/att/rosetta/marshal/FieldNumeric.java
index b53f12e..595ce63 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldNumeric.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/FieldNumeric.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/FieldString.java b/rosetta/src/main/java/com/att/rosetta/marshal/FieldString.java
index 6fd3424..482c211 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/FieldString.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/FieldString.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/ListIterator.java b/rosetta/src/main/java/com/att/rosetta/marshal/ListIterator.java
index b444c68..9aa75b5 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/ListIterator.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/ListIterator.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/ObjArray.java b/rosetta/src/main/java/com/att/rosetta/marshal/ObjArray.java
index 89e07c5..abfb483 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/ObjArray.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/ObjArray.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/java/com/att/rosetta/marshal/ObjMarshal.java b/rosetta/src/main/java/com/att/rosetta/marshal/ObjMarshal.java
index 981dd78..bef128b 100644
--- a/rosetta/src/main/java/com/att/rosetta/marshal/ObjMarshal.java
+++ b/rosetta/src/main/java/com/att/rosetta/marshal/ObjMarshal.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/xsd/inherit.xsd b/rosetta/src/main/xsd/inherit.xsd
index 9c11ef0..758d935 100644
--- a/rosetta/src/main/xsd/inherit.xsd
+++ b/rosetta/src/main/xsd/inherit.xsd
@@ -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/rosetta/src/main/xsd/s.xsd b/rosetta/src/main/xsd/s.xsd
index 8a530a7..0558cb2 100644
--- a/rosetta/src/main/xsd/s.xsd
+++ b/rosetta/src/main/xsd/s.xsd
@@ -1,9 +1,8 @@
 <!--
   ============LICENSE_START====================================================
-  * org.onap.aai
+  * org.onap.aaf
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  * Copyright © 2017 Amdocs
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/main/xsd/types.xsd b/rosetta/src/main/xsd/types.xsd
index 588d9d4..82e8d94 100644
--- a/rosetta/src/main/xsd/types.xsd
+++ b/rosetta/src/main/xsd/types.xsd
@@ -1,9 +1,8 @@
 <!--
   ============LICENSE_START====================================================
-  * org.onap.aai
+  * org.onap.aaf
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  * Copyright © 2017 Amdocs
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/JU_FromJSON.java b/rosetta/src/test/java/com/data/test/JU_FromJSON.java
index 4e3d211..5ad6546 100644
--- a/rosetta/src/test/java/com/data/test/JU_FromJSON.java
+++ b/rosetta/src/test/java/com/data/test/JU_FromJSON.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/JU_FromXML.java b/rosetta/src/test/java/com/data/test/JU_FromXML.java
index 506b6c8..62db4f9 100644
--- a/rosetta/src/test/java/com/data/test/JU_FromXML.java
+++ b/rosetta/src/test/java/com/data/test/JU_FromXML.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/JU_JSON.java b/rosetta/src/test/java/com/data/test/JU_JSON.java
index 9b1d715..7840573 100644
--- a/rosetta/src/test/java/com/data/test/JU_JSON.java
+++ b/rosetta/src/test/java/com/data/test/JU_JSON.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/JU_Ladder.java b/rosetta/src/test/java/com/data/test/JU_Ladder.java
index 78d6a10..5f19ed8 100644
--- a/rosetta/src/test/java/com/data/test/JU_Ladder.java
+++ b/rosetta/src/test/java/com/data/test/JU_Ladder.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/JU_Nulls.java b/rosetta/src/test/java/com/data/test/JU_Nulls.java
index 657b883..af18a2f 100644
--- a/rosetta/src/test/java/com/data/test/JU_Nulls.java
+++ b/rosetta/src/test/java/com/data/test/JU_Nulls.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/JU_RosettaDF.java b/rosetta/src/test/java/com/data/test/JU_RosettaDF.java
index 90342b4..7915a60 100644
--- a/rosetta/src/test/java/com/data/test/JU_RosettaDF.java
+++ b/rosetta/src/test/java/com/data/test/JU_RosettaDF.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/JU_Saved.java b/rosetta/src/test/java/com/data/test/JU_Saved.java
index 220bdf7..6314b72 100644
--- a/rosetta/src/test/java/com/data/test/JU_Saved.java
+++ b/rosetta/src/test/java/com/data/test/JU_Saved.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/JU_Stream2Obj.java b/rosetta/src/test/java/com/data/test/JU_Stream2Obj.java
index c714b57..b5a6c9d 100644
--- a/rosetta/src/test/java/com/data/test/JU_Stream2Obj.java
+++ b/rosetta/src/test/java/com/data/test/JU_Stream2Obj.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/JU_Struct.java b/rosetta/src/test/java/com/data/test/JU_Struct.java
index 1d1ee96..66c83c0 100644
--- a/rosetta/src/test/java/com/data/test/JU_Struct.java
+++ b/rosetta/src/test/java/com/data/test/JU_Struct.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/JU_Types.java b/rosetta/src/test/java/com/data/test/JU_Types.java
index 02f5ac3..d34815f 100644
--- a/rosetta/src/test/java/com/data/test/JU_Types.java
+++ b/rosetta/src/test/java/com/data/test/JU_Types.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/OutDump.java b/rosetta/src/test/java/com/data/test/OutDump.java
index cd65e15..6e9d0fb 100644
--- a/rosetta/src/test/java/com/data/test/OutDump.java
+++ b/rosetta/src/test/java/com/data/test/OutDump.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/Report.java b/rosetta/src/test/java/com/data/test/Report.java
index d05443a..9a970dc 100644
--- a/rosetta/src/test/java/com/data/test/Report.java
+++ b/rosetta/src/test/java/com/data/test/Report.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/obj/MultiMarshal.java b/rosetta/src/test/java/com/data/test/obj/MultiMarshal.java
index 1ef81e2..ca105b3 100644
--- a/rosetta/src/test/java/com/data/test/obj/MultiMarshal.java
+++ b/rosetta/src/test/java/com/data/test/obj/MultiMarshal.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/rosetta/src/test/java/com/data/test/obj/SingleMarshal.java b/rosetta/src/test/java/com/data/test/obj/SingleMarshal.java
index 1546622..b1ac110 100644
--- a/rosetta/src/test/java/com/data/test/obj/SingleMarshal.java
+++ b/rosetta/src/test/java/com/data/test/obj/SingleMarshal.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/.gitignore b/xgen/.gitignore
deleted file mode 100644
index cf85207..0000000
--- a/xgen/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/bin/
-/target/
-/.classpath
-/.project
-.settings
diff --git a/xgen/pom.xml b/xgen/pom.xml
index 5b558ea..ab97c6d 100644
--- a/xgen/pom.xml
+++ b/xgen/pom.xml
@@ -1,9 +1,8 @@
 <!--
   ============LICENSE_START====================================================
-  * org.onap.aai
+  * org.onap.aaf
   * ===========================================================================
   * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  * Copyright © 2017 Amdocs
   * ===========================================================================
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/Back.java b/xgen/src/main/java/com/att/xgen/Back.java
index e2b94b2..154ba88 100644
--- a/xgen/src/main/java/com/att/xgen/Back.java
+++ b/xgen/src/main/java/com/att/xgen/Back.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/Cache.java b/xgen/src/main/java/com/att/xgen/Cache.java
index 31f7420..6c887cc 100644
--- a/xgen/src/main/java/com/att/xgen/Cache.java
+++ b/xgen/src/main/java/com/att/xgen/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/xgen/src/main/java/com/att/xgen/CacheGen.java b/xgen/src/main/java/com/att/xgen/CacheGen.java
index b3e0491..371cf87 100644
--- a/xgen/src/main/java/com/att/xgen/CacheGen.java
+++ b/xgen/src/main/java/com/att/xgen/CacheGen.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/Code.java b/xgen/src/main/java/com/att/xgen/Code.java
index 556b05a..70d0c74 100644
--- a/xgen/src/main/java/com/att/xgen/Code.java
+++ b/xgen/src/main/java/com/att/xgen/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/xgen/src/main/java/com/att/xgen/DynamicCode.java b/xgen/src/main/java/com/att/xgen/DynamicCode.java
index 810f918..f1cc4c4 100644
--- a/xgen/src/main/java/com/att/xgen/DynamicCode.java
+++ b/xgen/src/main/java/com/att/xgen/DynamicCode.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/Mark.java b/xgen/src/main/java/com/att/xgen/Mark.java
index e2e87d3..4b148d2 100644
--- a/xgen/src/main/java/com/att/xgen/Mark.java
+++ b/xgen/src/main/java/com/att/xgen/Mark.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/Section.java b/xgen/src/main/java/com/att/xgen/Section.java
index 7fa5761..1b16986 100644
--- a/xgen/src/main/java/com/att/xgen/Section.java
+++ b/xgen/src/main/java/com/att/xgen/Section.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/XGen.java b/xgen/src/main/java/com/att/xgen/XGen.java
index 1ca6f46..fe6acba 100644
--- a/xgen/src/main/java/com/att/xgen/XGen.java
+++ b/xgen/src/main/java/com/att/xgen/XGen.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/XGenBuff.java b/xgen/src/main/java/com/att/xgen/XGenBuff.java
index d27b030..bf63e19 100644
--- a/xgen/src/main/java/com/att/xgen/XGenBuff.java
+++ b/xgen/src/main/java/com/att/xgen/XGenBuff.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/html/HTML4Gen.java b/xgen/src/main/java/com/att/xgen/html/HTML4Gen.java
index 7be425a..88cae0a 100644
--- a/xgen/src/main/java/com/att/xgen/html/HTML4Gen.java
+++ b/xgen/src/main/java/com/att/xgen/html/HTML4Gen.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/html/HTML5Gen.java b/xgen/src/main/java/com/att/xgen/html/HTML5Gen.java
index f41575c..217a764 100644
--- a/xgen/src/main/java/com/att/xgen/html/HTML5Gen.java
+++ b/xgen/src/main/java/com/att/xgen/html/HTML5Gen.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/html/HTMLCacheGen.java b/xgen/src/main/java/com/att/xgen/html/HTMLCacheGen.java
index 23a4234..a53370a 100644
--- a/xgen/src/main/java/com/att/xgen/html/HTMLCacheGen.java
+++ b/xgen/src/main/java/com/att/xgen/html/HTMLCacheGen.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/html/HTMLGen.java b/xgen/src/main/java/com/att/xgen/html/HTMLGen.java
index e40b588..3827884 100644
--- a/xgen/src/main/java/com/att/xgen/html/HTMLGen.java
+++ b/xgen/src/main/java/com/att/xgen/html/HTMLGen.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/html/Imports.java b/xgen/src/main/java/com/att/xgen/html/Imports.java
index d47b663..941fe5f 100644
--- a/xgen/src/main/java/com/att/xgen/html/Imports.java
+++ b/xgen/src/main/java/com/att/xgen/html/Imports.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/html/JSGen.java b/xgen/src/main/java/com/att/xgen/html/JSGen.java
index 664f399..02662ab 100644
--- a/xgen/src/main/java/com/att/xgen/html/JSGen.java
+++ b/xgen/src/main/java/com/att/xgen/html/JSGen.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/html/State.java b/xgen/src/main/java/com/att/xgen/html/State.java
index 23b0807..6a73ad6 100644
--- a/xgen/src/main/java/com/att/xgen/html/State.java
+++ b/xgen/src/main/java/com/att/xgen/html/State.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/html/Thematic.java b/xgen/src/main/java/com/att/xgen/html/Thematic.java
index a0d4ddb..865be9b 100644
--- a/xgen/src/main/java/com/att/xgen/html/Thematic.java
+++ b/xgen/src/main/java/com/att/xgen/html/Thematic.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/xml/XMLCacheGen.java b/xgen/src/main/java/com/att/xgen/xml/XMLCacheGen.java
index 8fc2692..0e00a41 100644
--- a/xgen/src/main/java/com/att/xgen/xml/XMLCacheGen.java
+++ b/xgen/src/main/java/com/att/xgen/xml/XMLCacheGen.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 2017 Amdocs
  * * ===========================================================================
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
diff --git a/xgen/src/main/java/com/att/xgen/xml/XMLGen.java b/xgen/src/main/java/com/att/xgen/xml/XMLGen.java
index 2321724..ac9d689 100644
--- a/xgen/src/main/java/com/att/xgen/xml/XMLGen.java
+++ b/xgen/src/main/java/com/att/xgen/xml/XMLGen.java
@@ -1,9 +1,8 @@
 /*******************************************************************************
  * ============LICENSE_START====================================================
- * * org.onap.aai
+ * * org.onap.aaf
  * * ===========================================================================
  * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * * Copyright © 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