diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
index a11c98d32..c3343759b 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
@@ -38,7 +38,7 @@ import java.util.Map;
  *      <tr><td>feature-not-implemented</td><td>CANCEL</td></tr>
  *      <tr><td>gone</td><td>MODIFY</td></tr>
  *      <tr><td>jid-malformed</td><td>MODIFY</td></tr>
- *      <tr><td>no-acceptable</td><td> MODIFY</td></tr>
+ *      <tr><td>not-acceptable</td><td> MODIFY</td></tr>
  *      <tr><td>not-allowed</td><td>CANCEL</td></tr>
  *      <tr><td>not-authorized</td><td>AUTH</td></tr>
  *      <tr><td>payment-required</td><td>AUTH</td></tr>
@@ -276,7 +276,7 @@ public class XMPPError {
         public static final Condition gone = new Condition("gone");
         public static final Condition item_not_found = new Condition("item-not-found");
         public static final Condition jid_malformed = new Condition("jid-malformed");
-        public static final Condition no_acceptable = new Condition("not-acceptable");
+        public static final Condition not_acceptable = new Condition("not-acceptable");
         public static final Condition not_allowed = new Condition("not-allowed");
         public static final Condition not_authorized = new Condition("not-authorized");
         public static final Condition payment_required = new Condition("payment-required");
@@ -348,8 +348,8 @@ public class XMPPError {
                     Condition.gone, Type.MODIFY));
             instances.put(Condition.jid_malformed, new XMPPError.ErrorSpecification(
                     Condition.jid_malformed, Type.MODIFY));
-            instances.put(Condition.no_acceptable, new XMPPError.ErrorSpecification(
-                    Condition.no_acceptable, Type.MODIFY));
+            instances.put(Condition.not_acceptable, new XMPPError.ErrorSpecification(
+                    Condition.not_acceptable, Type.MODIFY));
             instances.put(Condition.not_allowed, new XMPPError.ErrorSpecification(
                     Condition.not_allowed, Type.CANCEL));
             instances.put(Condition.not_authorized, new XMPPError.ErrorSpecification(
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
index 1e95de0f3..fbf4db419 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
@@ -451,7 +451,7 @@ public class InBandBytestreamManager implements BytestreamManager {
      * @throws NotConnectedException 
      */
     protected void replyRejectPacket(IQ request) throws NotConnectedException {
-        XMPPError xmppError = new XMPPError(XMPPError.Condition.no_acceptable);
+        XMPPError xmppError = new XMPPError(XMPPError.Condition.not_acceptable);
         IQ error = IQ.createErrorResponse(request, xmppError);
         this.connection.sendPacket(error);
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
index 7f16950e5..e95dd0db4 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
@@ -708,7 +708,7 @@ public final class Socks5BytestreamManager implements BytestreamManager {
      * @throws NotConnectedException 
      */
     protected void replyRejectPacket(IQ packet) throws NotConnectedException {
-        XMPPError xmppError = new XMPPError(XMPPError.Condition.no_acceptable);
+        XMPPError xmppError = new XMPPError(XMPPError.Condition.not_acceptable);
         IQ errorIQ = IQ.createErrorResponse(packet, xmppError);
         this.connection.sendPacket(errorIQ);
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
index e6a517544..923cd04ba 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
@@ -174,7 +174,7 @@ public class FileTransferManager {
 		IQ rejection = FileTransferNegotiator.createIQ(
 				initiation.getPacketID(), initiation.getFrom(), initiation
 						.getTo(), IQ.Type.ERROR);
-		rejection.setError(new XMPPError(XMPPError.Condition.no_acceptable));
+		rejection.setError(new XMPPError(XMPPError.Condition.not_acceptable));
 		connection.sendPacket(rejection);
 	}
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
index fe6073d4f..a4d94a11f 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
@@ -84,7 +84,7 @@ public class InBandBytestreamRequestTest {
         // assert that reply is the correct error packet
         assertEquals(initiatorJID, argument.getValue().getTo());
         assertEquals(IQ.Type.ERROR, argument.getValue().getType());
-        assertEquals(XMPPError.Condition.no_acceptable.toString(),
+        assertEquals(XMPPError.Condition.not_acceptable.toString(),
                         argument.getValue().getError().getCondition());
 
     }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
index 8077a8366..4eeb90273 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
@@ -92,7 +92,7 @@ public class InitiationListenerTest {
         // assert that reply is the correct error packet
         assertEquals(initiatorJID, argument.getValue().getTo());
         assertEquals(IQ.Type.ERROR, argument.getValue().getType());
-        assertEquals(XMPPError.Condition.no_acceptable.toString(),
+        assertEquals(XMPPError.Condition.not_acceptable.toString(),
                         argument.getValue().getError().getCondition());
 
     }
@@ -210,7 +210,7 @@ public class InitiationListenerTest {
         // assert that reply is the correct error packet
         assertEquals(initiatorJID, argument.getValue().getTo());
         assertEquals(IQ.Type.ERROR, argument.getValue().getType());
-        assertEquals(XMPPError.Condition.no_acceptable.toString(),
+        assertEquals(XMPPError.Condition.not_acceptable.toString(),
                         argument.getValue().getError().getCondition());
     }
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
index dcdbfe896..169058a46 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
@@ -99,7 +99,7 @@ public class InitiationListenerTest {
         // assert that reply is the correct error packet
         assertEquals(initiatorJID, argument.getValue().getTo());
         assertEquals(IQ.Type.ERROR, argument.getValue().getType());
-        assertEquals(XMPPError.Condition.no_acceptable.toString(),
+        assertEquals(XMPPError.Condition.not_acceptable.toString(),
                         argument.getValue().getError().getCondition());
 
     }
@@ -189,7 +189,7 @@ public class InitiationListenerTest {
         // assert that reply is the correct error packet
         assertEquals(initiatorJID, argument.getValue().getTo());
         assertEquals(IQ.Type.ERROR, argument.getValue().getType());
-        assertEquals(XMPPError.Condition.no_acceptable.toString(),
+        assertEquals(XMPPError.Condition.not_acceptable.toString(),
                         argument.getValue().getError().getCondition());
     }
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
index d6923bb09..48c2a4b62 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
@@ -424,7 +424,7 @@ public class Socks5ByteStreamManagerTest {
                         Verification.requestTypeGET);
 
         // build error packet to reject SOCKS5 Bytestream
-        XMPPError xmppError = new XMPPError(XMPPError.Condition.no_acceptable);
+        XMPPError xmppError = new XMPPError(XMPPError.Condition.not_acceptable);
         IQ rejectPacket = new IQ() {
 
             public String getChildElementXML() {