diff --git a/openid-connect-client/pom.xml b/openid-connect-client/pom.xml
index fbd87437e..ddaabdecd 100644
--- a/openid-connect-client/pom.xml
+++ b/openid-connect-client/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java
index 69a858b3a..44732f2cc 100644
--- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java
+++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/AuthorizationRequestImpl.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.oauth2.introspectingfilter;
 
 import java.util.Collection;
diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java
index 31ba256c2..d57cba025 100644
--- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java
+++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.oauth2.introspectingfilter;
 
 import java.util.Date;
diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionAuthorityGranter.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionAuthorityGranter.java
index 29688091b..05d8ff2f2 100644
--- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionAuthorityGranter.java
+++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionAuthorityGranter.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionUrlProvider.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionUrlProvider.java
index 5bfbd8f59..ce2437084 100644
--- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionUrlProvider.java
+++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectionUrlProvider.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/JWTParsingIntrospectionUrlProvider.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/JWTParsingIntrospectionUrlProvider.java
index 6a06d502f..1d5687107 100644
--- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/JWTParsingIntrospectionUrlProvider.java
+++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/JWTParsingIntrospectionUrlProvider.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java
index ce3bd644d..e1b0a644a 100644
--- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java
+++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/OAuth2AccessTokenImpl.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.oauth2.introspectingfilter;
 
 import java.text.DateFormat;
diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/SimpleIntrospectionAuthorityGranter.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/SimpleIntrospectionAuthorityGranter.java
index 5d9d145b1..b581a2d2d 100644
--- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/SimpleIntrospectionAuthorityGranter.java
+++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/SimpleIntrospectionAuthorityGranter.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/StaticIntrospectionUrlProvider.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/StaticIntrospectionUrlProvider.java
index d0e2a27f7..ace9a5942 100644
--- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/StaticIntrospectionUrlProvider.java
+++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/StaticIntrospectionUrlProvider.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/NamedAdminAuthoritiesMapper.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/NamedAdminAuthoritiesMapper.java
index 52616ce50..d43bcfcad 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/NamedAdminAuthoritiesMapper.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/NamedAdminAuthoritiesMapper.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java
index 3508d3736..57d9c505d 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.openid.connect.client;
 
 import java.io.IOException;
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java
index 5b45fd0a8..1be9255ef 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.openid.connect.client;
 
 import java.util.Collection;
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/SubjectIssuerGrantedAuthority.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/SubjectIssuerGrantedAuthority.java
index 915b2939d..fb5c2dc40 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/SubjectIssuerGrantedAuthority.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/SubjectIssuerGrantedAuthority.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java
index 68c8cf209..c642a8964 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.openid.connect.client;
 
 import org.apache.http.client.HttpClient;
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java
index 5e267a3de..745c10018 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.openid.connect.client.keypublisher;
 
 import java.util.Map;
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisherMapping.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisherMapping.java
index f830b5428..5b0ddcee8 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisherMapping.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisherMapping.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/JwkViewResolver.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/JwkViewResolver.java
index 6b5b3677d..22f333a48 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/JwkViewResolver.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/JwkViewResolver.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/model/IssuerServiceResponse.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/model/IssuerServiceResponse.java
index 5e7ce5186..47decf603 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/model/IssuerServiceResponse.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/model/IssuerServiceResponse.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/AuthRequestUrlBuilder.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/AuthRequestUrlBuilder.java
index 1073f7942..b77ad7f27 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/AuthRequestUrlBuilder.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/AuthRequestUrlBuilder.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ClientConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ClientConfigurationService.java
index 2f05d72e0..e8de0fbc0 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ClientConfigurationService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ClientConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/IssuerService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/IssuerService.java
index f15157e16..d55c26614 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/IssuerService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/IssuerService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/RegisteredClientService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/RegisteredClientService.java
index 9fdb2a620..c91df5509 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/RegisteredClientService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/RegisteredClientService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ServerConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ServerConfigurationService.java
index 67295bde1..fe77a0bd6 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ServerConfigurationService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/ServerConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java
index ac7dc8b4f..7543ef76d 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java
index c7c367e75..fc508ca91 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/HybridClientConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/HybridClientConfigurationService.java
index 5e38e5825..4088264a2 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/HybridClientConfigurationService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/HybridClientConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/HybridServerConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/HybridServerConfigurationService.java
index 5561de2fa..d0d49677a 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/HybridServerConfigurationService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/HybridServerConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/InMemoryRegisteredClientService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/InMemoryRegisteredClientService.java
index ecc01965a..1fdfb22db 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/InMemoryRegisteredClientService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/InMemoryRegisteredClientService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/JsonFileRegisteredClientService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/JsonFileRegisteredClientService.java
index 353c08176..d9e1453b7 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/JsonFileRegisteredClientService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/JsonFileRegisteredClientService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/PlainAuthRequestUrlBuilder.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/PlainAuthRequestUrlBuilder.java
index 627fa5d03..034378141 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/PlainAuthRequestUrlBuilder.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/PlainAuthRequestUrlBuilder.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/SignedAuthRequestUrlBuilder.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/SignedAuthRequestUrlBuilder.java
index ae1356e4b..fc8d95f78 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/SignedAuthRequestUrlBuilder.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/SignedAuthRequestUrlBuilder.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticClientConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticClientConfigurationService.java
index 2608834ee..4ec889982 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticClientConfigurationService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticClientConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticServerConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticServerConfigurationService.java
index 2a2746e08..f73935aad 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticServerConfigurationService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticServerConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticSingleIssuerService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticSingleIssuerService.java
index cd32105f9..7676c3b78 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticSingleIssuerService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/StaticSingleIssuerService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/ThirdPartyIssuerService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/ThirdPartyIssuerService.java
index cae1af26a..104e949a4 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/ThirdPartyIssuerService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/ThirdPartyIssuerService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java
index 8e9f04595..22630cb0a 100644
--- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java
+++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 /**
  * 
  */
diff --git a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestHybridClientConfigurationService.java b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestHybridClientConfigurationService.java
index 21c22c808..f184f453a 100644
--- a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestHybridClientConfigurationService.java
+++ b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestHybridClientConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.openid.connect.client.service.impl;
 
 import org.junit.Before;
diff --git a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestHybridServerConfigurationService.java b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestHybridServerConfigurationService.java
index 53bb068b3..50e405f92 100644
--- a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestHybridServerConfigurationService.java
+++ b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestHybridServerConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.openid.connect.client.service.impl;
 
 
diff --git a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestPlainAuthRequestUrlBuilder.java b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestPlainAuthRequestUrlBuilder.java
index f55211be7..9892bf887 100644
--- a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestPlainAuthRequestUrlBuilder.java
+++ b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestPlainAuthRequestUrlBuilder.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.openid.connect.client.service.impl;
 
 import org.junit.Before;
diff --git a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestSignedAuthRequestUrlBuilder.java b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestSignedAuthRequestUrlBuilder.java
index 502e34ac7..ae558d5af 100644
--- a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestSignedAuthRequestUrlBuilder.java
+++ b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestSignedAuthRequestUrlBuilder.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.openid.connect.client.service.impl;
 
 import java.net.URI;
diff --git a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticClientConfigurationService.java b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticClientConfigurationService.java
index beebfc598..a6f48c397 100644
--- a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticClientConfigurationService.java
+++ b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticClientConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.openid.connect.client.service.impl;
 
 import java.util.HashMap;
diff --git a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticServerConfigurationService.java b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticServerConfigurationService.java
index 056aa6019..4e19671b5 100644
--- a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticServerConfigurationService.java
+++ b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestStaticServerConfigurationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.openid.connect.client.service.impl;
 
 import java.util.HashMap;
diff --git a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestThirdPartyIssuerService.java b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestThirdPartyIssuerService.java
index 8d7a10d38..db6ab2adf 100644
--- a/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestThirdPartyIssuerService.java
+++ b/openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestThirdPartyIssuerService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
-
 package org.mitre.openid.connect.client.service.impl;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/openid-connect-client/src/test/resources/test-context.xml b/openid-connect-client/src/test/resources/test-context.xml
index fcf4b226e..7dc0db47b 100644
--- a/openid-connect-client/src/test/resources/test-context.xml
+++ b/openid-connect-client/src/test/resources/test-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-common/pom.xml b/openid-connect-common/pom.xml
index f734ab112..2d8449898 100644
--- a/openid-connect-common/pom.xml
+++ b/openid-connect-common/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-common/src/main/java/org/mitre/discovery/util/WebfingerURLNormalizer.java b/openid-connect-common/src/main/java/org/mitre/discovery/util/WebfingerURLNormalizer.java
index 01b8f936a..a0b2eab20 100644
--- a/openid-connect-common/src/main/java/org/mitre/discovery/util/WebfingerURLNormalizer.java
+++ b/openid-connect-common/src/main/java/org/mitre/discovery/util/WebfingerURLNormalizer.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEmbed.java b/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEmbed.java
index 61f228e72..0741bf8cd 100644
--- a/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEmbed.java
+++ b/openid-connect-common/src/main/java/org/mitre/jose/JWEAlgorithmEmbed.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEmbed.java b/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEmbed.java
index 9bd8b3c70..8948bc524 100644
--- a/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEmbed.java
+++ b/openid-connect-common/src/main/java/org/mitre/jose/JWEEncryptionMethodEmbed.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEmbed.java b/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEmbed.java
index 803d75c09..13da6f4ec 100644
--- a/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEmbed.java
+++ b/openid-connect-common/src/main/java/org/mitre/jose/JWSAlgorithmEmbed.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/jose/keystore/JWKSetKeyStore.java b/openid-connect-common/src/main/java/org/mitre/jose/keystore/JWKSetKeyStore.java
index 2168de3b5..4fc4d97eb 100644
--- a/openid-connect-common/src/main/java/org/mitre/jose/keystore/JWKSetKeyStore.java
+++ b/openid-connect-common/src/main/java/org/mitre/jose/keystore/JWKSetKeyStore.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/JwtSigningAndValidationService.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/JwtSigningAndValidationService.java
index 36eeb4e9b..d85d0d009 100644
--- a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/JwtSigningAndValidationService.java
+++ b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/JwtSigningAndValidationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java
index 497524db4..ee07e6fe4 100644
--- a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java
+++ b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/DefaultJwtSigningAndValidationService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java
index 4c0a0206c..263a5541b 100644
--- a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java
+++ b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetSigningAndValidationServiceCacheService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java
index fd77d8e6b..2b80a3c39 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthorizationCodeEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthorizationCodeEntity.java
index a95822651..72ea7699c 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthorizationCodeEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthorizationCodeEntity.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
index 3999873a3..e86d23f38 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
index 977b97279..ff0a3182b 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2AccessTokenEntity.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java
index 902ac913e..f05c1d7ab 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/OAuth2RefreshTokenEntity.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/model/RegisteredClient.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/RegisteredClient.java
index 7c81130ec..636d9dd59 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/RegisteredClient.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/RegisteredClient.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/model/SystemScope.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/SystemScope.java
index 15676e214..71c7fd6db 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/SystemScope.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/SystemScope.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthenticationHolderRepository.java b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthenticationHolderRepository.java
index f8eda56a7..a8515f3d4 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthenticationHolderRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthenticationHolderRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthorizationCodeRepository.java b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthorizationCodeRepository.java
index 5f1bdebcd..f85ac2715 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthorizationCodeRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthorizationCodeRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java
index 7f87a0236..c3389bcff 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2TokenRepository.java b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2TokenRepository.java
index 35cc2a6ee..785586d37 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2TokenRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2TokenRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/repository/SystemScopeRepository.java b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/SystemScopeRepository.java
index 8f0c5befb..3409b5026 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/repository/SystemScopeRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/SystemScopeRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/service/ClientDetailsEntityService.java b/openid-connect-common/src/main/java/org/mitre/oauth2/service/ClientDetailsEntityService.java
index cdddffac7..5fba7cc57 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/service/ClientDetailsEntityService.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/service/ClientDetailsEntityService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/service/OAuth2TokenEntityService.java b/openid-connect-common/src/main/java/org/mitre/oauth2/service/OAuth2TokenEntityService.java
index ab855da0b..f404c7553 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/service/OAuth2TokenEntityService.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/service/OAuth2TokenEntityService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/service/SystemScopeService.java b/openid-connect-common/src/main/java/org/mitre/oauth2/service/SystemScopeService.java
index 40c47d901..f4c49f52a 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/service/SystemScopeService.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/service/SystemScopeService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/oauth2/service/impl/DefaultClientUserDetailsService.java b/openid-connect-common/src/main/java/org/mitre/oauth2/service/impl/DefaultClientUserDetailsService.java
index 623a31896..dfead8482 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/service/impl/DefaultClientUserDetailsService.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/service/impl/DefaultClientUserDetailsService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/ClientDetailsEntityJsonProcessor.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/ClientDetailsEntityJsonProcessor.java
index 783ad7d1d..7cbac27c2 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/ClientDetailsEntityJsonProcessor.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/ClientDetailsEntityJsonProcessor.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java
index d59884e1f..7561d21aa 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationPropertiesBean.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ServerConfiguration.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ServerConfiguration.java
index 1257b6b33..c82975c57 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ServerConfiguration.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/config/ServerConfiguration.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Address.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Address.java
index 7c9595a43..9a8b29756 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Address.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Address.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java
index bab029b3b..118a735ef 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/model/BlacklistedSite.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/BlacklistedSite.java
index 0dde4f9b6..f2144a432 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/BlacklistedSite.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/BlacklistedSite.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java
index 3c47d5ff8..cf32b2f48 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/DefaultUserInfo.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Event.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Event.java
index a01f13299..a65ec5fa7 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Event.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Event.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Nonce.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Nonce.java
index c186e9d78..48220b57c 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Nonce.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/Nonce.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/model/OIDCAuthenticationToken.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/OIDCAuthenticationToken.java
index 223d72356..a6ab90e87 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/OIDCAuthenticationToken.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/OIDCAuthenticationToken.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/model/UserInfo.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/UserInfo.java
index 5307ccc31..430be884e 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/UserInfo.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/UserInfo.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
index 715aa5092..288ec6b07 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java
index d7afd6301..64c7802cb 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java
index 2a426bb38..e0020ef3c 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/BlacklistedSiteRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/BlacklistedSiteRepository.java
index ac9c5d02b..f983fe4c1 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/BlacklistedSiteRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/BlacklistedSiteRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/EventRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/EventRepository.java
index 218f3b28d..042bb7f38 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/EventRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/EventRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/NonceRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/NonceRepository.java
index f4cc45b6e..3e054d749 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/NonceRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/NonceRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java
index aba451298..5b200442c 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java
index 1fd497f04..8775329b6 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ApprovedSiteService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ApprovedSiteService.java
index 964ecb2fd..7fd322c3a 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ApprovedSiteService.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/ApprovedSiteService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/service/BlacklistedSiteService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/BlacklistedSiteService.java
index 47366d4e2..ad46fccde 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/BlacklistedSiteService.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/BlacklistedSiteService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/service/NonceService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/NonceService.java
index 4ecf91639..02eb7281d 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/NonceService.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/NonceService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/service/StatsService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/StatsService.java
index 9effc81eb..94c180a1a 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/StatsService.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/StatsService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/service/UserInfoService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/UserInfoService.java
index 0dbf24624..aaa38c7d1 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/UserInfoService.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/UserInfoService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java
index 4c939a474..11faaae5e 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java
index 6cffe2073..3dfb43729 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/view/JwkKeyListView.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java
index 5fe2c34c7..427570788 100644
--- a/openid-connect-common/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java
+++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java b/openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java
index 3650434c2..6b7b7616a 100644
--- a/openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java
+++ b/openid-connect-common/src/main/java/org/mitre/util/jpa/JpaUtil.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/test/java/org/mitre/discovery/util/TestWebfingerURLNormalizer.java b/openid-connect-common/src/test/java/org/mitre/discovery/util/TestWebfingerURLNormalizer.java
index 7bb57ffd9..42bf8e082 100644
--- a/openid-connect-common/src/test/java/org/mitre/discovery/util/TestWebfingerURLNormalizer.java
+++ b/openid-connect-common/src/test/java/org/mitre/discovery/util/TestWebfingerURLNormalizer.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/test/java/org/mitre/jose/JOSEEmbedTest.java b/openid-connect-common/src/test/java/org/mitre/jose/JOSEEmbedTest.java
index 263a1d32e..f9daa4d0e 100644
--- a/openid-connect-common/src/test/java/org/mitre/jose/JOSEEmbedTest.java
+++ b/openid-connect-common/src/test/java/org/mitre/jose/JOSEEmbedTest.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/test/java/org/mitre/oauth2/model/ClientDetailsEntityTest.java b/openid-connect-common/src/test/java/org/mitre/oauth2/model/ClientDetailsEntityTest.java
index 93af454de..514bee4cf 100644
--- a/openid-connect-common/src/test/java/org/mitre/oauth2/model/ClientDetailsEntityTest.java
+++ b/openid-connect-common/src/test/java/org/mitre/oauth2/model/ClientDetailsEntityTest.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/test/java/org/mitre/oauth2/model/RegisteredClientTest.java b/openid-connect-common/src/test/java/org/mitre/oauth2/model/RegisteredClientTest.java
index 085c7eec4..8fc000e47 100644
--- a/openid-connect-common/src/test/java/org/mitre/oauth2/model/RegisteredClientTest.java
+++ b/openid-connect-common/src/test/java/org/mitre/oauth2/model/RegisteredClientTest.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/test/java/org/mitre/openid/connect/ClientDetailsEntityJsonProcessorTest.java b/openid-connect-common/src/test/java/org/mitre/openid/connect/ClientDetailsEntityJsonProcessorTest.java
index 4b78673a6..1657dbe77 100644
--- a/openid-connect-common/src/test/java/org/mitre/openid/connect/ClientDetailsEntityJsonProcessorTest.java
+++ b/openid-connect-common/src/test/java/org/mitre/openid/connect/ClientDetailsEntityJsonProcessorTest.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/test/java/org/mitre/openid/connect/config/ConfigurationPropertiesBeanTest.java b/openid-connect-common/src/test/java/org/mitre/openid/connect/config/ConfigurationPropertiesBeanTest.java
index e136b2f83..742591784 100644
--- a/openid-connect-common/src/test/java/org/mitre/openid/connect/config/ConfigurationPropertiesBeanTest.java
+++ b/openid-connect-common/src/test/java/org/mitre/openid/connect/config/ConfigurationPropertiesBeanTest.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-common/src/test/java/org/mitre/openid/connect/config/ServerConfigurationTest.java b/openid-connect-common/src/test/java/org/mitre/openid/connect/config/ServerConfigurationTest.java
index 688a80ef5..9cf64f71a 100644
--- a/openid-connect-common/src/test/java/org/mitre/openid/connect/config/ServerConfigurationTest.java
+++ b/openid-connect-common/src/test/java/org/mitre/openid/connect/config/ServerConfigurationTest.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/pom.xml b/openid-connect-server/pom.xml
index 7b8e07f95..8ee464227 100644
--- a/openid-connect-server/pom.xml
+++ b/openid-connect-server/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-server/src/main/java/org/mitre/discovery/view/WebfingerView.java b/openid-connect-server/src/main/java/org/mitre/discovery/view/WebfingerView.java
index 071a38c76..10acae71d 100644
--- a/openid-connect-server/src/main/java/org/mitre/discovery/view/WebfingerView.java
+++ b/openid-connect-server/src/main/java/org/mitre/discovery/view/WebfingerView.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java b/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java
index 12ea910c0..299d5ef2d 100644
--- a/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/exception/DuplicateClientIdException.java b/openid-connect-server/src/main/java/org/mitre/oauth2/exception/DuplicateClientIdException.java
index ec1bb2449..696c0071b 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/exception/DuplicateClientIdException.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/exception/DuplicateClientIdException.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/exception/NonceReuseException.java b/openid-connect-server/src/main/java/org/mitre/oauth2/exception/NonceReuseException.java
index b867b7609..3877f65bb 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/exception/NonceReuseException.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/exception/NonceReuseException.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthenticationHolderRepository.java b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthenticationHolderRepository.java
index c284e6ac7..d2c3f2454 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthenticationHolderRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthenticationHolderRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthorizationCodeRepository.java b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthorizationCodeRepository.java
index af9f5f1d9..7d7dd7297 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthorizationCodeRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthorizationCodeRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2ClientRepository.java b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2ClientRepository.java
index 46bb88b69..4d5797874 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2ClientRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2ClientRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java
index cdfe89987..e381f66bd 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaSystemScopeRepository.java b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaSystemScopeRepository.java
index 36d27fa70..7d8c0998b 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaSystemScopeRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaSystemScopeRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java
index c00a9c4f0..8560b2682 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java
index a27367aae..1aac429e0 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java
index 0c69ab0aa..d65e03361 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
index e860ff2f2..37a67fd4d 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java b/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java
index 508365f11..013d963ee 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/token/ChainedTokenGranter.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java b/openid-connect-server/src/main/java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java
index 4d830bc7b..b4ab3fe6f 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/token/JwtAssertionTokenGranter.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospectionView.java b/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospectionView.java
index 58ef80238..8492361db 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospectionView.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/view/TokenIntrospectionView.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/web/AccessTokenAPI.java b/openid-connect-server/src/main/java/org/mitre/oauth2/web/AccessTokenAPI.java
index 84663d6db..82860bba3 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/web/AccessTokenAPI.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/web/AccessTokenAPI.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/web/IntrospectionEndpoint.java b/openid-connect-server/src/main/java/org/mitre/oauth2/web/IntrospectionEndpoint.java
index 8a8ef0c78..8156dfddd 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/web/IntrospectionEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/web/IntrospectionEndpoint.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java b/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java
index 8da45752b..10b8fc0fa 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/web/RefreshTokenAPI.java b/openid-connect-server/src/main/java/org/mitre/oauth2/web/RefreshTokenAPI.java
index 631cc5e7b..77ef99820 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/web/RefreshTokenAPI.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/web/RefreshTokenAPI.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/web/RevocationEndpoint.java b/openid-connect-server/src/main/java/org/mitre/oauth2/web/RevocationEndpoint.java
index 65290d98b..752dca4cf 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/web/RevocationEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/web/RevocationEndpoint.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/oauth2/web/ScopeAPI.java b/openid-connect-server/src/main/java/org/mitre/oauth2/web/ScopeAPI.java
index e05509365..1e6d72572 100644
--- a/openid-connect-server/src/main/java/org/mitre/oauth2/web/ScopeAPI.java
+++ b/openid-connect-server/src/main/java/org/mitre/oauth2/web/ScopeAPI.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectAuthorizationRequestManager.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectAuthorizationRequestManager.java
index d1262bac4..ca22c067f 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectAuthorizationRequestManager.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectAuthorizationRequestManager.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerAssertionAuthenticationToken.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerAssertionAuthenticationToken.java
index c2d121718..972506d5d 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerAssertionAuthenticationToken.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerAssertionAuthenticationToken.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerAuthenticationProvider.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerAuthenticationProvider.java
index c6c44d53a..7056a850b 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerAuthenticationProvider.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerAuthenticationProvider.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerClientAssertionTokenEndpointFilter.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerClientAssertionTokenEndpointFilter.java
index 7fac81e44..48b9e530f 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerClientAssertionTokenEndpointFilter.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/assertion/JwtBearerClientAssertionTokenEndpointFilter.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/filter/PromptFilter.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/filter/PromptFilter.java
index 9267d1391..ae349fe47 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/filter/PromptFilter.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/filter/PromptFilter.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaAddressRepository.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaAddressRepository.java
index 58481cd70..22fa1e10e 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaAddressRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaAddressRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaApprovedSiteRepository.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaApprovedSiteRepository.java
index 4a36cff12..f660885c2 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaApprovedSiteRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaApprovedSiteRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaBlacklistedSiteRepository.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaBlacklistedSiteRepository.java
index 2638f9eff..99fd68878 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaBlacklistedSiteRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaBlacklistedSiteRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaEventRepository.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaEventRepository.java
index 10ef8a931..f2a30b79c 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaEventRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaEventRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaNonceRepository.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaNonceRepository.java
index 721455b62..d2457beb6 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaNonceRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaNonceRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaUserInfoRepository.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaUserInfoRepository.java
index 32319fa65..7c78f14a0 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaUserInfoRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaUserInfoRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaWhitelistedSiteRepository.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaWhitelistedSiteRepository.java
index be15c18b4..fdfbc8d22 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaWhitelistedSiteRepository.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaWhitelistedSiteRepository.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java
index 22d17ba4e..f3a58965e 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultBlacklistedSiteService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultBlacklistedSiteService.java
index d883967e3..ee11c6090 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultBlacklistedSiteService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultBlacklistedSiteService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultNonceService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultNonceService.java
index 366d4440a..09b633ed0 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultNonceService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultNonceService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java
index b03aeea9f..f2bf61f69 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultStatsService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java
index b667c7f27..2a0004a95 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java
index 5686e2e07..d2cd92eb7 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultWhitelistedSiteService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultWhitelistedSiteService.java
index 8abf315aa..1b0bd0d54 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultWhitelistedSiteService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultWhitelistedSiteService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
index 6a0f7f989..61f40a464 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java
index 721dc6789..2a562003b 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/util/IdTokenHashUtils.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/util/IdTokenHashUtils.java
index de059334b..5c2a7ddcd 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/util/IdTokenHashUtils.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/util/IdTokenHashUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation 
+ * Copyright 2013 The MITRE Corporation
  *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
 package org.mitre.openid.connect.util;
 
 import java.security.MessageDigest;
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/AbstractClientEntityView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/AbstractClientEntityView.java
index 2fd361d40..a7a095c0e 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/AbstractClientEntityView.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/AbstractClientEntityView.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForAdmins.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForAdmins.java
index f8389e4dc..1de8b060a 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForAdmins.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForAdmins.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForUsers.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForUsers.java
index 118774cd2..907d88539 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForUsers.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientEntityViewForUsers.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientInformationResponseView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientInformationResponseView.java
index 654aff466..5759f1a73 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientInformationResponseView.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/ClientInformationResponseView.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/view/HttpCodeView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/HttpCodeView.java
index 2675d7e75..162ed8c96 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/HttpCodeView.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/HttpCodeView.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonEntityView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonEntityView.java
index f2c3db332..b5babd9a0 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonEntityView.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonEntityView.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonErrorView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonErrorView.java
index 42f95eb1c..e1409ed9a 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonErrorView.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/JsonErrorView.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java
index dba05ec4a..ea0c2c6ff 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/view/UserInfoView.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ApprovedSiteAPI.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ApprovedSiteAPI.java
index 7724aa3ec..e61179769 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ApprovedSiteAPI.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ApprovedSiteAPI.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/AuthenticationTimeStamper.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/AuthenticationTimeStamper.java
index 53160a56f..43ff2e504 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/AuthenticationTimeStamper.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/AuthenticationTimeStamper.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/BlacklistAPI.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/BlacklistAPI.java
index 663f918a6..984f134c4 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/BlacklistAPI.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/BlacklistAPI.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
index b50303c16..798cb3a83 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java
index 41d038668..aabbd01c5 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/JsonWebKeyEndpoint.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/JsonWebKeyEndpoint.java
index 8e7c9e6d4..0e5362769 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/JsonWebKeyEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/JsonWebKeyEndpoint.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ManagerController.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ManagerController.java
index 2d2927de9..c7f4c06c7 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ManagerController.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ManagerController.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/RequestObjectAuthorizationEndpoint.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/RequestObjectAuthorizationEndpoint.java
index a061f1263..72cb85918 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/RequestObjectAuthorizationEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/RequestObjectAuthorizationEndpoint.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ServerConfigInterceptor.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ServerConfigInterceptor.java
index 415da09b9..97c376ffc 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ServerConfigInterceptor.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ServerConfigInterceptor.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/StatsAPI.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/StatsAPI.java
index 800252ae0..47b37127f 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/StatsAPI.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/StatsAPI.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
index c54f51a10..57e57d1f0 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/java/org/mitre/openid/connect/web/WhitelistAPI.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/WhitelistAPI.java
index 5ffe0b23c..b3f47487f 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/WhitelistAPI.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/WhitelistAPI.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/main/resources/log4j.xml b/openid-connect-server/src/main/resources/log4j.xml
index 7e17cbffa..f52728539 100644
--- a/openid-connect-server/src/main/resources/log4j.xml
+++ b/openid-connect-server/src/main/resources/log4j.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml b/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml
index eff64dd1b..a09ff1fca 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/application-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/crypto-config.xml b/openid-connect-server/src/main/webapp/WEB-INF/crypto-config.xml
index 488ddc682..6ead2c23c 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/crypto-config.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/crypto-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/data-context.xml b/openid-connect-server/src/main/webapp/WEB-INF/data-context.xml
index 87bf366b5..dba7ebe14 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/data-context.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/data-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/local-config.xml b/openid-connect-server/src/main/webapp/WEB-INF/local-config.xml
index d824d10aa..0ba904f44 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/local-config.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/local-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/server-config.xml b/openid-connect-server/src/main/webapp/WEB-INF/server-config.xml
index 7c0da0885..526f2a6fc 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/server-config.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/server-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml b/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
index 7c38cc691..2f68c414e 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/task-config.xml b/openid-connect-server/src/main/webapp/WEB-INF/task-config.xml
index 2d8920d27..01c16c188 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/task-config.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/task-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/user-context.xml b/openid-connect-server/src/main/webapp/WEB-INF/user-context.xml
index 387167cc3..5bf89e453 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/user-context.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/user-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/web.xml b/openid-connect-server/src/main/webapp/WEB-INF/web.xml
index 4272c985b..bf718c68a 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/web.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013 The MITRE Corporation 
+  Copyright 2013 The MITRE Corporation
     and the MIT Kerberos and Internet Trust Consortium
   
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java
index ba47adbf4..04fbc094b 100644
--- a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java
+++ b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ClientDetailsEntityService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ProviderTokenService.java b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ProviderTokenService.java
index a875b6dcb..e0992afad 100644
--- a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ProviderTokenService.java
+++ b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ProviderTokenService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultSystemScopeService.java b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultSystemScopeService.java
index 4905378b7..35b28ba01 100644
--- a/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultSystemScopeService.java
+++ b/openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultSystemScopeService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultApprovedSiteService.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultApprovedSiteService.java
index be19bfcda..d54fb32e6 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultApprovedSiteService.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultApprovedSiteService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultBlacklistedSiteService.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultBlacklistedSiteService.java
index bc0ea4e09..eeaf54150 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultBlacklistedSiteService.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultBlacklistedSiteService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultNonceService.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultNonceService.java
index 9a1186f3c..393b4da31 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultNonceService.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultNonceService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultStatsService.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultStatsService.java
index d765e08f1..61c3a9f64 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultStatsService.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultStatsService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultUserInfoUserDetailsService.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultUserInfoUserDetailsService.java
index f0ed05684..8a3cc428d 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultUserInfoUserDetailsService.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultUserInfoUserDetailsService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultWhitelistedSiteService.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultWhitelistedSiteService.java
index f40e3a3b7..575111c3f 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultWhitelistedSiteService.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultWhitelistedSiteService.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation and the MIT Kerberos and Internet Trust Consortuim
+ * Copyright 2013 The MITRE Corporation
+ *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * 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/openid-connect-server/src/test/java/org/mitre/openid/connect/util/TestIdTokenHashUtils.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/util/TestIdTokenHashUtils.java
index a7dfc883a..a3815b406 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/util/TestIdTokenHashUtils.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/util/TestIdTokenHashUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2013 The MITRE Corporation 
+ * Copyright 2013 The MITRE Corporation
  *   and the MIT Kerberos and Internet Trust Consortium
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");