diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java
index 9383e60fd..cb0276d8c 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java
@@ -92,7 +92,7 @@ public class AbstractError {
      * @return the extension, or <tt>null</tt> if it doesn't exist.
      */
     public <PE extends PacketExtension> PE getExtension(String elementName, String namespace) {
-        return PacketUtil.packetExtensionfromCollection(extensions, elementName, namespace);
+        return PacketUtil.extensionElementFrom(extensions, elementName, namespace);
     }
 
     protected void addDescriptiveTextsAndExtensions(XmlStringBuilder xml) {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
index e526a9863..6194d8695 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
@@ -227,7 +227,7 @@ public abstract class Packet implements TopLevelStreamElement {
      * @return the packet extension with the given namespace.
      */
     public PacketExtension getExtension(String namespace) {
-        return PacketUtil.packetExtensionfromCollection(getExtensions(), null, namespace);
+        return PacketUtil.extensionElementFrom(getExtensions(), null, namespace);
     }
 
     /**
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java
index 854d30d34..3b3b30a77 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java
@@ -22,10 +22,33 @@ import org.jivesoftware.smack.packet.PacketExtension;
 
 public class PacketUtil {
 
-    @SuppressWarnings("unchecked")
+    /**
+     * Get a extension element from a collection
+     *
+     * @param collection
+     * @param element
+     * @param namespace
+     * @return the extension element
+     * @deprecated use {@link #extensionElementFrom(Collection, String, String)} instead
+     */
+    @Deprecated
     public static <PE extends PacketExtension> PE packetExtensionfromCollection(
                     Collection<PacketExtension> collection, String element,
                     String namespace) {
+        return extensionElementFrom(collection, element, namespace);
+    }
+
+    /**
+     * Get a extension element from a collection
+     *
+     * @param collection
+     * @param element
+     * @param namespace
+     * @return the extension element
+     */
+    @SuppressWarnings("unchecked")
+    public static <PE extends PacketExtension> PE extensionElementFrom(Collection<PacketExtension> collection,
+                    String element, String namespace) {
         for (PacketExtension packetExtension : collection) {
             if ((element == null || packetExtension.getElementName().equals(
                             element))
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/RSMManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/RSMManager.java
index a8aba4881..8cb49adf1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/RSMManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/RSMManager.java
@@ -46,7 +46,7 @@ public class RSMManager {
         if (additionalExtensions == null) {
             additionalExtensions = new LinkedList<PacketExtension>();
         }
-        RSMSet resultRsmSet = PacketUtil.packetExtensionfromCollection(returnedExtensions, RSMSet.ELEMENT, RSMSet.NAMESPACE);
+        RSMSet resultRsmSet = PacketUtil.extensionElementFrom(returnedExtensions, RSMSet.ELEMENT, RSMSet.NAMESPACE);
         if (resultRsmSet == null) {
             throw new IllegalArgumentException("returnedExtensions did not contain a RSMset");
         }