diff --git a/org.apache.ace.authentication.itest/bnd.bnd b/org.apache.ace.authentication.itest/bnd.bnd
index f887635a6..32048a4f9 100644
--- a/org.apache.ace.authentication.itest/bnd.bnd
+++ b/org.apache.ace.authentication.itest/bnd.bnd
@@ -61,7 +61,7 @@ Test-Cases: ${classes;CONCRETE;NAMED;*Test}
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.repository.servlets;version=latest,\
 	org.apache.ace.resourceprocessor.useradmin;version=latest,\
 	org.apache.ace.scheduler.impl;version=latest,\
 	org.apache.ace.test;version=latest,\
diff --git a/org.apache.ace.client.repository.itest/bnd.bnd b/org.apache.ace.client.repository.itest/bnd.bnd
index 2affd7b6f..8abee5c28 100644
--- a/org.apache.ace.client.repository.itest/bnd.bnd
+++ b/org.apache.ace.client.repository.itest/bnd.bnd
@@ -59,7 +59,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 	org.apache.ace.log.server.store.file;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.repository.servlets;version=latest,\
 	org.apache.ace.obr.metadata;version=latest,\
 	org.apache.ace.obr.servlet;version=latest,\
 	org.apache.ace.obr.storage;version=latest,\
diff --git a/org.apache.ace.client.rest.itest/bnd.bnd b/org.apache.ace.client.rest.itest/bnd.bnd
index 4aeb8da38..a2aa3dcf8 100644
--- a/org.apache.ace.client.rest.itest/bnd.bnd
+++ b/org.apache.ace.client.rest.itest/bnd.bnd
@@ -60,7 +60,7 @@
 	org.apache.ace.log.server.store.file;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.repository.servlets;version=latest,\
 	org.apache.ace.obr.metadata;version=latest,\
 	org.apache.ace.obr.servlet;version=latest,\
 	org.apache.ace.obr.storage;version=latest,\
diff --git a/org.apache.ace.configurator.useradmin.itest/bnd.bnd b/org.apache.ace.configurator.useradmin.itest/bnd.bnd
index 150d15d4e..b1b10789c 100644
--- a/org.apache.ace.configurator.useradmin.itest/bnd.bnd
+++ b/org.apache.ace.configurator.useradmin.itest/bnd.bnd
@@ -37,7 +37,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.scheduler.impl;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.repository.servlets;version=latest,\
 	org.apache.ace.configurator.useradmin.task;version=latest,\
 	org.apache.ace.feedback.common;version=latest
 Private-Package: org.apache.ace.it.useradminconfigurator
diff --git a/org.apache.ace.deployment.itest/bnd.bnd b/org.apache.ace.deployment.itest/bnd.bnd
index 272fcb52a..c89376521 100644
--- a/org.apache.ace.deployment.itest/bnd.bnd
+++ b/org.apache.ace.deployment.itest/bnd.bnd
@@ -57,7 +57,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.ext;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.repository.servlets;version=latest,\
 	org.apache.ace.repository.task;version=latest,\
 	org.apache.ace.scheduler.impl;version=latest,\
 	org.apache.ace.scheduler.api;version=latest,\
diff --git a/org.apache.ace.repository.itest/bnd.bnd b/org.apache.ace.repository.itest/bnd.bnd
index 94c4cf5f3..73fbd33cc 100644
--- a/org.apache.ace.repository.itest/bnd.bnd
+++ b/org.apache.ace.repository.itest/bnd.bnd
@@ -9,7 +9,6 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 	org.apache.ace.test;version=latest,\
 	org.apache.ace.http.listener;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
 	org.apache.felix.dependencymanager
 -runfw: org.apache.felix.framework;version='[5.2.0,6)'
 -runvm: -ea
@@ -27,7 +26,7 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;org.apache.ace.it.IntegrationTestBase}
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.repository.servlet;version=latest
+	org.apache.ace.repository.servlets;version=latest
 Private-Package: org.apache.ace.it.repository
 Bundle-Version: 1.0.0
 Bundle-Name: Apache ACE Repository itest
diff --git a/org.apache.ace.repository/servlet.bnd b/org.apache.ace.repository/servlets.bnd
similarity index 100%
rename from org.apache.ace.repository/servlet.bnd
rename to org.apache.ace.repository/servlets.bnd
diff --git a/org.apache.ace.useradmin.ui.itest/bnd.bnd b/org.apache.ace.useradmin.ui.itest/bnd.bnd
index 3683070df..05b542728 100644
--- a/org.apache.ace.useradmin.ui.itest/bnd.bnd
+++ b/org.apache.ace.useradmin.ui.itest/bnd.bnd
@@ -29,7 +29,7 @@ Private-Package: org.apache.ace.useradmin.ui.test
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.repository.servlets;version=latest,\
 	org.apache.ace.resourceprocessor.useradmin;version=latest,\
 	org.apache.ace.scheduler.impl;version=latest,\
 	org.apache.ace.test;version=latest,\
diff --git a/run-relay/relay.bndrun b/run-relay/relay.bndrun
index bdf6c055e..0153acd52 100644
--- a/run-relay/relay.bndrun
+++ b/run-relay/relay.bndrun
@@ -38,7 +38,7 @@
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.repository.servlets;version=latest,\
 	org.apache.ace.repository.task;version=latest,\
 	org.apache.ace.scheduler.impl;version=latest
 -runrepos: Workspace,\
diff --git a/run-server-allinone/server-allinone.bndrun b/run-server-allinone/server-allinone.bndrun
index 8526167b1..b4042bd32 100644
--- a/run-server-allinone/server-allinone.bndrun
+++ b/run-server-allinone/server-allinone.bndrun
@@ -50,7 +50,7 @@
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.repository.servlets;version=latest,\
 	org.apache.ace.resourceprocessor.useradmin;version=latest,\
 	org.apache.ace.scheduler.impl;version=latest,\
 	org.apache.ace.tageditor;version=latest,\
diff --git a/run-server/server.bndrun b/run-server/server.bndrun
index 24555843c..45406c52b 100644
--- a/run-server/server.bndrun
+++ b/run-server/server.bndrun
@@ -34,7 +34,7 @@
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.repository.servlets;version=latest,\
 	org.apache.ace.resourceprocessor.useradmin;version=latest,\
 	org.apache.ace.scheduler.impl;version=latest,\
 	org.apache.ace.log.server.store.api;version=latest,\