2 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Component/CoreComponent.cpp b/Swiften/Component/CoreComponent.cpp
index e630ddf..e11d2b0 100644
--- a/Swiften/Component/CoreComponent.cpp
+++ b/Swiften/Component/CoreComponent.cpp
@@ -108,35 +108,35 @@ void CoreComponent::handleSessionFinished(boost::shared_ptr<Error> error) {
 			switch(actualError->type) {
 				case ComponentSession::Error::AuthenticationFailedError:
 					componentError = ComponentError(ComponentError::AuthenticationFailedError);
 					break;
 				case ComponentSession::Error::UnexpectedElementError:
 					componentError = ComponentError(ComponentError::UnexpectedElementError);
 					break;
 			}
 		}
-		else if (boost::shared_ptr<SessionStream::Error> actualError = boost::dynamic_pointer_cast<SessionStream::Error>(error)) {
+		else if (boost::shared_ptr<SessionStream::SessionStreamError> actualError = boost::dynamic_pointer_cast<SessionStream::SessionStreamError>(error)) {
 			switch(actualError->type) {
-				case SessionStream::Error::ParseError:
+				case SessionStream::SessionStreamError::ParseError:
 					componentError = ComponentError(ComponentError::XMLError);
 					break;
-				case SessionStream::Error::TLSError:
+				case SessionStream::SessionStreamError::TLSError:
 					assert(false);
 					componentError = ComponentError(ComponentError::UnknownError);
 					break;
-				case SessionStream::Error::InvalidTLSCertificateError:
+				case SessionStream::SessionStreamError::InvalidTLSCertificateError:
 					assert(false);
 					componentError = ComponentError(ComponentError::UnknownError);
 					break;
-				case SessionStream::Error::ConnectionReadError:
+				case SessionStream::SessionStreamError::ConnectionReadError:
 					componentError = ComponentError(ComponentError::ConnectionReadError);
 					break;
-				case SessionStream::Error::ConnectionWriteError:
+				case SessionStream::SessionStreamError::ConnectionWriteError:
 					componentError = ComponentError(ComponentError::ConnectionWriteError);
 					break;
 			}
 		}
 		onError(componentError);
 	}
 }
 
 void CoreComponent::handleDataRead(const SafeByteArray& data) {
diff --git a/Swiften/Component/UnitTest/ComponentSessionTest.cpp b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
index 9763c7f..da9ca7d 100644
--- a/Swiften/Component/UnitTest/ComponentSessionTest.cpp
+++ b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
@@ -153,19 +153,19 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 				virtual void setWhitespacePingEnabled(bool enabled) {
 					whitespacePingEnabled = enabled;
 				}
 
 				virtual void resetXMPPParser() {
 					resetCount++;
 				}
 
 				void breakConnection() {
-					onClosed(boost::make_shared<SessionStream::Error>(SessionStream::Error::ConnectionReadError));
+					onClosed(boost::make_shared<SessionStream::SessionStreamError>(SessionStream::SessionStreamError::ConnectionReadError));
 				}
 
 				void sendStreamStart() {
 					ProtocolHeader header;
 					header.setFrom("service.foo.com");
 					return onStreamStartReceived(header);
 				}
 
 				void sendHandshakeResponse() {