6 files changed, 19 insertions, 19 deletions
diff --git a/source/test/StarTestUniverse.cpp b/source/test/StarTestUniverse.cpp
index a7b9dd2..fc3b75b 100644
--- a/source/test/StarTestUniverse.cpp
+++ b/source/test/StarTestUniverse.cpp
@@ -67,7 +67,7 @@ List<Drawable> TestUniverse::currentClientDrawables() {
   List<Drawable> drawables;
   for (auto& ed : renderData.entityDrawables) {
     for (auto& p : ed.layers)
-      drawables.appendAll(move(p.second));
+      drawables.appendAll(std::move(p.second));
   }
 
   return drawables;
diff --git a/source/test/btree_test.cpp b/source/test/btree_test.cpp
index 2d22631..022db51 100644
--- a/source/test/btree_test.cpp
+++ b/source/test/btree_test.cpp
@@ -220,7 +220,7 @@ Data const& SimpleBTreeLeaf<Key, Data, Pointer>::data(size_t i) const {
 
 template <typename Key, typename Data, typename Pointer>
 void SimpleBTreeLeaf<Key, Data, Pointer>::insert(size_t i, Key k, Data d) {
-  elements.insertAt(i, Element{move(k), move(d)});
+  elements.insertAt(i, Element{std::move(k), std::move(d)});
 }
 
 template <typename Key, typename Data, typename Pointer>
@@ -272,7 +272,7 @@ Maybe<Pointer> SimpleBTreeLeaf<Key, Data, Pointer>::nextLeaf() const {
 
 template <typename Key, typename Data, typename Pointer>
 void SimpleBTreeLeaf<Key, Data, Pointer>::setNextLeaf(Maybe<Pointer> n) {
-  next = move(n);
+  next = std::move(n);
 }
 
 // Testing BTree class that simulates storage by storing in-memory copies of
diff --git a/source/test/game_tests_main.cpp b/source/test/game_tests_main.cpp
index 4cfb714..44729b3 100644
--- a/source/test/game_tests_main.cpp
+++ b/source/test/game_tests_main.cpp
@@ -22,7 +22,7 @@ public:
   Root::Settings settings;
 
   TestEnvironment(Root::Settings settings)
-    : settings(move(settings)) {}
+    : settings(std::move(settings)) {}
 
   virtual void SetUp() {
     Logger::addSink(make_shared<ErrorLogSink>());
diff --git a/source/test/ref_ptr_test.cpp b/source/test/ref_ptr_test.cpp
index cc585f2..454ccd8 100644
--- a/source/test/ref_ptr_test.cpp
+++ b/source/test/ref_ptr_test.cpp
@@ -67,7 +67,7 @@ TEST(IntrusivePtr, All) {
     EXPECT_NE(p3, p5);
 
     p5 = p2;
-    p2 = move(p5);
+    p2 = std::move(p5);
     EXPECT_TRUE(is<Test2>(p2));
 
     RefPtr<Test1> p6 = as<Test1>(p1);
diff --git a/source/test/universe_connection_test.cpp b/source/test/universe_connection_test.cpp
index 649b7d2..c5ae0f6 100644
--- a/source/test/universe_connection_test.cpp
+++ b/source/test/universe_connection_test.cpp
@@ -19,7 +19,7 @@ unsigned const SyncWaitMillis = 10000;
 class ASyncClientThread : public Thread {
 public:
   ASyncClientThread(UniverseConnection conn)
-    : Thread("UniverseConnectionTestClientThread"), m_connection(move(conn)) {
+    : Thread("UniverseConnectionTestClientThread"), m_connection(std::move(conn)) {
     start();
   }
 
@@ -66,7 +66,7 @@ private:
 class SyncClientThread : public Thread {
 public:
   SyncClientThread(UniverseConnection conn)
-    : Thread("UniverseConnectionTestClientThread"), m_connection(move(conn)) {
+    : Thread("UniverseConnectionTestClientThread"), m_connection(std::move(conn)) {
     start();
   }
 
@@ -104,36 +104,36 @@ TEST(UniverseConnections, All) {
   TcpServer tcpServer(HostAddressWithPort(HostAddress::localhost(), ServerPort));
   tcpServer.setAcceptCallback([&server, &clientId](TcpSocketPtr socket) {
       socket->setNonBlocking(true);
-      auto conn = UniverseConnection(TcpPacketSocket::open(move(socket)));
-      server.addConnection(++clientId, move(conn));
+      auto conn = UniverseConnection(TcpPacketSocket::open(std::move(socket)));
+      server.addConnection(++clientId, std::move(conn));
     });
 
   LinkedList<ASyncClientThread> localASyncClients;
   for (unsigned i = 0; i < NumLocalASyncConnections; ++i) {
     auto pair = LocalPacketSocket::openPair();
-    server.addConnection(++clientId, UniverseConnection(move(pair.first)));
-    localASyncClients.emplaceAppend(UniverseConnection(move(pair.second)));
+    server.addConnection(++clientId, UniverseConnection(std::move(pair.first)));
+    localASyncClients.emplaceAppend(UniverseConnection(std::move(pair.second)));
   }
 
   LinkedList<SyncClientThread> localSyncClients;
   for (unsigned i = 0; i < NumLocalSyncConnections; ++i) {
     auto pair = LocalPacketSocket::openPair();
-    server.addConnection(++clientId, UniverseConnection(move(pair.first)));
-    localSyncClients.emplaceAppend(UniverseConnection(move(pair.second)));
+    server.addConnection(++clientId, UniverseConnection(std::move(pair.first)));
+    localSyncClients.emplaceAppend(UniverseConnection(std::move(pair.second)));
   }
 
   LinkedList<ASyncClientThread> remoteASyncClients;
   for (unsigned i = 0; i < NumRemoteASyncConnections; ++i) {
     auto socket = TcpSocket::connectTo({HostAddress::localhost(), ServerPort});
     socket->setNonBlocking(true);
-    remoteASyncClients.emplaceAppend(UniverseConnection(TcpPacketSocket::open(move(socket))));
+    remoteASyncClients.emplaceAppend(UniverseConnection(TcpPacketSocket::open(std::move(socket))));
   }
 
   LinkedList<SyncClientThread> remoteSyncClients;
   for (unsigned i = 0; i < NumRemoteSyncConnections; ++i) {
     auto socket = TcpSocket::connectTo({HostAddress::localhost(), ServerPort});
     socket->setNonBlocking(true);
-    remoteSyncClients.emplaceAppend(UniverseConnection(TcpPacketSocket::open(move(socket))));
+    remoteSyncClients.emplaceAppend(UniverseConnection(TcpPacketSocket::open(std::move(socket))));
   }
 
   for (auto& c : localASyncClients)
diff --git a/source/test/variant_test.cpp b/source/test/variant_test.cpp
index 03cb4e9..e8a8bcd 100644
--- a/source/test/variant_test.cpp
+++ b/source/test/variant_test.cpp
@@ -26,8 +26,8 @@ TEST(VariantTest, All) {
   b = VariantTester{intptr};
   a = b;
   a = a;
-  b = move(a);
-  a = move(b);
+  b = std::move(a);
+  a = std::move(b);
   EXPECT_EQ(intptr.use_count(), 2);
   a.reset();
   EXPECT_EQ(intptr.use_count(), 1);
@@ -59,8 +59,8 @@ TEST(MaybeTest, All) {
   EXPECT_TRUE(a.isValid());
   a = b;
   a = a;
-  b = move(a);
-  a = move(b);
+  b = std::move(a);
+  a = std::move(b);
   EXPECT_EQ(intptr.use_count(), 2);
   a = {};
   EXPECT_FALSE(a.isValid());