diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JingleEncryptedTransferManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java
similarity index 74%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JingleEncryptedTransferManager.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java
index 0b3987ccd..78e711064 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JingleEncryptedTransferManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java
@@ -24,25 +24,25 @@ import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.XMPPConnection;
 
 /**
- * Created by vanitas on 13.07.17.
+ * Manager for Jingle Encrypted Transfers (XEP-XXXX).
  */
-public final class JingleEncryptedTransferManager extends Manager {
+public final class JetManager extends Manager {
 
     public static final String NAMESPACE = "urn:xmpp:jingle:jet:0";
 
-    private static final WeakHashMap<XMPPConnection, JingleEncryptedTransferManager> INSTANCES = new WeakHashMap<>();
+    private static final WeakHashMap<XMPPConnection, JetManager> INSTANCES = new WeakHashMap<>();
 
     private static final Map<String, JingleEncryptionMethod> encryptionProviders = new HashMap<>();
 
-    private JingleEncryptedTransferManager(XMPPConnection connection) {
+    private JetManager(XMPPConnection connection) {
         super(connection);
     }
 
-    public static JingleEncryptedTransferManager getInstanceFor(XMPPConnection connection) {
-        JingleEncryptedTransferManager manager = INSTANCES.get(connection);
+    public static JetManager getInstanceFor(XMPPConnection connection) {
+        JetManager manager = INSTANCES.get(connection);
 
         if (manager == null) {
-            manager = new JingleEncryptedTransferManager(connection);
+            manager = new JetManager(connection);
             INSTANCES.put(connection, manager);
         }
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JingleEncryptionMethod.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JingleEncryptionMethod.java
index 53cf44475..8bc4ae8ba 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JingleEncryptionMethod.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JingleEncryptionMethod.java
@@ -25,7 +25,7 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jxmpp.jid.FullJid;
 
 /**
- * Created by vanitas on 13.07.17.
+ * Classes that implement this interface can be used to encrypt Jingle File Transfers.
  */
 public interface JingleEncryptionMethod {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JingleEncryptionMethodManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JingleEncryptionMethodManager.java
index 4eb069cec..ae669b2d4 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JingleEncryptionMethodManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JingleEncryptionMethodManager.java
@@ -22,7 +22,7 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 
 /**
- * Created by vanitas on 13.07.17.
+ * Manager where JingleEncryptionMethods can register their SecurityKeyTransportProviders.
  */
 public final class JingleEncryptionMethodManager {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/SecurityElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/SecurityElement.java
index cfb59bf32..21ad810c1 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/SecurityElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/element/SecurityElement.java
@@ -18,10 +18,10 @@ package org.jivesoftware.smackx.jet.element;
 
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.util.XmlStringBuilder;
-import org.jivesoftware.smackx.jet.JingleEncryptedTransferManager;
+import org.jivesoftware.smackx.jet.JetManager;
 
 /**
- * Created by vanitas on 13.07.17.
+ * Implementation of the Jingle security element as specified in XEP-XXXX (Jingle Encrypted Transfers).
  */
 public class SecurityElement implements ExtensionElement {
     public static final String ELEMENT = "security";
@@ -53,6 +53,6 @@ public class SecurityElement implements ExtensionElement {
 
     @Override
     public String getNamespace() {
-        return JingleEncryptedTransferManager.NAMESPACE;
+        return JetManager.NAMESPACE;
     }
 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/SecurityProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/SecurityProvider.java
index 567a1aa5b..505ed9b03 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/SecurityProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/provider/SecurityProvider.java
@@ -22,22 +22,22 @@ import java.util.logging.Logger;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.Objects;
-import org.jivesoftware.smackx.jet.JingleEncryptedTransferManager;
+import org.jivesoftware.smackx.jet.JetManager;
 import org.jivesoftware.smackx.jet.JingleEncryptionMethodManager;
 import org.jivesoftware.smackx.jet.element.SecurityElement;
 
 import org.xmlpull.v1.XmlPullParser;
 
 /**
- * Created by vanitas on 13.07.17.
+ * Provider for the Jingle security element for XEP-XXXX (Jingle Encrypted Transfers).
  */
 public class SecurityProvider extends ExtensionElementProvider<SecurityElement> {
     private static final Logger LOGGER = Logger.getLogger(SecurityProvider.class.getName());
 
     @Override
     public SecurityElement parse(XmlPullParser parser, int initialDepth) throws Exception {
-        String name = parser.getAttributeValue(JingleEncryptedTransferManager.NAMESPACE, SecurityElement.ATTR_NAME);
-        String type = parser.getAttributeValue(JingleEncryptedTransferManager.NAMESPACE, SecurityElement.ATTR_TYPE);
+        String name = parser.getAttributeValue(JetManager.NAMESPACE, SecurityElement.ATTR_NAME);
+        String type = parser.getAttributeValue(JetManager.NAMESPACE, SecurityElement.ATTR_TYPE);
         ExtensionElement child;
 
         Objects.requireNonNull(type);