diff --git a/CreateUnitTests.NUnit/NUnit3FrameworkProvider.cs b/CreateUnitTests.NUnit/NUnit3FrameworkProvider.cs
index b7652e2..256063e 100644
--- a/CreateUnitTests.NUnit/NUnit3FrameworkProvider.cs
+++ b/CreateUnitTests.NUnit/NUnit3FrameworkProvider.cs
@@ -1,25 +1,4 @@
-// ***********************************************************************
-// Copyright (c) 2015-2018 Terje Sandstrom
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
-// ***********************************************************************
+// Copyright (c) Terje Sandstrom and Contributors. MIT License - see LICENSE.txt
 
 using System;
 using System.ComponentModel.Composition;
diff --git a/CreateUnitTests.NUnit/NUnit3SolutionManager.cs b/CreateUnitTests.NUnit/NUnit3SolutionManager.cs
index ffdaf12..66ddeee 100644
--- a/CreateUnitTests.NUnit/NUnit3SolutionManager.cs
+++ b/CreateUnitTests.NUnit/NUnit3SolutionManager.cs
@@ -1,25 +1,5 @@
-// ***********************************************************************
-// Copyright (c) 2015-2018 Terje Sandstrom
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
-// ***********************************************************************
+// Copyright (c) Terje Sandstrom and Contributors. MIT License - see LICENSE.txt
+
 using System;
 using EnvDTE;
 using EnvDTE80;
diff --git a/CreateUnitTests.NUnit/NUnitUnitTestClassManager.cs b/CreateUnitTests.NUnit/NUnitUnitTestClassManager.cs
index 06dd041..a95c2b0 100644
--- a/CreateUnitTests.NUnit/NUnitUnitTestClassManager.cs
+++ b/CreateUnitTests.NUnit/NUnitUnitTestClassManager.cs
@@ -1,25 +1,4 @@
-// ***********************************************************************
-// Copyright (c) 2015-2018 Terje Sandstrom
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
-// ***********************************************************************
+// Copyright (c) Terje Sandstrom and Contributors. MIT License - see LICENSE.txt
 
 using Microsoft.VisualStudio.TestPlatform.TestGeneration.Data;
 using Microsoft.VisualStudio.TestPlatform.TestGeneration.Model;
diff --git a/CreateUnitTests.NUnit/NUnitUnitTestProjectManager.cs b/CreateUnitTests.NUnit/NUnitUnitTestProjectManager.cs
index 9dc49a3..bf340a5 100644
--- a/CreateUnitTests.NUnit/NUnitUnitTestProjectManager.cs
+++ b/CreateUnitTests.NUnit/NUnitUnitTestProjectManager.cs
@@ -1,25 +1,5 @@
-// ***********************************************************************
-// Copyright (c) 2015-2018 Terje Sandstrom
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
-// ***********************************************************************
+// Copyright (c) Terje Sandstrom and Contributors. MIT License - see LICENSE.txt
+
 using System;
 using EnvDTE;
 using Microsoft.VisualStudio.TestPlatform.TestGeneration.Model;
diff --git a/IntelliTest.NUnit/NUnit3TestFramework.cs b/IntelliTest.NUnit/NUnit3TestFramework.cs
index 5e4df41..7391388 100644
--- a/IntelliTest.NUnit/NUnit3TestFramework.cs
+++ b/IntelliTest.NUnit/NUnit3TestFramework.cs
@@ -1,25 +1,4 @@
-// ***********************************************************************
-// Copyright (c) 2015-2018 Terje Sandstrom
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
-// ***********************************************************************
+// Copyright (c) Terje Sandstrom and Contributors. MIT License - see LICENSE.txt
 
 using Microsoft.ExtendedReflection.Metadata.Builders;
 
@@ -41,7 +20,6 @@ namespace TestGeneration.Extensions.IntelliTest.NUnit
     using Microsoft.Pex.Engine.ComponentModel;
     using Microsoft.Pex.Engine.TestFrameworks;
 
-
     /// <summary>
     /// NUnit 3 test framework
     /// </summary>
diff --git a/IntelliTest.NUnit/NUnitAssertMethodFilter.cs b/IntelliTest.NUnit/NUnitAssertMethodFilter.cs
index dc40344..86a065c 100644
--- a/IntelliTest.NUnit/NUnitAssertMethodFilter.cs
+++ b/IntelliTest.NUnit/NUnitAssertMethodFilter.cs
@@ -1,30 +1,9 @@
-// ***********************************************************************
-// Copyright (c) 2015-2018 Terje Sandstrom
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
-// ***********************************************************************
+// Copyright (c) Terje Sandstrom and Contributors. MIT License - see LICENSE.txt
+
 using Microsoft.ExtendedReflection.Asserts;
 using Microsoft.ExtendedReflection.Metadata;
 using Microsoft.ExtendedReflection.Utilities.Safe.Diagnostics;
 
-
 namespace TestGeneration.Extensions.IntelliTest.NUnit
 {
     /// <summary>
@@ -96,4 +75,4 @@ namespace TestGeneration.Extensions.IntelliTest.NUnit
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/IntelliTest.NUnit/NUnitTestFrameworkPackage.cs b/IntelliTest.NUnit/NUnitTestFrameworkPackage.cs
index 0da8113..4440792 100644
--- a/IntelliTest.NUnit/NUnitTestFrameworkPackage.cs
+++ b/IntelliTest.NUnit/NUnitTestFrameworkPackage.cs
@@ -1,31 +1,9 @@
-// ***********************************************************************
-// Copyright (c) 2015-2018 Terje Sandstrom
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
-// ***********************************************************************
+// Copyright (c) Terje Sandstrom and Contributors. MIT License - see LICENSE.txt
+
 using Microsoft.Pex.Framework.Packages;
 
-
 using TestGeneration.Extensions.IntelliTest.NUnit;
 
-
 [assembly: PexPackageType(typeof(NUnitTestFrameworkPackage))]
 
 namespace TestGeneration.Extensions.IntelliTest.NUnit
diff --git a/IntelliTest.NUnit/NunitTestFrameworkMetadata.cs b/IntelliTest.NUnit/NunitTestFrameworkMetadata.cs
index 7ec91f5..237153f 100644
--- a/IntelliTest.NUnit/NunitTestFrameworkMetadata.cs
+++ b/IntelliTest.NUnit/NunitTestFrameworkMetadata.cs
@@ -1,25 +1,5 @@
-// ***********************************************************************
-// Copyright (c) 2015-2018 Terje Sandstrom
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
-// ***********************************************************************
+// Copyright (c) Terje Sandstrom and Contributors. MIT License - see LICENSE.txt
+
 namespace TestGeneration.Extensions.IntelliTest.NUnit
 {
     using Microsoft.ExtendedReflection.Metadata.Names;