diff --git a/http/NOTICE b/http/NOTICE
index 39e56ef..1c3cea2 100644
--- a/http/NOTICE
+++ b/http/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http
+Apache Felix Http Service
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -23,5 +23,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 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/api/NOTICE b/http/api/NOTICE
index 08c6f1f..46cc5fc 100644
--- a/http/api/NOTICE
+++ b/http/api/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Api
+Apache Felix Http Service Api
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -7,11 +7,6 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
 II. Used Software
 
 This product uses software developed at
@@ -19,5 +14,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 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/NOTICE b/http/base/NOTICE
index 407a688..6025712 100644
--- a/http/base/NOTICE
+++ b/http/base/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Base
+Apache Felix Http Service Base
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -7,11 +7,6 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
 II. Used Software
 
 This product uses software developed at
@@ -19,5 +14,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 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/NOTICE b/http/bridge/NOTICE
index c47631b..ce4f841 100644
--- a/http/bridge/NOTICE
+++ b/http/bridge/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Bridge
+Apache Felix Http Service Bridge
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -19,5 +19,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 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/NOTICE b/http/bundle/NOTICE
index 1bde6eb..67aa9fa 100644
--- a/http/bundle/NOTICE
+++ b/http/bundle/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Bundle
+Apache Felix Http Service Bundle
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -23,5 +23,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 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/NOTICE b/http/jetty/NOTICE
index 71145e2..69929fd 100644
--- a/http/jetty/NOTICE
+++ b/http/jetty/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Jetty
+Apache Felix Http Service Jetty
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -23,5 +23,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 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/NOTICE b/http/proxy/NOTICE
index 114ef0f..aadadf3 100644
--- a/http/proxy/NOTICE
+++ b/http/proxy/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Proxy
+Apache Felix Http Service Proxy
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -7,11 +7,6 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
 II. Used Software
 
 This product uses software developed at
@@ -19,5 +14,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 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/NOTICE b/http/samples/bridge/NOTICE
index 7b17b7f..f04640b 100644
--- a/http/samples/bridge/NOTICE
+++ b/http/samples/bridge/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Bridge Sample
+Apache Felix Http Service Bridge Sample
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -19,5 +19,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 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/NOTICE b/http/samples/filter/NOTICE
index f5c45ec..1311bdb 100644
--- a/http/samples/filter/NOTICE
+++ b/http/samples/filter/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Filter Sample
+Apache Felix Http Service Filter Sample
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -7,11 +7,6 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
 II. Used Software
 
 This product uses software developed at
@@ -19,5 +14,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 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/NOTICE b/http/samples/whiteboard/NOTICE
index 17b5b8a..253f3f4 100644
--- a/http/samples/whiteboard/NOTICE
+++ b/http/samples/whiteboard/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Whiteboard Sample
+Apache Felix Http Service Whiteboard Sample
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -7,11 +7,6 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
 II. Used Software
 
 This product uses software developed at
@@ -19,5 +14,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 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/NOTICE b/http/whiteboard/NOTICE
index f2b9f72..56727d2 100644
--- a/http/whiteboard/NOTICE
+++ b/http/whiteboard/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Whiteboard
+Apache Felix Http Service Whiteboard
 Copyright 2009 The Apache Software Foundation
 
 I. Included Software
@@ -7,11 +7,6 @@
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
 II. Used Software
 
 This product uses software developed at
@@ -19,5 +14,9 @@
 Copyright (c) OSGi Alliance (2000, 2007).
 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