diff --git a/source/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/source/org/jivesoftware/smackx/commands/AdHocCommandManager.java
index 633f6c0b3..b7c623934 100755
--- a/source/org/jivesoftware/smackx/commands/AdHocCommandManager.java
+++ b/source/org/jivesoftware/smackx/commands/AdHocCommandManager.java
@@ -139,8 +139,7 @@ public class AdHocCommandManager {
      * @param clazz the class of the command, which must extend {@link LocalCommand}.
      */
     public void registerCommand(String node, final String name, Class clazz) {
-        AdHocCommandInfo commandInfo = new AdHocCommandInfo(node, name,
-                connection.getUser(), clazz);
+        AdHocCommandInfo commandInfo = new AdHocCommandInfo(node, name, connection.getUser(), clazz);
 
         commands.put(node, commandInfo);
         // Set the NodeInformationProvider that will provide information about
@@ -153,7 +152,7 @@ public class AdHocCommandManager {
 
                     public List<String> getNodeFeatures() {
                         List<String> answer = new ArrayList<String>();
-                        answer.add("http://jabber.org/protocol/commands");
+                        answer.add(DISCO_NAMESPACE);
                         // TODO: check if this service is provided by the
                         // TODO: current connection.
                         answer.add("jabber:x:data");
diff --git a/test/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java b/test/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java
index b80ff83cf..3ead9510c 100644
--- a/test/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java
+++ b/test/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java
@@ -52,11 +52,7 @@
 
 package org.jivesoftware.smackx.commands;
 
-import org.jivesoftware.smack.*;
-import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.test.SmackTestCase;
-import org.jivesoftware.smack.filter.PacketFilter;
-import org.jivesoftware.smack.filter.PacketExtensionFilter;
 import org.jivesoftware.smackx.packet.DiscoverItems;
 
 /**
@@ -68,7 +64,7 @@ public class AdHocCommandDiscoTest extends SmackTestCase {
 
     /**
      * Constructor for test.
-     * @param arg0
+     * @param arg0 argument.
      */
     public AdHocCommandDiscoTest(String arg0) {
         super(arg0);