diff --git a/http/api/DEPENDENCIES b/http/api/DEPENDENCIES
index 7167c29..1887cef 100644
--- a/http/api/DEPENDENCIES
+++ b/http/api/DEPENDENCIES
@@ -1,22 +1,20 @@
-Apache Felix Http Service Api
+Apache Felix HTTP Service API
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
 
-II. Used Software
+N/A
+
+II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
 III. License Summary
 - Apache License 2.0
diff --git a/http/base/DEPENDENCIES b/http/base/DEPENDENCIES
index 56da41b..262bac6 100644
--- a/http/base/DEPENDENCIES
+++ b/http/base/DEPENDENCIES
@@ -1,22 +1,20 @@
-Apache Felix Http Service Base
+Apache Felix HTTP Service Base
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
 
-II. Used Software
+N/A
+
+II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
 III. License Summary
 - Apache License 2.0
diff --git a/http/bridge/DEPENDENCIES b/http/bridge/DEPENDENCIES
index 49a913d..182f4d7 100644
--- a/http/bridge/DEPENDENCIES
+++ b/http/bridge/DEPENDENCIES
@@ -1,27 +1,23 @@
-Apache Felix Http Service Bridge
+Apache Felix HTTP Service Bridge
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
 
 This product includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-II. Used Software
+II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
 III. License Summary
 - Apache License 2.0
diff --git a/http/bundle/DEPENDENCIES b/http/bundle/DEPENDENCIES
index a6bd379..4c1aef6 100644
--- a/http/bundle/DEPENDENCIES
+++ b/http/bundle/DEPENDENCIES
@@ -1,11 +1,11 @@
-Apache Felix Http Service Bundle
+Apache Felix HTTP Service Bundle
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
 
 This product includes software developed by
 Mortbay (http://mortbay.org)
@@ -16,16 +16,12 @@
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-II. Used Software
+II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
 III. License Summary
 - Apache License 2.0
diff --git a/http/jetty/DEPENDENCIES b/http/jetty/DEPENDENCIES
index 9136c35..9c67133 100644
--- a/http/jetty/DEPENDENCIES
+++ b/http/jetty/DEPENDENCIES
@@ -1,11 +1,11 @@
-Apache Felix Http Service Jetty
+Apache Felix HTTP Service Jetty
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
 
 This product includes software developed by
 Mortbay (http://mortbay.org)
@@ -16,16 +16,12 @@
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-II. Used Software
+II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
 III. License Summary
 - Apache License 2.0
diff --git a/http/proxy/DEPENDENCIES b/http/proxy/DEPENDENCIES
index 937b237..7832bf0 100644
--- a/http/proxy/DEPENDENCIES
+++ b/http/proxy/DEPENDENCIES
@@ -1,22 +1,20 @@
-Apache Felix Http Service Proxy
+Apache Felix HTTP Service Proxy
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
 
-II. Used Software
+N/A
+
+II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
 III. License Summary
 - Apache License 2.0
diff --git a/http/samples/bridge/DEPENDENCIES b/http/samples/bridge/DEPENDENCIES
index e65dc7e..c336596 100644
--- a/http/samples/bridge/DEPENDENCIES
+++ b/http/samples/bridge/DEPENDENCIES
@@ -1,27 +1,23 @@
-Apache Felix Http Service Bridge Sample
+Apache Felix HTTP Service Bridge Sample
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
 
 This product includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-II. Used Software
+II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
 III. License Summary
 - Apache License 2.0
diff --git a/http/samples/filter/DEPENDENCIES b/http/samples/filter/DEPENDENCIES
index 05a2594..f57cc55 100644
--- a/http/samples/filter/DEPENDENCIES
+++ b/http/samples/filter/DEPENDENCIES
@@ -1,22 +1,20 @@
-Apache Felix Http Service Filter Sample
+Apache Felix HTTP Service Filter Sample
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
 
-II. Used Software
+N/A
+
+II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
 III. License Summary
 - Apache License 2.0
diff --git a/http/samples/whiteboard/DEPENDENCIES b/http/samples/whiteboard/DEPENDENCIES
index a3020c1..b7d73d9 100644
--- a/http/samples/whiteboard/DEPENDENCIES
+++ b/http/samples/whiteboard/DEPENDENCIES
@@ -1,22 +1,20 @@
-Apache Felix Http Service Whiteboard Sample
+Apache Felix HTTP Service Whiteboard Sample
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
 
-II. Used Software
+N/A
+
+II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
 III. License Summary
 - Apache License 2.0
diff --git a/http/whiteboard/DEPENDENCIES b/http/whiteboard/DEPENDENCIES
index 34936d2..7ba0a9d 100644
--- a/http/whiteboard/DEPENDENCIES
+++ b/http/whiteboard/DEPENDENCIES
@@ -1,22 +1,20 @@
-Apache Felix Http Service Whiteboard
+Apache Felix HTTP Service Whiteboard
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
 
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
 
-II. Used Software
+N/A
+
+II. Used Third-Party Software
 
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org).
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
 III. License Summary
 - Apache License 2.0