diff --git a/src/plugin/parsefilter-debug/plugin.xml b/src/plugin/parsefilter-debug/plugin.xml
index bc4a57429d..027d8fd6e1 100644
--- a/src/plugin/parsefilter-debug/plugin.xml
+++ b/src/plugin/parsefilter-debug/plugin.xml
@@ -31,8 +31,8 @@
       <import plugin="nutch-extensionpoints"/>
    </requires>
 
-   <extension id="org.apache.nutch.htmlparsefilter.regex"
-        name="Nutch Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
+   <extension id="org.apache.nutch.htmlparsefilter.debug"
+        name="Nutch Debug Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
       <implementation id="DebugParseFilter" 
                       class="org.apache.nutch.parsefilter.debug.DebugParseFilter">
       </implementation>
diff --git a/src/plugin/parsefilter-naivebayes/plugin.xml b/src/plugin/parsefilter-naivebayes/plugin.xml
index c4983e1c9b..32d7ce065a 100644
--- a/src/plugin/parsefilter-naivebayes/plugin.xml
+++ b/src/plugin/parsefilter-naivebayes/plugin.xml
@@ -32,7 +32,7 @@
    </requires>
 
    <extension id="org.apache.nutch.htmlparsefilter.naivebayes"
-        name="Nutch Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
+        name="Nutch NaiveBayes Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
       <implementation id="NaiveBayesHTMLParseFilter" 
         class="org.apache.nutch.parsefilter.naivebayes.NaiveBayesParseFilter"/>
    </extension>
diff --git a/src/plugin/parsefilter-regex/plugin.xml b/src/plugin/parsefilter-regex/plugin.xml
index 072549257e..0821d2d7c5 100644
--- a/src/plugin/parsefilter-regex/plugin.xml
+++ b/src/plugin/parsefilter-regex/plugin.xml
@@ -32,7 +32,7 @@
    </requires>
 
    <extension id="org.apache.nutch.htmlparsefilter.regex"
-        name="Nutch Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
+        name="Nutch Regex Parser Filter" point="org.apache.nutch.parse.HtmlParseFilter">
       <implementation id="RegexParseFilter" 
                       class="org.apache.nutch.parsefilter.regex.RegexParseFilter">
           <parameter name="file" value="regex-parsefilter.txt"/>
diff --git a/src/plugin/protocol-htmlunit/plugin.xml b/src/plugin/protocol-htmlunit/plugin.xml
index 36bcb80777..e39618fc7a 100644
--- a/src/plugin/protocol-htmlunit/plugin.xml
+++ b/src/plugin/protocol-htmlunit/plugin.xml
@@ -33,8 +33,8 @@
     <import plugin="lib-htmlunit"/>
   </requires>
 
-  <extension id="org.apache.nutch.protocol.http"
-             name="HttpProtocol"
+  <extension id="org.apache.nutch.protocol.htmlunit"
+             name="HtmlUnitHttpProtocol"
              point="org.apache.nutch.protocol.Protocol">
 
     <implementation id="org.apache.nutch.protocol.htmlunit.Http"
diff --git a/src/plugin/protocol-httpclient/plugin.xml b/src/plugin/protocol-httpclient/plugin.xml
index 17477137d7..453ddca4e0 100644
--- a/src/plugin/protocol-httpclient/plugin.xml
+++ b/src/plugin/protocol-httpclient/plugin.xml
@@ -34,7 +34,7 @@
    </requires>
    
    <extension id="org.apache.nutch.protocol.httpclient"
-      name="HttpProtocol"
+      name="HttpClientProtocol"
       point="org.apache.nutch.protocol.Protocol">
       
       <implementation id="org.apache.nutch.protocol.httpclient.Http"
@@ -42,12 +42,6 @@
          <parameter name="protocolName" value="http"/>
       </implementation>
       
-   </extension>
-   
-   <extension id="org.apache.nutch.protocol.https"
-      name="HttpsProtocol"
-      point="org.apache.nutch.protocol.Protocol">
-      
       <implementation id="org.apache.nutch.protocol.httpclient.Http"
          class="org.apache.nutch.protocol.httpclient.Http">
          <parameter name="protocolName" value="https"/>
diff --git a/src/plugin/protocol-interactiveselenium/plugin.xml b/src/plugin/protocol-interactiveselenium/plugin.xml
index 9f3593029e..876dd53b13 100644
--- a/src/plugin/protocol-interactiveselenium/plugin.xml
+++ b/src/plugin/protocol-interactiveselenium/plugin.xml
@@ -34,7 +34,7 @@
    </requires>
 
    <extension id="org.apache.nutch.protocol.interactiveselenium"
-              name="HttpProtocol"
+              name="InteractiveSeleniumHttpProtocol"
               point="org.apache.nutch.protocol.Protocol">
 
       <implementation id="org.apache.nutch.protocol.interactiveselenium.Http"
diff --git a/src/plugin/protocol-selenium/plugin.xml b/src/plugin/protocol-selenium/plugin.xml
index 0f3b974fd7..40dd40688b 100644
--- a/src/plugin/protocol-selenium/plugin.xml
+++ b/src/plugin/protocol-selenium/plugin.xml
@@ -34,7 +34,7 @@
    </requires>
 
    <extension id="org.apache.nutch.protocol.selenium"
-              name="HttpProtocol"
+              name="SeleniumHttpProtocol"
               point="org.apache.nutch.protocol.Protocol">
 
       <implementation id="org.apache.nutch.protocol.selenium.Http"