diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/AbstractOpenPgpIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/AbstractOpenPgpIntegrationTest.java
similarity index 98%
rename from smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/AbstractOpenPgpIntegrationTest.java
rename to smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/AbstractOpenPgpIntegrationTest.java
index b32724d52..9a612305f 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/AbstractOpenPgpIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/AbstractOpenPgpIntegrationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.openpgp;
+package org.jivesoftware.smackx.ox;
 
 import java.security.Security;
 
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/BasicOpenPgpInstantMessagingIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/BasicOpenPgpInstantMessagingIntegrationTest.java
similarity index 96%
rename from smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/BasicOpenPgpInstantMessagingIntegrationTest.java
rename to smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/BasicOpenPgpInstantMessagingIntegrationTest.java
index 84d17f0d3..468701719 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/BasicOpenPgpInstantMessagingIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/BasicOpenPgpInstantMessagingIntegrationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.openpgp;
+package org.jivesoftware.smackx.ox;
 
 import java.io.File;
 import java.util.logging.Level;
@@ -24,9 +24,6 @@ import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.FileUtils;
 import org.jivesoftware.smack.util.StringUtils;
-import org.jivesoftware.smackx.ox.OXInstantMessagingManager;
-import org.jivesoftware.smackx.ox.OpenPgpContact;
-import org.jivesoftware.smackx.ox.OpenPgpManager;
 import org.jivesoftware.smackx.ox.crypto.PainlessOpenPgpProvider;
 import org.jivesoftware.smackx.ox.element.SigncryptElement;
 import org.jivesoftware.smackx.ox.listener.OxMessageListener;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/SecretKeyBackupRestoreIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/SecretKeyBackupRestoreIntegrationTest.java
similarity index 98%
rename from smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/SecretKeyBackupRestoreIntegrationTest.java
rename to smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/SecretKeyBackupRestoreIntegrationTest.java
index c878e007d..eb00edea1 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/SecretKeyBackupRestoreIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/SecretKeyBackupRestoreIntegrationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.openpgp;
+package org.jivesoftware.smackx.ox;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
@@ -34,8 +34,6 @@ import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.util.FileUtils;
 import org.jivesoftware.smack.util.StringUtils;
-import org.jivesoftware.smackx.ox.OpenPgpManager;
-import org.jivesoftware.smackx.ox.OpenPgpSelf;
 import org.jivesoftware.smackx.ox.callback.backup.AskForBackupCodeCallback;
 import org.jivesoftware.smackx.ox.callback.backup.DisplayBackupCodeCallback;
 import org.jivesoftware.smackx.ox.callback.backup.SecretKeyBackupSelectionCallback;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/package-info.java
similarity index 95%
rename from smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/package-info.java
rename to smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/package-info.java
index 290bf1181..7479017ae 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/package-info.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ox/package-info.java
@@ -21,4 +21,4 @@
  * @see <a href="https://xmpp.org/extensions/xep-0374.html">
  *     XEP-0374: OpenPGP for XMPP: Instant Messaging</a>
  */
-package org.jivesoftware.smackx.openpgp;
+package org.jivesoftware.smackx.ox;