Namespace: QMatrixClient -> Quotient (with back comp alias)

130 files changed, 230 insertions, 230 deletions

diff --git a/lib/csapi/account-data.cpp b/lib/csapi/account-data.cpp
index 7d4f1ad7..2e466fa3 100644
--- a/lib/csapi/account-data.cpp
+++ b/lib/csapi/account-data.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/account-data.h b/lib/csapi/account-data.h
index 75bb9ce3..7417da0d 100644
--- a/lib/csapi/account-data.h
+++ b/lib/csapi/account-data.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -122,4 +122,4 @@ public:
                                const QString& roomId, const QString& type);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/admin.cpp b/lib/csapi/admin.cpp
index 58334118..d2c20ba8 100644
--- a/lib/csapi/admin.cpp
+++ b/lib/csapi/admin.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -46,7 +46,7 @@ struct JsonObjectConverter<GetWhoIsJob::DeviceInfo>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetWhoIsJob::Private
 {
diff --git a/lib/csapi/admin.h b/lib/csapi/admin.h
index bc27c025..472ccf72 100644
--- a/lib/csapi/admin.h
+++ b/lib/csapi/admin.h
@@ -11,7 +11,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -94,4 +94,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/administrative_contact.cpp b/lib/csapi/administrative_contact.cpp
index 067fb68a..32bc8c86 100644
--- a/lib/csapi/administrative_contact.cpp
+++ b/lib/csapi/administrative_contact.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -29,7 +29,7 @@ struct JsonObjectConverter<GetAccount3PIDsJob::ThirdPartyIdentifier>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetAccount3PIDsJob::Private
 {
@@ -67,7 +67,7 @@ BaseJob::Status GetAccount3PIDsJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -82,7 +82,7 @@ struct JsonObjectConverter<Post3PIDsJob::ThreePidCredentials>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 static const auto Post3PIDsJobName = QStringLiteral("Post3PIDsJob");
 
diff --git a/lib/csapi/administrative_contact.h b/lib/csapi/administrative_contact.h
index 7f2d0cdc..4ccd7596 100644
--- a/lib/csapi/administrative_contact.h
+++ b/lib/csapi/administrative_contact.h
@@ -12,7 +12,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -256,4 +256,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/appservice_room_directory.cpp b/lib/csapi/appservice_room_directory.cpp
index 74e037cd..87221aa4 100644
--- a/lib/csapi/appservice_room_directory.cpp
+++ b/lib/csapi/appservice_room_directory.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/appservice_room_directory.h b/lib/csapi/appservice_room_directory.h
index d1c3f89f..e19bf320 100644
--- a/lib/csapi/appservice_room_directory.h
+++ b/lib/csapi/appservice_room_directory.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -42,4 +42,4 @@ public:
                                                        const QString& visibility);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/banning.cpp b/lib/csapi/banning.cpp
index a46e78f1..eac09d5a 100644
--- a/lib/csapi/banning.cpp
+++ b/lib/csapi/banning.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/banning.h b/lib/csapi/banning.h
index 0aa5785b..5df878a8 100644
--- a/lib/csapi/banning.h
+++ b/lib/csapi/banning.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -58,4 +58,4 @@ public:
     explicit UnbanJob(const QString& roomId, const QString& userId);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/capabilities.cpp b/lib/csapi/capabilities.cpp
index 9a054fe9..6a544a1e 100644
--- a/lib/csapi/capabilities.cpp
+++ b/lib/csapi/capabilities.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -49,7 +49,7 @@ struct JsonObjectConverter<GetCapabilitiesJob::Capabilities>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetCapabilitiesJob::Private
 {
diff --git a/lib/csapi/capabilities.h b/lib/csapi/capabilities.h
index f6e7ad06..b608a2f2 100644
--- a/lib/csapi/capabilities.h
+++ b/lib/csapi/capabilities.h
@@ -11,7 +11,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -84,4 +84,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/content-repo.cpp b/lib/csapi/content-repo.cpp
index c2720d63..395337f3 100644
--- a/lib/csapi/content-repo.cpp
+++ b/lib/csapi/content-repo.cpp
@@ -9,7 +9,7 @@
 #include <QtCore/QStringBuilder>
 #include <QtNetwork/QNetworkReply>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/media/r0");
 
diff --git a/lib/csapi/content-repo.h b/lib/csapi/content-repo.h
index 9f267f6c..83069490 100644
--- a/lib/csapi/content-repo.h
+++ b/lib/csapi/content-repo.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QIODevice>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -282,4 +282,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/create_room.cpp b/lib/csapi/create_room.cpp
index e94cb008..68741f13 100644
--- a/lib/csapi/create_room.cpp
+++ b/lib/csapi/create_room.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -38,7 +38,7 @@ struct JsonObjectConverter<CreateRoomJob::StateEvent>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class CreateRoomJob::Private
 {
diff --git a/lib/csapi/create_room.h b/lib/csapi/create_room.h
index a066a3f3..e7000155 100644
--- a/lib/csapi/create_room.h
+++ b/lib/csapi/create_room.h
@@ -11,7 +11,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -235,4 +235,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/auth_data.cpp b/lib/csapi/definitions/auth_data.cpp
index 3bb51626..edeb7111 100644
--- a/lib/csapi/definitions/auth_data.cpp
+++ b/lib/csapi/definitions/auth_data.cpp
@@ -4,7 +4,7 @@
 
 #include "auth_data.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<AuthenticationData>::dumpTo(
     QJsonObject& jo, const AuthenticationData& pod)
diff --git a/lib/csapi/definitions/auth_data.h b/lib/csapi/definitions/auth_data.h
index 9e46812c..1aeea6c2 100644
--- a/lib/csapi/definitions/auth_data.h
+++ b/lib/csapi/definitions/auth_data.h
@@ -9,7 +9,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -34,4 +34,4 @@ struct JsonObjectConverter<AuthenticationData>
     static void fillFrom(QJsonObject jo, AuthenticationData& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/client_device.cpp b/lib/csapi/definitions/client_device.cpp
index c9e6a223..09544138 100644
--- a/lib/csapi/definitions/client_device.cpp
+++ b/lib/csapi/definitions/client_device.cpp
@@ -4,7 +4,7 @@
 
 #include "client_device.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<Device>::dumpTo(QJsonObject& jo, const Device& pod)
 {
diff --git a/lib/csapi/definitions/client_device.h b/lib/csapi/definitions/client_device.h
index e4accc35..f076c4da 100644
--- a/lib/csapi/definitions/client_device.h
+++ b/lib/csapi/definitions/client_device.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -34,4 +34,4 @@ struct JsonObjectConverter<Device>
     static void fillFrom(const QJsonObject& jo, Device& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/device_keys.cpp b/lib/csapi/definitions/device_keys.cpp
index cc5262b7..0583840d 100644
--- a/lib/csapi/definitions/device_keys.cpp
+++ b/lib/csapi/definitions/device_keys.cpp
@@ -4,7 +4,7 @@
 
 #include "device_keys.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<DeviceKeys>::dumpTo(QJsonObject& jo,
                                              const DeviceKeys& pod)
diff --git a/lib/csapi/definitions/device_keys.h b/lib/csapi/definitions/device_keys.h
index 6bd96584..d1d8abef 100644
--- a/lib/csapi/definitions/device_keys.h
+++ b/lib/csapi/definitions/device_keys.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QHash>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -41,4 +41,4 @@ struct JsonObjectConverter<DeviceKeys>
     static void fillFrom(const QJsonObject& jo, DeviceKeys& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/event_filter.cpp b/lib/csapi/definitions/event_filter.cpp
index 9b2c7a33..b21e08b5 100644
--- a/lib/csapi/definitions/event_filter.cpp
+++ b/lib/csapi/definitions/event_filter.cpp
@@ -4,7 +4,7 @@
 
 #include "event_filter.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<EventFilter>::dumpTo(QJsonObject& jo,
                                               const EventFilter& pod)
diff --git a/lib/csapi/definitions/event_filter.h b/lib/csapi/definitions/event_filter.h
index 9b9b3fa3..b41e2e9e 100644
--- a/lib/csapi/definitions/event_filter.h
+++ b/lib/csapi/definitions/event_filter.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -40,4 +40,4 @@ struct JsonObjectConverter<EventFilter>
     static void fillFrom(const QJsonObject& jo, EventFilter& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/public_rooms_response.cpp b/lib/csapi/definitions/public_rooms_response.cpp
index d07b1494..b6009718 100644
--- a/lib/csapi/definitions/public_rooms_response.cpp
+++ b/lib/csapi/definitions/public_rooms_response.cpp
@@ -4,7 +4,7 @@
 
 #include "public_rooms_response.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<PublicRoomsChunk>::dumpTo(QJsonObject& jo,
                                                    const PublicRoomsChunk& pod)
diff --git a/lib/csapi/definitions/public_rooms_response.h b/lib/csapi/definitions/public_rooms_response.h
index e86e306f..1cb3aad5 100644
--- a/lib/csapi/definitions/public_rooms_response.h
+++ b/lib/csapi/definitions/public_rooms_response.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -67,4 +67,4 @@ struct JsonObjectConverter<PublicRoomsResponse>
     static void fillFrom(const QJsonObject& jo, PublicRoomsResponse& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/push_condition.cpp b/lib/csapi/definitions/push_condition.cpp
index 5bcb845e..343b4f1a 100644
--- a/lib/csapi/definitions/push_condition.cpp
+++ b/lib/csapi/definitions/push_condition.cpp
@@ -4,7 +4,7 @@
 
 #include "push_condition.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<PushCondition>::dumpTo(QJsonObject& jo,
                                                 const PushCondition& pod)
diff --git a/lib/csapi/definitions/push_condition.h b/lib/csapi/definitions/push_condition.h
index 2c17023e..34a183de 100644
--- a/lib/csapi/definitions/push_condition.h
+++ b/lib/csapi/definitions/push_condition.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -36,4 +36,4 @@ struct JsonObjectConverter<PushCondition>
     static void fillFrom(const QJsonObject& jo, PushCondition& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/push_rule.cpp b/lib/csapi/definitions/push_rule.cpp
index fc2be2c7..eae7e446 100644
--- a/lib/csapi/definitions/push_rule.cpp
+++ b/lib/csapi/definitions/push_rule.cpp
@@ -4,7 +4,7 @@
 
 #include "push_rule.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<PushRule>::dumpTo(QJsonObject& jo, const PushRule& pod)
 {
diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h
index fe6eb0e6..e64d6ba8 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/lib/csapi/definitions/push_rule.h
@@ -12,7 +12,7 @@
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -43,4 +43,4 @@ struct JsonObjectConverter<PushRule>
     static void fillFrom(const QJsonObject& jo, PushRule& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/push_ruleset.cpp b/lib/csapi/definitions/push_ruleset.cpp
index 6f48d27b..a2db35d9 100644
--- a/lib/csapi/definitions/push_ruleset.cpp
+++ b/lib/csapi/definitions/push_ruleset.cpp
@@ -4,7 +4,7 @@
 
 #include "push_ruleset.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<PushRuleset>::dumpTo(QJsonObject& jo,
                                               const PushRuleset& pod)
diff --git a/lib/csapi/definitions/push_ruleset.h b/lib/csapi/definitions/push_ruleset.h
index f9aedad8..b6b9670e 100644
--- a/lib/csapi/definitions/push_ruleset.h
+++ b/lib/csapi/definitions/push_ruleset.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -36,4 +36,4 @@ struct JsonObjectConverter<PushRuleset>
     static void fillFrom(const QJsonObject& jo, PushRuleset& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/room_event_filter.cpp b/lib/csapi/definitions/room_event_filter.cpp
index bd38ebc7..5613d8d2 100644
--- a/lib/csapi/definitions/room_event_filter.cpp
+++ b/lib/csapi/definitions/room_event_filter.cpp
@@ -4,7 +4,7 @@
 
 #include "room_event_filter.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<RoomEventFilter>::dumpTo(QJsonObject& jo,
                                                   const RoomEventFilter& pod)
diff --git a/lib/csapi/definitions/room_event_filter.h b/lib/csapi/definitions/room_event_filter.h
index 72bf34d3..ae06a615 100644
--- a/lib/csapi/definitions/room_event_filter.h
+++ b/lib/csapi/definitions/room_event_filter.h
@@ -8,7 +8,7 @@
 
 #include "csapi/definitions/event_filter.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -35,4 +35,4 @@ struct JsonObjectConverter<RoomEventFilter>
     static void fillFrom(const QJsonObject& jo, RoomEventFilter& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/sync_filter.cpp b/lib/csapi/definitions/sync_filter.cpp
index 87274a06..15c4bdc1 100644
--- a/lib/csapi/definitions/sync_filter.cpp
+++ b/lib/csapi/definitions/sync_filter.cpp
@@ -4,7 +4,7 @@
 
 #include "sync_filter.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<StateFilter>::dumpTo(QJsonObject& jo,
                                               const StateFilter& pod)
diff --git a/lib/csapi/definitions/sync_filter.h b/lib/csapi/definitions/sync_filter.h
index 1d6a845c..9ea39a65 100644
--- a/lib/csapi/definitions/sync_filter.h
+++ b/lib/csapi/definitions/sync_filter.h
@@ -9,7 +9,7 @@
 #include "csapi/definitions/event_filter.h"
 #include "csapi/definitions/room_event_filter.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -104,4 +104,4 @@ struct JsonObjectConverter<Filter>
     static void fillFrom(const QJsonObject& jo, Filter& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/user_identifier.cpp b/lib/csapi/definitions/user_identifier.cpp
index 52bb1ae6..9e9b4fe9 100644
--- a/lib/csapi/definitions/user_identifier.cpp
+++ b/lib/csapi/definitions/user_identifier.cpp
@@ -4,7 +4,7 @@
 
 #include "user_identifier.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<UserIdentifier>::dumpTo(QJsonObject& jo,
                                                  const UserIdentifier& pod)
diff --git a/lib/csapi/definitions/user_identifier.h b/lib/csapi/definitions/user_identifier.h
index 51c47cca..74e6ce2b 100644
--- a/lib/csapi/definitions/user_identifier.h
+++ b/lib/csapi/definitions/user_identifier.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QVariant>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -31,4 +31,4 @@ struct JsonObjectConverter<UserIdentifier>
     static void fillFrom(QJsonObject jo, UserIdentifier& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp
index 34d3bfbe..595db0e5 100644
--- a/lib/csapi/definitions/wellknown/full.cpp
+++ b/lib/csapi/definitions/wellknown/full.cpp
@@ -4,7 +4,7 @@
 
 #include "full.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<DiscoveryInformation>::dumpTo(
     QJsonObject& jo, const DiscoveryInformation& pod)
diff --git a/lib/csapi/definitions/wellknown/full.h b/lib/csapi/definitions/wellknown/full.h
index ddc06653..92c8afff 100644
--- a/lib/csapi/definitions/wellknown/full.h
+++ b/lib/csapi/definitions/wellknown/full.h
@@ -12,7 +12,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -39,4 +39,4 @@ struct JsonObjectConverter<DiscoveryInformation>
     static void fillFrom(QJsonObject jo, DiscoveryInformation& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/wellknown/homeserver.cpp b/lib/csapi/definitions/wellknown/homeserver.cpp
index f5746ede..7b87aa95 100644
--- a/lib/csapi/definitions/wellknown/homeserver.cpp
+++ b/lib/csapi/definitions/wellknown/homeserver.cpp
@@ -4,7 +4,7 @@
 
 #include "homeserver.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<HomeserverInformation>::dumpTo(
     QJsonObject& jo, const HomeserverInformation& pod)
diff --git a/lib/csapi/definitions/wellknown/homeserver.h b/lib/csapi/definitions/wellknown/homeserver.h
index b73cee17..606df88b 100644
--- a/lib/csapi/definitions/wellknown/homeserver.h
+++ b/lib/csapi/definitions/wellknown/homeserver.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -25,4 +25,4 @@ struct JsonObjectConverter<HomeserverInformation>
     static void fillFrom(const QJsonObject& jo, HomeserverInformation& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/wellknown/identity_server.cpp b/lib/csapi/definitions/wellknown/identity_server.cpp
index 922d4665..3b2a5720 100644
--- a/lib/csapi/definitions/wellknown/identity_server.cpp
+++ b/lib/csapi/definitions/wellknown/identity_server.cpp
@@ -4,7 +4,7 @@
 
 #include "identity_server.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<IdentityServerInformation>::dumpTo(
     QJsonObject& jo, const IdentityServerInformation& pod)
diff --git a/lib/csapi/definitions/wellknown/identity_server.h b/lib/csapi/definitions/wellknown/identity_server.h
index a35644fc..b4304ef7 100644
--- a/lib/csapi/definitions/wellknown/identity_server.h
+++ b/lib/csapi/definitions/wellknown/identity_server.h
@@ -6,7 +6,7 @@
 
 #include "converters.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Data structures
@@ -25,4 +25,4 @@ struct JsonObjectConverter<IdentityServerInformation>
     static void fillFrom(const QJsonObject& jo, IdentityServerInformation& pod);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/device_management.cpp b/lib/csapi/device_management.cpp
index 9135c22d..0889089e 100644
--- a/lib/csapi/device_management.cpp
+++ b/lib/csapi/device_management.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/device_management.h b/lib/csapi/device_management.h
index 01838c6f..d380a44f 100644
--- a/lib/csapi/device_management.h
+++ b/lib/csapi/device_management.h
@@ -13,7 +13,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -145,4 +145,4 @@ public:
                               const Omittable<AuthenticationData>& auth = none);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/directory.cpp b/lib/csapi/directory.cpp
index 992d1da5..b2689d1e 100644
--- a/lib/csapi/directory.cpp
+++ b/lib/csapi/directory.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0/directory");
 
diff --git a/lib/csapi/directory.h b/lib/csapi/directory.h
index f5331db8..7863aa1a 100644
--- a/lib/csapi/directory.h
+++ b/lib/csapi/directory.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -93,4 +93,4 @@ public:
     static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/event_context.cpp b/lib/csapi/event_context.cpp
index 936b2430..d233eedb 100644
--- a/lib/csapi/event_context.cpp
+++ b/lib/csapi/event_context.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/event_context.h b/lib/csapi/event_context.h
index ca06f4b9..755fc662 100644
--- a/lib/csapi/event_context.h
+++ b/lib/csapi/event_context.h
@@ -9,7 +9,7 @@
 #include "events/eventloader.h"
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -71,4 +71,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/filter.cpp b/lib/csapi/filter.cpp
index 79dd5ea5..b4160ba4 100644
--- a/lib/csapi/filter.cpp
+++ b/lib/csapi/filter.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/filter.h b/lib/csapi/filter.h
index 0a5a98ae..5001a492 100644
--- a/lib/csapi/filter.h
+++ b/lib/csapi/filter.h
@@ -10,7 +10,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -88,4 +88,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/inviting.cpp b/lib/csapi/inviting.cpp
index 4ddbe5d0..b60df6f8 100644
--- a/lib/csapi/inviting.cpp
+++ b/lib/csapi/inviting.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/inviting.h b/lib/csapi/inviting.h
index b0911ea8..faf315b1 100644
--- a/lib/csapi/inviting.h
+++ b/lib/csapi/inviting.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -44,4 +44,4 @@ public:
     explicit InviteUserJob(const QString& roomId, const QString& userId);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp
index cb40cb96..2dd617bb 100644
--- a/lib/csapi/joining.cpp
+++ b/lib/csapi/joining.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -29,7 +29,7 @@ struct JsonObjectConverter<JoinRoomByIdJob::ThirdPartySigned>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class JoinRoomByIdJob::Private
 {
@@ -67,7 +67,7 @@ BaseJob::Status JoinRoomByIdJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -91,7 +91,7 @@ struct JsonObjectConverter<JoinRoomJob::ThirdPartySigned>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class JoinRoomJob::Private
 {
diff --git a/lib/csapi/joining.h b/lib/csapi/joining.h
index a96f323d..cf456da9 100644
--- a/lib/csapi/joining.h
+++ b/lib/csapi/joining.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -165,4 +165,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/keys.cpp b/lib/csapi/keys.cpp
index 1752b865..cd33ad19 100644
--- a/lib/csapi/keys.cpp
+++ b/lib/csapi/keys.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
@@ -50,7 +50,7 @@ BaseJob::Status UploadKeysJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -74,7 +74,7 @@ struct JsonObjectConverter<QueryKeysJob::DeviceInformation>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class QueryKeysJob::Private
 {
diff --git a/lib/csapi/keys.h b/lib/csapi/keys.h
index f69028fd..27867b8c 100644
--- a/lib/csapi/keys.h
+++ b/lib/csapi/keys.h
@@ -14,7 +14,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QVariant>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -231,4 +231,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/kicking.cpp b/lib/csapi/kicking.cpp
index 05c4c581..ce7fcdad 100644
--- a/lib/csapi/kicking.cpp
+++ b/lib/csapi/kicking.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/kicking.h b/lib/csapi/kicking.h
index 9566a9a4..d51edb47 100644
--- a/lib/csapi/kicking.h
+++ b/lib/csapi/kicking.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -39,4 +39,4 @@ public:
                      const QString& reason = {});
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/leaving.cpp b/lib/csapi/leaving.cpp
index 325b1e04..abf04888 100644
--- a/lib/csapi/leaving.cpp
+++ b/lib/csapi/leaving.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/leaving.h b/lib/csapi/leaving.h
index 2ed6c8e7..280545b0 100644
--- a/lib/csapi/leaving.h
+++ b/lib/csapi/leaving.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -73,4 +73,4 @@ public:
     static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/list_joined_rooms.cpp b/lib/csapi/list_joined_rooms.cpp
index 43c948f7..1260499a 100644
--- a/lib/csapi/list_joined_rooms.cpp
+++ b/lib/csapi/list_joined_rooms.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/list_joined_rooms.h b/lib/csapi/list_joined_rooms.h
index 1b64a004..5dab9dfc 100644
--- a/lib/csapi/list_joined_rooms.h
+++ b/lib/csapi/list_joined_rooms.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -43,4 +43,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/list_public_rooms.cpp b/lib/csapi/list_public_rooms.cpp
index 4d96dac3..0e065440 100644
--- a/lib/csapi/list_public_rooms.cpp
+++ b/lib/csapi/list_public_rooms.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
@@ -108,7 +108,7 @@ BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -121,7 +121,7 @@ struct JsonObjectConverter<QueryPublicRoomsJob::Filter>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class QueryPublicRoomsJob::Private
 {
diff --git a/lib/csapi/list_public_rooms.h b/lib/csapi/list_public_rooms.h
index da68416d..e68030ad 100644
--- a/lib/csapi/list_public_rooms.h
+++ b/lib/csapi/list_public_rooms.h
@@ -10,7 +10,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -189,4 +189,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/login.cpp b/lib/csapi/login.cpp
index 29ee4ab5..02730ff0 100644
--- a/lib/csapi/login.cpp
+++ b/lib/csapi/login.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -26,7 +26,7 @@ struct JsonObjectConverter<GetLoginFlowsJob::LoginFlow>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetLoginFlowsJob::Private
 {
diff --git a/lib/csapi/login.h b/lib/csapi/login.h
index 3ab0648f..dc944782 100644
--- a/lib/csapi/login.h
+++ b/lib/csapi/login.h
@@ -13,7 +13,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -143,4 +143,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/logout.cpp b/lib/csapi/logout.cpp
index d0bef20e..4b391967 100644
--- a/lib/csapi/logout.cpp
+++ b/lib/csapi/logout.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/logout.h b/lib/csapi/logout.h
index c03af180..34d5a441 100644
--- a/lib/csapi/logout.h
+++ b/lib/csapi/logout.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -55,4 +55,4 @@ public:
     static QUrl makeRequestUrl(QUrl baseUrl);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/message_pagination.cpp b/lib/csapi/message_pagination.cpp
index 3f09bd85..b612ee91 100644
--- a/lib/csapi/message_pagination.cpp
+++ b/lib/csapi/message_pagination.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/message_pagination.h b/lib/csapi/message_pagination.h
index 03b3d42a..271e1dd9 100644
--- a/lib/csapi/message_pagination.h
+++ b/lib/csapi/message_pagination.h
@@ -9,7 +9,7 @@
 #include "events/eventloader.h"
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -80,4 +80,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/notifications.cpp b/lib/csapi/notifications.cpp
index 3a05a0b2..da568a0f 100644
--- a/lib/csapi/notifications.cpp
+++ b/lib/csapi/notifications.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -31,7 +31,7 @@ struct JsonObjectConverter<GetNotificationsJob::Notification>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetNotificationsJob::Private
 {
diff --git a/lib/csapi/notifications.h b/lib/csapi/notifications.h
index 4170d539..eeec5d4e 100644
--- a/lib/csapi/notifications.h
+++ b/lib/csapi/notifications.h
@@ -13,7 +13,7 @@
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -94,4 +94,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/openid.cpp b/lib/csapi/openid.cpp
index 39ba3b9e..8c00df97 100644
--- a/lib/csapi/openid.cpp
+++ b/lib/csapi/openid.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/openid.h b/lib/csapi/openid.h
index 40f1bc40..b2f003e5 100644
--- a/lib/csapi/openid.h
+++ b/lib/csapi/openid.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -64,4 +64,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/peeking_events.cpp b/lib/csapi/peeking_events.cpp
index 6962d363..bc29b682 100644
--- a/lib/csapi/peeking_events.cpp
+++ b/lib/csapi/peeking_events.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/peeking_events.h b/lib/csapi/peeking_events.h
index 1fe63c4d..c5cc07f6 100644
--- a/lib/csapi/peeking_events.h
+++ b/lib/csapi/peeking_events.h
@@ -9,7 +9,7 @@
 #include "events/eventloader.h"
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -74,4 +74,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/presence.cpp b/lib/csapi/presence.cpp
index b6e8caf2..0f019026 100644
--- a/lib/csapi/presence.cpp
+++ b/lib/csapi/presence.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/presence.h b/lib/csapi/presence.h
index 82c3a300..c5ecb987 100644
--- a/lib/csapi/presence.h
+++ b/lib/csapi/presence.h
@@ -8,7 +8,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -78,4 +78,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/profile.cpp b/lib/csapi/profile.cpp
index 630452f6..27168f77 100644
--- a/lib/csapi/profile.cpp
+++ b/lib/csapi/profile.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/profile.h b/lib/csapi/profile.h
index 95d3ec97..54dc53aa 100644
--- a/lib/csapi/profile.h
+++ b/lib/csapi/profile.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -164,4 +164,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/pusher.cpp b/lib/csapi/pusher.cpp
index 41a0cffe..90877a95 100644
--- a/lib/csapi/pusher.cpp
+++ b/lib/csapi/pusher.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -43,7 +43,7 @@ struct JsonObjectConverter<GetPushersJob::Pusher>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetPushersJob::Private
 {
@@ -79,7 +79,7 @@ BaseJob::Status GetPushersJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -92,7 +92,7 @@ struct JsonObjectConverter<PostPusherJob::PusherData>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 static const auto PostPusherJobName = QStringLiteral("PostPusherJob");
 
diff --git a/lib/csapi/pusher.h b/lib/csapi/pusher.h
index a909b9a0..65f8aa15 100644
--- a/lib/csapi/pusher.h
+++ b/lib/csapi/pusher.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -169,4 +169,4 @@ public:
                            Omittable<bool> append = none);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/pushrules.cpp b/lib/csapi/pushrules.cpp
index 5842369f..eae5445f 100644
--- a/lib/csapi/pushrules.cpp
+++ b/lib/csapi/pushrules.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/pushrules.h b/lib/csapi/pushrules.h
index 9074addb..cb94fe7b 100644
--- a/lib/csapi/pushrules.h
+++ b/lib/csapi/pushrules.h
@@ -14,7 +14,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -297,4 +297,4 @@ public:
                                    const QStringList& actions);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/read_markers.cpp b/lib/csapi/read_markers.cpp
index 5ea45f88..a07d09ce 100644
--- a/lib/csapi/read_markers.cpp
+++ b/lib/csapi/read_markers.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/read_markers.h b/lib/csapi/read_markers.h
index e1fbc263..35c428b2 100644
--- a/lib/csapi/read_markers.h
+++ b/lib/csapi/read_markers.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -34,4 +34,4 @@ public:
                               const QString& mRead = {});
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/receipts.cpp b/lib/csapi/receipts.cpp
index 28d7032f..f9a45912 100644
--- a/lib/csapi/receipts.cpp
+++ b/lib/csapi/receipts.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/receipts.h b/lib/csapi/receipts.h
index bb037c08..376d4006 100644
--- a/lib/csapi/receipts.h
+++ b/lib/csapi/receipts.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -37,4 +37,4 @@ public:
                             const QJsonObject& receipt = {});
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/redaction.cpp b/lib/csapi/redaction.cpp
index f944cdd4..d2dbe19b 100644
--- a/lib/csapi/redaction.cpp
+++ b/lib/csapi/redaction.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/redaction.h b/lib/csapi/redaction.h
index c75421cb..42022930 100644
--- a/lib/csapi/redaction.h
+++ b/lib/csapi/redaction.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -53,4 +53,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/registration.cpp b/lib/csapi/registration.cpp
index 52b4098d..270011e1 100644
--- a/lib/csapi/registration.cpp
+++ b/lib/csapi/registration.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/registration.h b/lib/csapi/registration.h
index 40f1caa6..89aecb80 100644
--- a/lib/csapi/registration.h
+++ b/lib/csapi/registration.h
@@ -11,7 +11,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -480,4 +480,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/report_content.cpp b/lib/csapi/report_content.cpp
index eb62cd12..352f52c9 100644
--- a/lib/csapi/report_content.cpp
+++ b/lib/csapi/report_content.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/report_content.h b/lib/csapi/report_content.h
index c545d800..c86a4301 100644
--- a/lib/csapi/report_content.h
+++ b/lib/csapi/report_content.h
@@ -8,7 +8,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -36,4 +36,4 @@ public:
                               int score, const QString& reason);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/room_send.cpp b/lib/csapi/room_send.cpp
index a29dd99a..5e970d65 100644
--- a/lib/csapi/room_send.cpp
+++ b/lib/csapi/room_send.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/room_send.h b/lib/csapi/room_send.h
index aa2efd79..110fc83b 100644
--- a/lib/csapi/room_send.h
+++ b/lib/csapi/room_send.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -62,4 +62,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/room_state.cpp b/lib/csapi/room_state.cpp
index ef4afcd0..bfcd6e17 100644
--- a/lib/csapi/room_state.cpp
+++ b/lib/csapi/room_state.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/room_state.h b/lib/csapi/room_state.h
index 6ddd5594..80619d63 100644
--- a/lib/csapi/room_state.h
+++ b/lib/csapi/room_state.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -126,4 +126,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/room_upgrades.cpp b/lib/csapi/room_upgrades.cpp
index a72304d1..1d6006ef 100644
--- a/lib/csapi/room_upgrades.cpp
+++ b/lib/csapi/room_upgrades.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/room_upgrades.h b/lib/csapi/room_upgrades.h
index 94520aca..5f9262f1 100644
--- a/lib/csapi/room_upgrades.h
+++ b/lib/csapi/room_upgrades.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -41,4 +41,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/rooms.cpp b/lib/csapi/rooms.cpp
index 280e8d59..5bfbe44d 100644
--- a/lib/csapi/rooms.cpp
+++ b/lib/csapi/rooms.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
@@ -168,7 +168,7 @@ BaseJob::Status GetMembersByRoomJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -182,7 +182,7 @@ struct JsonObjectConverter<GetJoinedMembersByRoomJob::RoomMember>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetJoinedMembersByRoomJob::Private
 {
diff --git a/lib/csapi/rooms.h b/lib/csapi/rooms.h
index 29d7808e..1020fdb1 100644
--- a/lib/csapi/rooms.h
+++ b/lib/csapi/rooms.h
@@ -12,7 +12,7 @@
 
 #include <QtCore/QHash>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -269,4 +269,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/search.cpp b/lib/csapi/search.cpp
index ee1fa70c..9619f340 100644
--- a/lib/csapi/search.cpp
+++ b/lib/csapi/search.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -144,7 +144,7 @@ struct JsonObjectConverter<SearchJob::ResultCategories>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class SearchJob::Private
 {
diff --git a/lib/csapi/search.h b/lib/csapi/search.h
index f965a72a..079ac8e9 100644
--- a/lib/csapi/search.h
+++ b/lib/csapi/search.h
@@ -16,7 +16,7 @@
 
 #include <unordered_map>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -200,4 +200,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/sso_login_redirect.cpp b/lib/csapi/sso_login_redirect.cpp
index b1dc3674..c2cc81cf 100644
--- a/lib/csapi/sso_login_redirect.cpp
+++ b/lib/csapi/sso_login_redirect.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/sso_login_redirect.h b/lib/csapi/sso_login_redirect.h
index af9e7780..b932a15e 100644
--- a/lib/csapi/sso_login_redirect.h
+++ b/lib/csapi/sso_login_redirect.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -37,4 +37,4 @@ public:
     static QUrl makeRequestUrl(QUrl baseUrl, const QString& redirectUrl);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/tags.cpp b/lib/csapi/tags.cpp
index 13c933e5..3df38074 100644
--- a/lib/csapi/tags.cpp
+++ b/lib/csapi/tags.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -26,7 +26,7 @@ struct JsonObjectConverter<GetRoomTagsJob::Tag>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class GetRoomTagsJob::Private
 {
diff --git a/lib/csapi/tags.h b/lib/csapi/tags.h
index dc20cd3d..8ddebd6b 100644
--- a/lib/csapi/tags.h
+++ b/lib/csapi/tags.h
@@ -11,7 +11,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QVariant>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -123,4 +123,4 @@ public:
                                const QString& roomId, const QString& tag);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/third_party_lookup.cpp b/lib/csapi/third_party_lookup.cpp
index 986ead01..678f6b3c 100644
--- a/lib/csapi/third_party_lookup.cpp
+++ b/lib/csapi/third_party_lookup.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/third_party_lookup.h b/lib/csapi/third_party_lookup.h
index d25c1cf3..63607549 100644
--- a/lib/csapi/third_party_lookup.h
+++ b/lib/csapi/third_party_lookup.h
@@ -15,7 +15,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -253,4 +253,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/third_party_membership.cpp b/lib/csapi/third_party_membership.cpp
index 9fe702aa..7e401163 100644
--- a/lib/csapi/third_party_membership.cpp
+++ b/lib/csapi/third_party_membership.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/third_party_membership.h b/lib/csapi/third_party_membership.h
index 36622c94..bd4c6896 100644
--- a/lib/csapi/third_party_membership.h
+++ b/lib/csapi/third_party_membership.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -74,4 +74,4 @@ public:
                              const QString& medium, const QString& address);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/to_device.cpp b/lib/csapi/to_device.cpp
index 3fb17109..3f6e8097 100644
--- a/lib/csapi/to_device.cpp
+++ b/lib/csapi/to_device.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/to_device.h b/lib/csapi/to_device.h
index e0bbbe28..14445439 100644
--- a/lib/csapi/to_device.h
+++ b/lib/csapi/to_device.h
@@ -9,7 +9,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -39,4 +39,4 @@ public:
         const QHash<QString, QHash<QString, QJsonObject>>& messages = {});
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/typing.cpp b/lib/csapi/typing.cpp
index 03499c76..064ebe39 100644
--- a/lib/csapi/typing.cpp
+++ b/lib/csapi/typing.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/typing.h b/lib/csapi/typing.h
index 0c3f75a8..350c209d 100644
--- a/lib/csapi/typing.h
+++ b/lib/csapi/typing.h
@@ -8,7 +8,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -38,4 +38,4 @@ public:
                           bool typing, Omittable<int> timeout = none);
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/users.cpp b/lib/csapi/users.cpp
index 39b05a77..77c297dd 100644
--- a/lib/csapi/users.cpp
+++ b/lib/csapi/users.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -28,7 +28,7 @@ struct JsonObjectConverter<SearchUserDirectoryJob::User>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class SearchUserDirectoryJob::Private
 {
diff --git a/lib/csapi/users.h b/lib/csapi/users.h
index 2e86c009..d9a16a9d 100644
--- a/lib/csapi/users.h
+++ b/lib/csapi/users.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QVector>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -80,4 +80,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/versions.cpp b/lib/csapi/versions.cpp
index 1d66b94f..9607a1b6 100644
--- a/lib/csapi/versions.cpp
+++ b/lib/csapi/versions.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client");
 
diff --git a/lib/csapi/versions.h b/lib/csapi/versions.h
index 513e7f27..aa8cbac6 100644
--- a/lib/csapi/versions.h
+++ b/lib/csapi/versions.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/QHash>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -70,4 +70,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/voip.cpp b/lib/csapi/voip.cpp
index 0e83c915..c95afe16 100644
--- a/lib/csapi/voip.cpp
+++ b/lib/csapi/voip.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/voip.h b/lib/csapi/voip.h
index ab34dcad..38abfa27 100644
--- a/lib/csapi/voip.h
+++ b/lib/csapi/voip.h
@@ -8,7 +8,7 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -46,4 +46,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/wellknown.cpp b/lib/csapi/wellknown.cpp
index c2bd7822..9a52a2a5 100644
--- a/lib/csapi/wellknown.cpp
+++ b/lib/csapi/wellknown.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/.well-known");
 
diff --git a/lib/csapi/wellknown.h b/lib/csapi/wellknown.h
index 66917806..bce67d00 100644
--- a/lib/csapi/wellknown.h
+++ b/lib/csapi/wellknown.h
@@ -10,7 +10,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -54,4 +54,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/whoami.cpp b/lib/csapi/whoami.cpp
index 2ca9c435..fb7f54dc 100644
--- a/lib/csapi/whoami.cpp
+++ b/lib/csapi/whoami.cpp
@@ -8,7 +8,7 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
diff --git a/lib/csapi/whoami.h b/lib/csapi/whoami.h
index e62b7dad..bbbb3899 100644
--- a/lib/csapi/whoami.h
+++ b/lib/csapi/whoami.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient
+namespace Quotient
 {
 
 // Operations
@@ -50,4 +50,4 @@ private:
     QScopedPointer<Private> d;
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/{{base}}.cpp.mustache b/lib/csapi/{{base}}.cpp.mustache
index 8ebac6ef..6cbd1b65 100644
--- a/lib/csapi/{{base}}.cpp.mustache
+++ b/lib/csapi/{{base}}.cpp.mustache
@@ -8,7 +8,7 @@
 {{/producesNonJson?}}
 #include <QtCore/QStringBuilder>
 {{/operations}}
-using namespace QMatrixClient;
+using namespace Quotient;
 {{#models.model}}
     {{#in?}}
 void JsonObjectConverter<{{qualifiedName}}>::dumpTo(QJsonObject& jo, const {{qualifiedName}}& pod)
@@ -38,7 +38,7 @@ void JsonObjectConverter<{{qualifiedName}}>::fillFrom({{>maybeCrefJsonObject}} j
 static const auto basePath = QStringLiteral("{{basePathWithoutHost}}");
     {{#operation}}{{#models}}
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
         {{#model}}
 template <> struct JsonObjectConverter<{{qualifiedName}}>
diff --git a/lib/csapi/{{base}}.h.mustache b/lib/csapi/{{base}}.h.mustache
index 61380ec6..56044e7d 100644
--- a/lib/csapi/{{base}}.h.mustache
+++ b/lib/csapi/{{base}}.h.mustache
@@ -8,7 +8,7 @@
 {{#imports}}
 #include {{_}}{{/imports}}
 
-namespace QMatrixClient
+namespace Quotient
 {
 {{#models}}
 // Data structures
@@ -92,4 +92,4 @@ private:
 };
 {{/    operation}}
 {{/operations}}
-} // namespace QMatrixClient
+} // namespace Quotient