Update License text

Issue-Id: CERT-4
Change-Id: I4b92e39ea6bedb5c5a70eae93ee8e7c4be9f9866
Signed-Off-by: Gokul Singaraju <goksing@gmail.com>

44 files changed, 90 insertions, 53 deletions

diff --git a/vnfs/VES/LICENSE.md b/vnfs/VES/LICENSE.md
index ae12da20..16285cd2 100644
--- a/vnfs/VES/LICENSE.md
+++ b/vnfs/VES/LICENSE.md
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/VES/code/evel_library/license.md b/vnfs/VES/code/evel_library/license.md
index d24c3180..adb3b5e7 100644
--- a/vnfs/VES/code/evel_library/license.md
+++ b/vnfs/VES/code/evel_library/license.md
@@ -12,6 +12,7 @@ This Licensing section describes licensing of IPR in the EVEL Library.
 ===================================================================
 Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 ===================================================================
+Unless otherwise specified, all software contained herein is
 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
@@ -25,8 +26,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END============================================
 
-ECOMP and OpenECOMP are trademarks 
-and service marks of AT&T Intellectual Property.
+ECOMP is trademark and service mark of AT&T Intellectual Property.
 
 
 ## libcurl {#lic_libcurl}
@@ -85,4 +85,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-  
\ No newline at end of file
+  
diff --git a/vnfs/VES5.0/LICENSE.TXT b/vnfs/VES5.0/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/VES5.0/LICENSE.TXT
+++ b/vnfs/VES5.0/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/VES5.0/evel/evel-library/LICENSE.TXT b/vnfs/VES5.0/evel/evel-library/LICENSE.TXT
index ae12da20..31f25209 100644
--- a/vnfs/VES5.0/evel/evel-library/LICENSE.TXT
+++ b/vnfs/VES5.0/evel/evel-library/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP are trademark and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/double_list.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/double_list.c
index 6ce8a803..cd171bcb 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/double_list.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/double_list.c
@@ -3,6 +3,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -13,6 +14,7 @@
  * 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.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *
  ****************************************************************************/
 
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel.c
index 20b386d6..dbaf58ad 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event.c
index ced29b2c..4de49bcf 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 /**************************************************************************//**
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event_mgr.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event_mgr.c
index a96124ab..572df148 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event_mgr.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event_mgr.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 /**************************************************************************//**
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_fault.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_fault.c
index c211f607..38b07a74 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_fault.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_fault.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 /**************************************************************************//**
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_heartbeat_fields.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_heartbeat_fields.c
index 872af1f8..031632a3 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_heartbeat_fields.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_heartbeat_fields.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 /**************************************************************************//**
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_internal_event.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_internal_event.c
index cb56c880..dff2bae4 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_internal_event.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_internal_event.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 /**************************************************************************//**
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_json_buffer.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_json_buffer.c
index b6026e20..cae5ab17 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_json_buffer.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_json_buffer.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 /**************************************************************************//**
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_jsonobject.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_jsonobject.c
index caf1a1e3..85f65ca1 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_jsonobject.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_jsonobject.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 /**************************************************************************//**
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_logging.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_logging.c
index 5a44f073..cb07396d 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_logging.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_logging.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_mobile_flow.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_mobile_flow.c
index 5085d6a9..90b1a446 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_mobile_flow.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_mobile_flow.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_option.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_option.c
index 7d53e8f1..7818fe1c 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_option.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_option.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_other.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_other.c
index c7a227b3..4888d28e 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_other.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_other.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 /**************************************************************************//**
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_reporting_measurement.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_reporting_measurement.c
index 38a17313..0f303728 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_reporting_measurement.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_reporting_measurement.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 /**************************************************************************//**
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_scaling_measurement.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_scaling_measurement.c
index 7920d81b..b73eb978 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_scaling_measurement.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_scaling_measurement.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_sipsignaling.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_sipsignaling.c
index 45f53487..efc62db2 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_sipsignaling.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_sipsignaling.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -13,6 +14,7 @@
  * See the License for the specific language governing permissions and 
  * limitations under the License.
  *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_state_change.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_state_change.c
index 8915afaf..eb81f979 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_state_change.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_state_change.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_strings.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_strings.c
index 96db59bd..3f0e7a41 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_strings.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_strings.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_syslog.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_syslog.c
index 85b0ec91..06d8163b 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_syslog.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_syslog.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_threshold_cross.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_threshold_cross.c
index f4fa620f..c66b08c0 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_threshold_cross.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_threshold_cross.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_throttle.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_throttle.c
index 63277419..667799a9 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_throttle.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_throttle.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 /**************************************************************************//**
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_voicequality.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_voicequality.c
index cf2ec878..543d509d 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_voicequality.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_voicequality.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/hashtable.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/hashtable.c
index 0e2f7641..d0017c93 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/hashtable.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/hashtable.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -13,6 +14,7 @@
  * See the License for the specific language governing permissions and 
  * limitations under the License.
  *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/jsmn.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/jsmn.c
index f374a570..ae085692 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/jsmn.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/jsmn.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 #include "jsmn.h"
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/license.md b/vnfs/VES5.0/evel/evel-library/code/evel_library/license.md
index 95e459a6..665344da 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/license.md
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/license.md
@@ -11,6 +11,8 @@ This Licensing section describes licensing of IPR in the EVEL Library.
 
 Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 
+
+Unless otherwise specified, all software contained herein is
 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
@@ -22,6 +24,8 @@ 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.
 
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
 ## libcurl {#lic_libcurl}
 
 The EVEL Library makes use of the the [cURL Library]
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/metadata.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/metadata.c
index 11fef1bf..62ea6b51 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/metadata.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/metadata.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/ring_buffer.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/ring_buffer.c
index 8080e020..ad508743 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/ring_buffer.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/ring_buffer.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -12,7 +13,7 @@
  * 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.
- *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_unit/evel_unit.c b/vnfs/VES5.0/evel/evel-library/code/evel_unit/evel_unit.c
index f52dc277..3cfb66ba 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_unit/evel_unit.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_unit/evel_unit.c
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -13,6 +14,7 @@
  * See the License for the specific language governing permissions and 
  * limitations under the License.
  *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 /**************************************************************************//**
  * @file
diff --git a/vnfs/VES5.0/evel/evel-test-collector/LICENSE.md b/vnfs/VES5.0/evel/evel-test-collector/LICENSE.md
index afb56c99..a6642dc6 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/LICENSE.md
+++ b/vnfs/VES5.0/evel/evel-test-collector/LICENSE.md
@@ -2,6 +2,7 @@
  *
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -13,6 +14,7 @@
  * See the License for the specific language governing permissions and 
  * limitations under the License.
  *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  ****************************************************************************/
 
 
diff --git a/vnfs/VES5.0/evel/evel-test-collector/code/collector/LICENSE.TXT b/vnfs/VES5.0/evel/evel-test-collector/code/collector/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/code/collector/LICENSE.TXT
+++ b/vnfs/VES5.0/evel/evel-test-collector/code/collector/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/LICENSE.TXT b/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/LICENSE.TXT
+++ b/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/LICENSE.TXT b/vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/LICENSE.TXT
+++ b/vnfs/VES5.0/evel/evel-test-collector/docs/test_collector_user_guide/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/VESreporting_vFW/LICENSE.TXT b/vnfs/VESreporting_vFW/LICENSE.TXT
index ae12da20..b9c68c65 100644
--- a/vnfs/VESreporting_vFW/LICENSE.TXT
+++ b/vnfs/VESreporting_vFW/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark  and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/VESreporting_vFW5.0/LICENSE.TXT b/vnfs/VESreporting_vFW5.0/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/VESreporting_vFW5.0/LICENSE.TXT
+++ b/vnfs/VESreporting_vFW5.0/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/VESreporting_vLB/LICENSE.TXT b/vnfs/VESreporting_vLB/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/VESreporting_vLB/LICENSE.TXT
+++ b/vnfs/VESreporting_vLB/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/VESreporting_vLB5.0/LICENSE.TXT b/vnfs/VESreporting_vLB5.0/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/VESreporting_vLB5.0/LICENSE.TXT
+++ b/vnfs/VESreporting_vLB5.0/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/honeycomb_plugin/sample_plugin/LICENSE.TXT b/vnfs/honeycomb_plugin/sample_plugin/LICENSE.TXT
index 56404742..16285cd2 100644
--- a/vnfs/honeycomb_plugin/sample_plugin/LICENSE.TXT
+++ b/vnfs/honeycomb_plugin/sample_plugin/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
- */
\ No newline at end of file
+ */
diff --git a/vnfs/vCPE/kea-sdnc-notify-mod/LICENSE.TXT b/vnfs/vCPE/kea-sdnc-notify-mod/LICENSE.TXT
index 34422812..fb192519 100644
--- a/vnfs/vCPE/kea-sdnc-notify-mod/LICENSE.TXT
+++ b/vnfs/vCPE/kea-sdnc-notify-mod/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/vLB/DNSClient/LICENSE.TXT b/vnfs/vLB/DNSClient/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/vLB/DNSClient/LICENSE.TXT
+++ b/vnfs/vLB/DNSClient/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
  */
diff --git a/vnfs/vLB/DNSManager/LICENSE.TXT b/vnfs/vLB/DNSManager/LICENSE.TXT
index ae12da20..16285cd2 100644
--- a/vnfs/vLB/DNSManager/LICENSE.TXT
+++ b/vnfs/vLB/DNSManager/LICENSE.TXT
@@ -3,6 +3,7 @@
  * ===================================================================
  * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ * Unless otherwise specified, all software contained herein is
  * 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
@@ -16,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  *
- * ECOMP and OpenECOMP are trademarks 
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is trademark and service mark of AT&T Intellectual Property.
  *
  */