11 files changed, 36 insertions, 36 deletions
diff --git a/Swiften/Elements/EnableSessionManagement.h b/Swiften/Elements/EnableStreamManagement.h
index f89ac2e..3383e77 100644
--- a/Swiften/Elements/EnableSessionManagement.h
+++ b/Swiften/Elements/EnableStreamManagement.h
@@ -10,8 +10,8 @@
 #include "Swiften/Base/Shared.h"
 
 namespace Swift {
-	class EnableSessionManagement : public Element, public Shared<EnableSessionManagement> {
+	class EnableStreamManagement : public Element, public Shared<EnableStreamManagement> {
 		public:
-			EnableSessionManagement() {}
+			EnableStreamManagement() {}
 	};
 }
diff --git a/Swiften/Elements/SessionManagementFailed.h b/Swiften/Elements/StreamManagementEnabled.h
index e71f2a6..12cff51 100644
--- a/Swiften/Elements/SessionManagementFailed.h
+++ b/Swiften/Elements/StreamManagementEnabled.h
@@ -10,8 +10,8 @@
 #include "Swiften/Base/Shared.h"
 
 namespace Swift {
-	class SessionManagementFailed : public Element, public Shared<SessionManagementFailed> {
+	class StreamManagementEnabled : public Element, public Shared<StreamManagementEnabled> {
 		public:
-			SessionManagementFailed() {}
+			StreamManagementEnabled() {}
 	};
 }
diff --git a/Swiften/Elements/SessionManagementEnabled.h b/Swiften/Elements/StreamManagementFailed.h
index 1645ca4..e95d767 100644
--- a/Swiften/Elements/SessionManagementEnabled.h
+++ b/Swiften/Elements/StreamManagementFailed.h
@@ -10,8 +10,8 @@
 #include "Swiften/Base/Shared.h"
 
 namespace Swift {
-	class SessionManagementEnabled : public Element, public Shared<SessionManagementEnabled> {
+	class StreamManagementFailed : public Element, public Shared<StreamManagementFailed> {
 		public:
-			SessionManagementEnabled() {}
+			StreamManagementFailed() {}
 	};
 }
diff --git a/Swiften/Parser/SessionManagementFailedParser.h b/Swiften/Parser/EnableStreamManagementParser.h
index 945cade..bd86420 100644
--- a/Swiften/Parser/SessionManagementFailedParser.h
+++ b/Swiften/Parser/EnableStreamManagementParser.h
@@ -7,11 +7,11 @@
 #pragma once
 
 #include "Swiften/Parser/GenericElementParser.h"
-#include "Swiften/Elements/SessionManagementFailed.h"
+#include "Swiften/Elements/EnableStreamManagement.h"
 
 namespace Swift {
-	class SessionManagementFailedParser : public GenericElementParser<SessionManagementFailed> {
+	class EnableStreamManagementParser : public GenericElementParser<EnableStreamManagement> {
 		public:
-			SessionManagementFailedParser() : GenericElementParser<SessionManagementFailed>() {}
+			EnableStreamManagementParser() : GenericElementParser<EnableStreamManagement>() {}
 	};
 }
diff --git a/Swiften/Parser/EnableSessionManagementParser.h b/Swiften/Parser/StreamManagementEnabledParser.h
index 8a878fd..adc45ab 100644
--- a/Swiften/Parser/EnableSessionManagementParser.h
+++ b/Swiften/Parser/StreamManagementEnabledParser.h
@@ -7,11 +7,11 @@
 #pragma once
 
 #include "Swiften/Parser/GenericElementParser.h"
-#include "Swiften/Elements/EnableSessionManagement.h"
+#include "Swiften/Elements/StreamManagementEnabled.h"
 
 namespace Swift {
-	class EnableSessionManagementParser : public GenericElementParser<EnableSessionManagement> {
+	class StreamManagementEnabledParser : public GenericElementParser<StreamManagementEnabled> {
 		public:
-			EnableSessionManagementParser() : GenericElementParser<EnableSessionManagement>() {}
+			StreamManagementEnabledParser() : GenericElementParser<StreamManagementEnabled>() {}
 	};
 }
diff --git a/Swiften/Parser/SessionManagementEnabledParser.h b/Swiften/Parser/StreamManagementFailedParser.h
index 968ea3e..07f5935 100644
--- a/Swiften/Parser/SessionManagementEnabledParser.h
+++ b/Swiften/Parser/StreamManagementFailedParser.h
@@ -7,11 +7,11 @@
 #pragma once
 
 #include "Swiften/Parser/GenericElementParser.h"
-#include "Swiften/Elements/SessionManagementEnabled.h"
+#include "Swiften/Elements/StreamManagementFailed.h"
 
 namespace Swift {
-	class SessionManagementEnabledParser : public GenericElementParser<SessionManagementEnabled> {
+	class StreamManagementFailedParser : public GenericElementParser<StreamManagementFailed> {
 		public:
-			SessionManagementEnabledParser() : GenericElementParser<SessionManagementEnabled>() {}
+			StreamManagementFailedParser() : GenericElementParser<StreamManagementFailed>() {}
 	};
 }
diff --git a/Swiften/Parser/XMPPParser.cpp b/Swiften/Parser/XMPPParser.cpp
index 9b8a604..034077e 100644
--- a/Swiften/Parser/XMPPParser.cpp
+++ b/Swiften/Parser/XMPPParser.cpp
@@ -25,9 +25,9 @@
 #include "Swiften/Parser/AuthFailureParser.h"
 #include "Swiften/Parser/AuthChallengeParser.h"
 #include "Swiften/Parser/AuthResponseParser.h"
-#include "Swiften/Parser/EnableSessionManagementParser.h"
-#include "Swiften/Parser/SessionManagementEnabledParser.h"
-#include "Swiften/Parser/SessionManagementFailedParser.h"
+#include "Swiften/Parser/EnableStreamManagementParser.h"
+#include "Swiften/Parser/StreamManagementEnabledParser.h"
+#include "Swiften/Parser/StreamManagementFailedParser.h"
 #include "Swiften/Parser/StanzaAckParser.h"
 #include "Swiften/Parser/StanzaAckRequestParser.h"
 #include "Swiften/Parser/StartTLSParser.h"
@@ -165,13 +165,13 @@ ElementParser* XMPPParser::createElementParser(const String& element, const Stri
 		return new TLSProceedParser();
 	}
 	else if (element == "enable" && ns == "urn:xmpp:sm:2") {
-		return new EnableSessionManagementParser();
+		return new EnableStreamManagementParser();
 	}
 	else if (element == "enabled" && ns == "urn:xmpp:sm:2") {
-		return new SessionManagementEnabledParser();
+		return new StreamManagementEnabledParser();
 	}
 	else if (element == "failed" && ns == "urn:xmpp:sm:2") {
-		return new SessionManagementFailedParser();
+		return new StreamManagementFailedParser();
 	}
 	else if (element == "a" && ns == "urn:xmpp:sm:2") {
 		return new StanzaAckParser();
diff --git a/Swiften/Serializer/EnableSessionManagementSerializer.h b/Swiften/Serializer/EnableStreamManagementSerializer.h
index 0820cdf..c5a5011 100644
--- a/Swiften/Serializer/EnableSessionManagementSerializer.h
+++ b/Swiften/Serializer/EnableStreamManagementSerializer.h
@@ -8,14 +8,14 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "Swiften/Elements/EnableSessionManagement.h"
+#include "Swiften/Elements/EnableStreamManagement.h"
 #include "Swiften/Serializer/GenericElementSerializer.h"
 #include "Swiften/Serializer/XML/XMLElement.h"
 
 namespace Swift {
-	class EnableSessionManagementSerializer : public GenericElementSerializer<EnableSessionManagement> {
+	class EnableStreamManagementSerializer : public GenericElementSerializer<EnableStreamManagement> {
 		public:
-			EnableSessionManagementSerializer() : GenericElementSerializer<EnableSessionManagement>() {
+			EnableStreamManagementSerializer() : GenericElementSerializer<EnableStreamManagement>() {
 			}
 
 			virtual String serialize(boost::shared_ptr<Element>) const {
diff --git a/Swiften/Serializer/SessionManagementEnabledSerializer.h b/Swiften/Serializer/StreamManagementEnabledSerializer.h
index 4c492b7..a135390 100644
--- a/Swiften/Serializer/SessionManagementEnabledSerializer.h
+++ b/Swiften/Serializer/StreamManagementEnabledSerializer.h
@@ -8,14 +8,14 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "Swiften/Elements/SessionManagementEnabled.h"
+#include "Swiften/Elements/StreamManagementEnabled.h"
 #include "Swiften/Serializer/GenericElementSerializer.h"
 #include "Swiften/Serializer/XML/XMLElement.h"
 
 namespace Swift {
-	class SessionManagementEnabledSerializer : public GenericElementSerializer<SessionManagementEnabled> {
+	class StreamManagementEnabledSerializer : public GenericElementSerializer<StreamManagementEnabled> {
 		public:
-			SessionManagementEnabledSerializer() : GenericElementSerializer<SessionManagementEnabled>() {
+			StreamManagementEnabledSerializer() : GenericElementSerializer<StreamManagementEnabled>() {
 			}
 
 			virtual String serialize(boost::shared_ptr<Element>) const {
diff --git a/Swiften/Serializer/SessionManagementFailedSerializer.h b/Swiften/Serializer/StreamManagementFailedSerializer.h
index ecc0cb8..d6aa24b 100644
--- a/Swiften/Serializer/SessionManagementFailedSerializer.h
+++ b/Swiften/Serializer/StreamManagementFailedSerializer.h
@@ -8,14 +8,14 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "Swiften/Elements/SessionManagementFailed.h"
+#include "Swiften/Elements/StreamManagementFailed.h"
 #include "Swiften/Serializer/GenericElementSerializer.h"
 #include "Swiften/Serializer/XML/XMLElement.h"
 
 namespace Swift {
-	class SessionManagementFailedSerializer : public GenericElementSerializer<SessionManagementFailed> {
+	class StreamManagementFailedSerializer : public GenericElementSerializer<StreamManagementFailed> {
 		public:
-			SessionManagementFailedSerializer() : GenericElementSerializer<SessionManagementFailed>() {
+			StreamManagementFailedSerializer() : GenericElementSerializer<StreamManagementFailed>() {
 			}
 
 			virtual String serialize(boost::shared_ptr<Element>) const {
diff --git a/Swiften/Serializer/XMPPSerializer.cpp b/Swiften/Serializer/XMPPSerializer.cpp
index b619cae..d2eb520 100644
--- a/Swiften/Serializer/XMPPSerializer.cpp
+++ b/Swiften/Serializer/XMPPSerializer.cpp
@@ -19,9 +19,9 @@
 #include "Swiften/Serializer/AuthSuccessSerializer.h"
 #include "Swiften/Serializer/AuthChallengeSerializer.h"
 #include "Swiften/Serializer/AuthResponseSerializer.h"
-#include "Swiften/Serializer/EnableSessionManagementSerializer.h"
-#include "Swiften/Serializer/SessionManagementEnabledSerializer.h"
-#include "Swiften/Serializer/SessionManagementFailedSerializer.h"
+#include "Swiften/Serializer/EnableStreamManagementSerializer.h"
+#include "Swiften/Serializer/StreamManagementEnabledSerializer.h"
+#include "Swiften/Serializer/StreamManagementFailedSerializer.h"
 #include "Swiften/Serializer/StanzaAckSerializer.h"
 #include "Swiften/Serializer/StanzaAckRequestSerializer.h"
 #include "Swiften/Serializer/StartTLSRequestSerializer.h"
@@ -48,9 +48,9 @@ XMPPSerializer::XMPPSerializer(PayloadSerializerCollection* payloadSerializers)
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new StartTLSFailureSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new TLSProceedSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new StreamFeaturesSerializer()));
-	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new EnableSessionManagementSerializer()));
-	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new SessionManagementEnabledSerializer()));
-	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new SessionManagementFailedSerializer()));
+	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new EnableStreamManagementSerializer()));
+	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new StreamManagementEnabledSerializer()));
+	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new StreamManagementFailedSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new StanzaAckSerializer()));
 	serializers_.push_back(boost::shared_ptr<ElementSerializer>(new StanzaAckRequestSerializer()));
 }