diff --git a/api/pom.xml b/api/pom.xml
index b39372c5..ffcf534e 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -44,11 +44,6 @@
 		<url>https://github.com/eclipse-ee4j/cdi/issues</url>
 	</issueManagement>
 
-	<organization>
-		<name>JBoss by Red Hat, Inc.</name>
-		<url>https://jboss.org</url>
-	</organization>
-
 	<inceptionYear>2008</inceptionYear>
 
 	<developers>
diff --git a/api/src/main/resources/beans_1_0.xsd b/api/src/main/resources/beans_1_0.xsd
index abe4d936..752b6a72 100644
--- a/api/src/main/resources/beans_1_0.xsd
+++ b/api/src/main/resources/beans_1_0.xsd
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
    <!--
-      JBoss, Home of Professional Open Source Copyright 2008, Red Hat
-      Middleware LLC, and individual contributors by the @authors tag.
-      See the copyright.txt in the distribution for a full listing of
-      individual contributors. Licensed under the Apache License,
-      Version 2.0 (the "License"); you may not use this file except in
-      compliance with the License. You may obtain a copy of the License
-      at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-      applicable law or agreed to in writing, software distributed under
-      the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
-      OR CONDITIONS OF ANY KIND, either express or implied. See the
-      License for the specific language governing permissions and
+      Copyright 2008, Red Hat Middleware LLC, and individual contributors 
+      by the @authors tag. See the copyright.txt in the distribution for a
+      full listing of individual contributors.
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
       limitations under the License.
    -->
 
diff --git a/api/src/main/resources/beans_1_1.xsd b/api/src/main/resources/beans_1_1.xsd
index d632c173..dd0d4e4d 100644
--- a/api/src/main/resources/beans_1_1.xsd
+++ b/api/src/main/resources/beans_1_1.xsd
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
    <!--
-      JBoss, Home of Professional Open Source Copyright 2008, Red Hat
-      Middleware LLC, and individual contributors by the @authors tag.
-      See the copyright.txt in the distribution for a full listing of
-      individual contributors. Licensed under the Apache License,
-      Version 2.0 (the "License"); you may not use this file except in
-      compliance with the License. You may obtain a copy of the License
-      at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-      applicable law or agreed to in writing, software distributed under
-      the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
-      OR CONDITIONS OF ANY KIND, either express or implied. See the
-      License for the specific language governing permissions and
+      Copyright 2008, Red Hat Middleware LLC, and individual contributors 
+      by the @authors tag. See the copyright.txt in the distribution for a
+      full listing of individual contributors.
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
       limitations under the License.
    -->