diff --git a/core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java b/core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
index 1c05526fc..c29548797 100644
--- a/core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
+++ b/core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
@@ -29,7 +29,7 @@ import java.util.Map;
  *
  * <table border=1>
  *      <hr><td><b>Code</b></td><td><b>XMPP Error</b></td><td><b>Type</b></td></hr>
- *      <tr><td>500</td><td>interna-server-error</td><td>WAIT</td></tr>
+ *      <tr><td>500</td><td>internal-server-error</td><td>WAIT</td></tr>
  *      <tr><td>403</td><td>forbidden</td><td>AUTH</td></tr>
  *      <tr><td>400</td<td>bad-request</td><td>MODIFY</td>></tr>
  *      <tr><td>404</td><td>item-not-found</td><td>CANCEL</td></tr>
@@ -313,7 +313,7 @@ public class XMPPError {
      */
     public static class Condition {
 
-        public static final Condition interna_server_error = new Condition("internal-server-error");
+        public static final Condition internal_server_error = new Condition("internal-server-error");
         public static final Condition forbidden = new Condition("forbidden");
         public static final Condition bad_request = new Condition("bad-request");
         public static final Condition conflict = new Condition("conflict");
@@ -368,8 +368,8 @@ public class XMPPError {
         }
 
         static {
-            instances.put(Condition.interna_server_error, new ErrorSpecification(
-                    Condition.interna_server_error, Type.WAIT, 500));
+            instances.put(Condition.internal_server_error, new ErrorSpecification(
+                    Condition.internal_server_error, Type.WAIT, 500));
             instances.put(Condition.forbidden, new ErrorSpecification(Condition.forbidden,
                     Type.AUTH, 403));
             instances.put(Condition.bad_request, new XMPPError.ErrorSpecification(
diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
index c9fc38374..0465fd272 100755
--- a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
+++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
@@ -636,11 +636,11 @@ public class AdHocCommandManager extends Manager {
         }
         catch (InstantiationException e) {
             throw new XMPPException(new XMPPError(
-                    XMPPError.Condition.interna_server_error));
+                    XMPPError.Condition.internal_server_error));
         }
         catch (IllegalAccessException e) {
             throw new XMPPException(new XMPPError(
-                    XMPPError.Condition.interna_server_error));
+                    XMPPError.Condition.internal_server_error));
         }
         return command;
     }
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
index e62a7542a..4d686ce80 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
@@ -193,7 +193,7 @@ public class Socks5ClientForInitiatorTest {
     public void shouldFailIfActivateSocks5ProxyFails() throws Exception {
 
         // build error response as reply to the stream activation
-        XMPPError xmppError = new XMPPError(XMPPError.Condition.interna_server_error);
+        XMPPError xmppError = new XMPPError(XMPPError.Condition.internal_server_error);
         IQ error = new IQ() {
 
             public String getChildElementXML() {