diff --git a/src/Microsoft.AspNet.Diagnostics/Constants.cs b/src/Microsoft.AspNet.Diagnostics/Constants.cs
index 468b5aa908..96af389458 100644
--- a/src/Microsoft.AspNet.Diagnostics/Constants.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Constants.cs
@@ -1,18 +1,5 @@
-// <copyright file="Constants.cs" company="Microsoft Open Technologies, Inc.">
-// Copyright 2011-2013 Microsoft Open Technologies, Inc. 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.
-// </copyright>
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 namespace Microsoft.AspNet.Diagnostics
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs
index b8c6a6f712..21df7a1b23 100644
--- a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 #if DEBUG
 using System;
diff --git a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs
index dc2c75f541..96de5bd28e 100644
--- a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 #if DEBUG
 using System;
diff --git a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs
index 0e6053fe41..f52ab77a34 100644
--- a/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 #if DEBUG
 
diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorPageExtensions.cs b/src/Microsoft.AspNet.Diagnostics/ErrorPageExtensions.cs
index 1583d98a03..93aed93216 100644
--- a/src/Microsoft.AspNet.Diagnostics/ErrorPageExtensions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/ErrorPageExtensions.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 using System;
 using Microsoft.AspNet.Diagnostics;
diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
index 6222a335e9..e6d56a030d 100644
--- a/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Microsoft.AspNet.Diagnostics/ErrorPageOptions.cs b/src/Microsoft.AspNet.Diagnostics/ErrorPageOptions.cs
index fd38bf0aee..b862a81076 100644
--- a/src/Microsoft.AspNet.Diagnostics/ErrorPageOptions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/ErrorPageOptions.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 namespace Microsoft.AspNet.Diagnostics
 {
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs b/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs
index 3a09de614c..ee2c49d477 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 using System;
 using System.Globalization;
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/DiagnosticsPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/DiagnosticsPage.cs
index 86971816a6..c5b545eab1 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/DiagnosticsPage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/DiagnosticsPage.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 namespace Microsoft.AspNet.Diagnostics.Views
 {
 #line 1 "DiagnosticsPage.cshtml"
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorDetails.cs b/src/Microsoft.AspNet.Diagnostics/Views/ErrorDetails.cs
index f63f2c7219..d8405ccf95 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorDetails.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorDetails.cs
@@ -1,18 +1,5 @@
-// <copyright file="ErrorDetails.cs" company="Microsoft Open Technologies, Inc.">
-// Copyright 2011-2013 Microsoft Open Technologies, Inc. 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.
-// </copyright>
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
index c657b10dbb..8d92647c3f 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPage.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 namespace Microsoft.AspNet.Diagnostics.Views
 {
 #line 1 "ErrorPage.cshtml"
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPageModel.cs b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPageModel.cs
index 3bc18ba436..719454da7a 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/ErrorPageModel.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/ErrorPageModel.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/StackFrame.cs b/src/Microsoft.AspNet.Diagnostics/Views/StackFrame.cs
index 5f962ccefb..2b17068868 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/StackFrame.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/StackFrame.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 using System.Collections.Generic;
 
diff --git a/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs b/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs
index 52aff9201c..901b843b9b 100644
--- a/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs
+++ b/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 namespace Microsoft.AspNet.Diagnostics.Views
 {
 #line 1 "WelcomePage.cshtml"
diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs b/src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs
index 37605a8dac..6918a35332 100644
--- a/src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 using System;
 using Microsoft.AspNet.Http;
diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs
index f2937f13ed..5a5b16e9f4 100644
--- a/src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs b/src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs
index 9b03cb9dc9..3bfd167609 100644
--- a/src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs
@@ -1,4 +1,6 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 
 using Microsoft.AspNet.Http;
 
diff --git a/src/PageGenerator/Program.cs b/src/PageGenerator/Program.cs
index c68c55e9ca..abde68ee52 100644
--- a/src/PageGenerator/Program.cs
+++ b/src/PageGenerator/Program.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;