5 files changed, 15 insertions, 15 deletions
diff --git a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp
index 463ebea..971d693 100644
--- a/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubEventSubscriptionConvertor.cpp
@@ -52,7 +52,7 @@ boost::shared_ptr<PubSubEventSubscription> PubSubEventSubscriptionConvertor::doC
 		}
 	}
 	lua_pop(L, 1);
-	lua_getfield(L, -1, "subscriptionid");
+	lua_getfield(L, -1, "subscription_id");
 	if (lua_isstring(L, -1)) {
 		result->setSubscriptionID(std::string(lua_tostring(L, -1)));
 	}
@@ -88,7 +88,7 @@ void PubSubEventSubscriptionConvertor::doConvertToLua(lua_State* L, boost::share
 	lua_setfield(L, -2, "subscription");
 	if (payload->getSubscriptionID()) {
 		lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
-		lua_setfield(L, -2, "subscriptionid");
+		lua_setfield(L, -2, "subscription_id");
 	}
 	lua_pushstring(L, dateTimeToString(payload->getExpiry()).c_str());
 	lua_setfield(L, -2, "expiry");
@@ -101,7 +101,7 @@ boost::optional<LuaElementConvertor::Documentation> PubSubEventSubscriptionConve
 		"- `node`: string\n"
 		"- `jid`: jid (string)\n"
 		"- `subscription`: `\"none\"`, `\"pending\"`, `\"subscribed\"`, or `\"unconfigured\"`\n"
-		"- `subscriptionid`: string (Optional)\n"
+		"- `subscription_id`: string (Optional)\n"
 		"- `expiry`: datetime (string)\n"
 	);
 }
diff --git a/Sluift/ElementConvertors/PubSubItemsConvertor.cpp b/Sluift/ElementConvertors/PubSubItemsConvertor.cpp
index 24ad6c8..03df694 100644
--- a/Sluift/ElementConvertors/PubSubItemsConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubItemsConvertor.cpp
@@ -52,7 +52,7 @@ boost::shared_ptr<PubSubItems> PubSubItemsConvertor::doConvertFromLua(lua_State*
 		result->setMaximumItems(boost::numeric_cast<unsigned int>(lua_tonumber(L, -1)));
 	}
 	lua_pop(L, 1);
-	lua_getfield(L, -1, "subscriptionid");
+	lua_getfield(L, -1, "subscription_id");
 	if (lua_isstring(L, -1)) {
 		result->setSubscriptionID(std::string(lua_tostring(L, -1)));
 	}
@@ -81,7 +81,7 @@ void PubSubItemsConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<PubSub
 	}
 	if (payload->getSubscriptionID()) {
 		lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
-		lua_setfield(L, -2, "subscriptionid");
+		lua_setfield(L, -2, "subscription_id");
 	}
 }
 
@@ -92,6 +92,6 @@ boost::optional<LuaElementConvertor::Documentation> PubSubItemsConvertor::getDoc
 		"- `node`: string\n"
 		"- `items`: array<@{PubSubItem}>\n"
 		"- `maximum_items`: number (Optional)\n"
-		"- `subscriptionid`: string (Optional)\n"
+		"- `subscription_id`: string (Optional)\n"
 	);
 }
diff --git a/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp b/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp
index 874bb05..589f983 100644
--- a/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubOptionsConvertor.cpp
@@ -43,7 +43,7 @@ boost::shared_ptr<PubSubOptions> PubSubOptionsConvertor::doConvertFromLua(lua_St
 		}
 	}
 	lua_pop(L, 1);
-	lua_getfield(L, -1, "subscriptionid");
+	lua_getfield(L, -1, "subscription_id");
 	if (lua_isstring(L, -1)) {
 		result->setSubscriptionID(std::string(lua_tostring(L, -1)));
 	}
@@ -62,7 +62,7 @@ void PubSubOptionsConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<PubS
 	}
 	if (payload->getSubscriptionID()) {
 		lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
-		lua_setfield(L, -2, "subscriptionid");
+		lua_setfield(L, -2, "subscription_id");
 	}
 }
 
@@ -73,6 +73,6 @@ boost::optional<LuaElementConvertor::Documentation> PubSubOptionsConvertor::getD
 		"- `node`: string\n"
 		"- `jid`: jid (string)\n"
 		"- `data`: @{Form}\n"
-		"- `subscriptionid`: string (Optional)\n"
+		"- `subscription_id`: string (Optional)\n"
 	);
 }
diff --git a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp
index 9be9572..53b573f 100644
--- a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.cpp
@@ -31,7 +31,7 @@ boost::shared_ptr<PubSubSubscription> PubSubSubscriptionConvertor::doConvertFrom
 		result->setNode(std::string(lua_tostring(L, -1)));
 	}
 	lua_pop(L, 1);
-	lua_getfield(L, -1, "subscriptionid");
+	lua_getfield(L, -1, "subscription_id");
 	if (lua_isstring(L, -1)) {
 		result->setSubscriptionID(std::string(lua_tostring(L, -1)));
 	}
@@ -75,7 +75,7 @@ void PubSubSubscriptionConvertor::doConvertToLua(lua_State* L, boost::shared_ptr
 	}
 	if (payload->getSubscriptionID()) {
 		lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
-		lua_setfield(L, -2, "subscriptionid");
+		lua_setfield(L, -2, "subscription_id");
 	}
 	lua_pushstring(L, payload->getJID().toString().c_str());
 	lua_setfield(L, -2, "jid");
@@ -104,7 +104,7 @@ boost::optional<LuaElementConvertor::Documentation> PubSubSubscriptionConvertor:
 		"PubSubSubscription",
 		"This table has the following fields:\n\n"
 		"- `node`: string (Optional)\n"
-		"- `subscriptionid`: string (Optional)\n"
+		"- `subscription_id`: string (Optional)\n"
 		"- `jid`: jid (string)\n"
 		"- `options`: @{PubSubSubscribeOptions}\n"
 		"- `subscription`: `\"none\"`, `\"pending\"`, `\"subscribed\"`, or `\"unconfigured\"`\n"
diff --git a/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp b/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp
index 362dd58..9305353 100644
--- a/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp
+++ b/Sluift/ElementConvertors/PubSubUnsubscribeConvertor.cpp
@@ -36,7 +36,7 @@ boost::shared_ptr<PubSubUnsubscribe> PubSubUnsubscribeConvertor::doConvertFromLu
 		result->setJID(JID(std::string(lua_tostring(L, -1))));
 	}
 	lua_pop(L, 1);
-	lua_getfield(L, -1, "subscriptionid");
+	lua_getfield(L, -1, "subscription_id");
 	if (lua_isstring(L, -1)) {
 		result->setSubscriptionID(std::string(lua_tostring(L, -1)));
 	}
@@ -54,7 +54,7 @@ void PubSubUnsubscribeConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<
 	lua_setfield(L, -2, "jid");
 	if (payload->getSubscriptionID()) {
 		lua_pushstring(L, (*payload->getSubscriptionID()).c_str());
-		lua_setfield(L, -2, "subscriptionid");
+		lua_setfield(L, -2, "subscription_id");
 	}
 }
 
@@ -64,6 +64,6 @@ boost::optional<LuaElementConvertor::Documentation> PubSubUnsubscribeConvertor::
 		"This table has the following fields:\n\n"
 		"- `node`: string (Optional)\n"
 		"- `jid`: jid (string)\n"
-		"- `subscriptionid`: string (Optional)\n"
+		"- `subscription_id`: string (Optional)\n"
 	);
 }