33 files changed, 5 insertions, 5 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index 1f105e3eb..e92ae50cd 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright � 2018 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2016-2018 Ericsson. 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.
diff --git a/README.md b/README.md
index 2ce6f6c60..155fb9c70 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Copyright 2018 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2016-2018 Ericsson. All rights reserved.
 This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
 Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
 
diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml
index df25dcbc0..a536af5a1 100644
--- a/model/basic-model/pom.xml
+++ b/model/basic-model/pom.xml
@@ -35,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.onap.policy.apex.apex-pdp.model</groupId>
-            <artifactId>utiliites</artifactId>
+            <artifactId>utilities</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/model/pom.xml b/model/pom.xml
index 1345ca339..7afc8e536 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -34,7 +34,7 @@
     <description>The model for Apex, it comtains definitions of all Apex concepts and also has handling for Apex models.</description>
 
     <modules>
-        <module>utiliites</module>
+        <module>utilities</module>
         <module>basic-model</module>
     </modules>
 </project>
 \ No newline at end of file
diff --git a/model/utiliites/pom.xml b/model/utilities/pom.xml
index b956ebf67..d23a7d9d7 100644
--- a/model/utiliites/pom.xml
+++ b/model/utilities/pom.xml
@@ -25,7 +25,7 @@
         <artifactId>model</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <artifactId>utiliites</artifactId>
+    <artifactId>utilities</artifactId>
 
 
     <dependencies>
diff --git a/model/utiliites/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4 b/model/utilities/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4
index 3a37d4043..3a37d4043 100644
--- a/model/utiliites/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4
+++ b/model/utilities/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/Assertions.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/Assertions.java
index c215f3fee..c215f3fee 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/Assertions.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/Assertions.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java
index fb7207e0b..fb7207e0b 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/CollectionUtils.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java
index 00e5cb4cf..00e5cb4cf 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/DirectoryUtils.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/PropertyUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/PropertyUtils.java
index 72f85638b..72f85638b 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/PropertyUtils.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/PropertyUtils.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/ResourceUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/ResourceUtils.java
index 588748dda..588748dda 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/ResourceUtils.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/ResourceUtils.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.java
index d05245f23..d05245f23 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TextFileUtils.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java
index 02ab0dd24..02ab0dd24 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/TreeMapUtils.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java
index 8903ea803..8903ea803 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyComparer.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java
index 43c44aefe..43c44aefe 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyDifference.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java
index b11f77a0f..b11f77a0f 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapComparer.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java
index 0f9d6ca50..0f9d6ca50 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/KeyedMapDifference.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java
index f0488eacd..f0488eacd 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/comparison/package-info.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/package-info.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/package-info.java
index 446d009ba..446d009ba 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/package-info.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/package-info.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java
index e806bd7a0..e806bd7a0 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/ClassBuilder.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/TypeBuilder.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/TypeBuilder.java
index a3f22a446..a3f22a446 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/TypeBuilder.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/TypeBuilder.java
diff --git a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/package-info.java b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/package-info.java
index ed4b079bf..ed4b079bf 100644
--- a/model/utiliites/src/main/java/org/onap/policy/apex/model/utilities/typeutils/package-info.java
+++ b/model/utilities/src/main/java/org/onap/policy/apex/model/utilities/typeutils/package-info.java
diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/AssertionsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/AssertionsTest.java
index db25147c3..db25147c3 100644
--- a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/AssertionsTest.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/AssertionsTest.java
diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java
index 4682d985d..4682d985d 100644
--- a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/CollectionUtilitiesTest.java
diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java
index 84e9733f3..84e9733f3 100644
--- a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/DirectoryUtilsTest.java
diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/PropertyUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/PropertyUtilsTest.java
index e25e3ffaa..e25e3ffaa 100644
--- a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/PropertyUtilsTest.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/PropertyUtilsTest.java
diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/ResourceUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/ResourceUtilsTest.java
index 9f789065e..9f789065e 100644
--- a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/ResourceUtilsTest.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/ResourceUtilsTest.java
diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java
index 4e5cba374..4e5cba374 100644
--- a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TextFileUtilsTest.java
diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java
index 10a31e3b9..10a31e3b9 100644
--- a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/TreeMapUtilsTest.java
diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/ParserTest.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/ParserTest.java
index bf4226102..bf4226102 100644
--- a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/ParserTest.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/ParserTest.java
diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyComparer.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyComparer.java
index c2e84c6fb..c2e84c6fb 100644
--- a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyComparer.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyComparer.java
diff --git a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyedMapComparer.java b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyedMapComparer.java
index 33b8101a1..33b8101a1 100644
--- a/model/utiliites/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyedMapComparer.java
+++ b/model/utilities/src/test/java/org/onap/policy/apex/model/utilities/typeutils/TestKeyedMapComparer.java
diff --git a/model/utiliites/src/test/resources/testdir/testfile.xml b/model/utilities/src/test/resources/testdir/testfile.xml
index ddffc5822..ddffc5822 100644
--- a/model/utiliites/src/test/resources/testdir/testfile.xml
+++ b/model/utilities/src/test/resources/testdir/testfile.xml