2 files changed, 17 insertions, 17 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp
index 97a4655..59df665 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp
@@ -26,11 +26,11 @@ class PrivateStorageSerializerTest : public CppUnit::TestFixture {
 
 			boost::shared_ptr<PrivateStorage> privateStorage(new PrivateStorage());
 			boost::shared_ptr<Storage> storage(new Storage());
-			Storage::Conference conference;
-			conference.name = "Swift";
-			conference.jid = JID("swift@rooms.swift.im");
-			conference.nick = "Alice";
-			storage->addConference(conference);
+			Storage::Room room;
+			room.name = "Swift";
+			room.jid = JID("swift@rooms.swift.im");
+			room.nick = "Alice";
+			storage->addRoom(room);
 			privateStorage->setPayload(storage);
 
 			CPPUNIT_ASSERT_EQUAL(String(
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/StorageSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/StorageSerializerTest.cpp
index 5888731..8add953 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/StorageSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/StorageSerializerTest.cpp
@@ -24,13 +24,13 @@ class StorageSerializerTest : public CppUnit::TestFixture {
 		void testSerialize() {
 			PayloadsSerializer serializer;
 			boost::shared_ptr<Storage> storage(new Storage());
-			Storage::Conference conference;
-			conference.name = "Council of Oberon";
-			conference.autoJoin = true;
-			conference.jid = JID("council@conference.underhill.org");
-			conference.nick = "Puck";
-			conference.password = "MyPass";
-			storage->addConference(conference);
+			Storage::Room room;
+			room.name = "Council of Oberon";
+			room.autoJoin = true;
+			room.jid = JID("council@conference.underhill.org");
+			room.nick = "Puck";
+			room.password = "MyPass";
+			storage->addRoom(room);
 			Storage::URL url;
 			url.name = "Complete Works of Shakespeare";
 			url.url = "http://the-tech.mit.edu/Shakespeare/";
@@ -52,11 +52,11 @@ class StorageSerializerTest : public CppUnit::TestFixture {
 		void testSerialize_NoNickOrPassword() {
 			PayloadsSerializer serializer;
 			boost::shared_ptr<Storage> storage(new Storage());
-			Storage::Conference conference;
-			conference.name = "Council of Oberon";
-			conference.autoJoin = true;
-			conference.jid = JID("council@conference.underhill.org");
-			storage->addConference(conference);
+			Storage::Room room;
+			room.name = "Council of Oberon";
+			room.autoJoin = true;
+			room.jid = JID("council@conference.underhill.org");
+			storage->addRoom(room);
 
 			CPPUNIT_ASSERT_EQUAL(String(
 				"<storage xmlns=\"storage:bookmarks\">"