diff --git a/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java b/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java
index 9ee1d180e..aa8d32cbf 100644
--- a/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java
+++ b/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java
@@ -11,11 +11,13 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import eu.siacs.conversations.xml.Element;
+import eu.siacs.conversations.xml.Namespace;
 import eu.siacs.conversations.xmpp.forms.Data;
 import eu.siacs.conversations.xmpp.forms.Field;
 import eu.siacs.conversations.xmpp.stanzas.IqPacket;
@@ -132,7 +134,7 @@ public class ServiceDiscoveryResult {
 				if (element.getAttribute("var") != null) {
 					features.add(element.getAttribute("var"));
 				}
-			} else if (element.getName().equals("x") && "jabber:x:data".equals(element.getAttribute("xmlns"))) {
+			} else if (element.getName().equals("x") && element.getAttribute("xmlns").equals(Namespace.DATA)) {
 				forms.add(Data.parse(element));
 			}
 		}
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 638855e80..681486f6a 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2591,7 +2591,7 @@ public class XmppConnectionService extends Service {
 							}
 						}
 					}
-					Element form = query.findChild("x", "jabber:x:data");
+					Element form = query.findChild("x", Namespace.DATA);
 					if (form != null) {
 						conversation.getMucOptions().updateFormData(Data.parse(form));
 					}
@@ -2621,7 +2621,7 @@ public class XmppConnectionService extends Service {
 				if (packet.getType() == IqPacket.TYPE.RESULT) {
 					Element pubsub = packet.findChild("pubsub", "http://jabber.org/protocol/pubsub#owner");
 					Element configuration = pubsub == null ? null : pubsub.findChild("configure");
-					Element x = configuration == null ? null : configuration.findChild("x", "jabber:x:data");
+					Element x = configuration == null ? null : configuration.findChild("x", Namespace.DATA);
 					if (x != null) {
 						Data data = Data.parse(x);
 						data.submit(options);
@@ -2653,7 +2653,7 @@ public class XmppConnectionService extends Service {
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
 				if (packet.getType() == IqPacket.TYPE.RESULT) {
-					Data data = Data.parse(packet.query().findChild("x", "jabber:x:data"));
+					Data data = Data.parse(packet.query().findChild("x", Namespace.DATA));
 					data.submit(options);
 					IqPacket set = new IqPacket(IqPacket.TYPE.SET);
 					set.setTo(conversation.getJid().toBareJid());
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index b9d6f8bc6..62c9d72c6 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -978,8 +978,8 @@ public class XmppConnection implements Runnable {
 					register.query().addChild(password);
 					register.setFrom(account.getJid().toBareJid());
 					sendUnmodifiedIqPacket(register, registrationResponseListener);
-				} else if (query.hasChild("x", "jabber:x:data")) {
-					final Data data = Data.parse(query.findChild("x", "jabber:x:data"));
+				} else if (query.hasChild("x", Namespace.DATA)) {
+					final Data data = Data.parse(query.findChild("x", Namespace.DATA));
 					final Element blob = query.findChild("data", "urn:xmpp:bob");
 					final String id = packet.getId();
 					InputStream is;
diff --git a/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java b/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java
index 679379ca1..e3bd9eb74 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java
@@ -8,6 +8,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import eu.siacs.conversations.xml.Element;
+import eu.siacs.conversations.xml.Namespace;
 
 public class Data extends Element {
 
@@ -15,7 +16,7 @@ public class Data extends Element {
 
 	public Data() {
 		super("x");
-		this.setAttribute("xmlns","jabber:x:data");
+		this.setAttribute("xmlns", Namespace.DATA);
 	}
 
 	public List<Field> getFields() {
diff --git a/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java
index 2f6a569b3..d0a2dd056 100644
--- a/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java
+++ b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java
@@ -45,7 +45,7 @@ public class PushManagementService {
 						public void onIqPacketReceived(Account account, IqPacket packet) {
 							Element command = packet.findChild("command","http://jabber.org/protocol/commands");
 							if (packet.getType() == IqPacket.TYPE.RESULT && command != null) {
-								Element x = command.findChild("x","jabber:x:data");
+								Element x = command.findChild("x", Namespace.DATA);
 								if (x != null) {
 									Data data = Data.parse(x);
 									try {