diff --git a/lib/gold_miner/slack/client.rb b/lib/gold_miner/slack/client.rb
index 04b5ee2..8ed3311 100644
--- a/lib/gold_miner/slack/client.rb
+++ b/lib/gold_miner/slack/client.rb
@@ -39,7 +39,7 @@ def search_messages(query)
 
           response.messages.matches.map { |message|
             Slack::Message.new(
-              id: message.id,
+              id: message.iid,
               text: message.text,
               user: Slack::User.new(
                 id: message.user,
@@ -69,11 +69,11 @@ def warn_on_multiple_pages(result)
     def fetch_author_names(response)
       Sync do
         author_names = response.messages.matches.map { |message|
-          Async { [message.id, real_name_for(message.user)] }
+          Async { [message.iid, real_name_for(message.user)] }
         }.map(&:wait).to_h
 
         response.messages.matches.each { |message|
-          message.author_real_name = author_names[message.id]
+          message.author_real_name = author_names[message.iid]
         }
       end
     end
diff --git a/spec/gold_miner/slack/client_spec.rb b/spec/gold_miner/slack/client_spec.rb
index f1a66cf..08c8be3 100644
--- a/spec/gold_miner/slack/client_spec.rb
+++ b/spec/gold_miner/slack/client_spec.rb
@@ -52,8 +52,8 @@
       search_query = "tip in:dev"
       user1 = TestFactories.create_slack_user(id: "user-id-1", name: "User 1", username: "username-1")
       user2 = TestFactories.create_slack_user(id: "user-id-2", name: "User 2", username: "username-2")
-      msg1 = {"id" => "msg1", "text" => "TIL", "user" => user1.id, "username" => user1.username, "permalink" => "https:///message-1-permalink.com"}
-      msg2 = {"id" => "msg2", "text" => "Ruby tip/TIL: Array#sample...", "user" => user2.id, "username" => user2.username, "permalink" => "https:///message-2-permalink.com"}
+      msg1 = {"iid" => "msg1", "text" => "TIL", "user" => user1.id, "username" => user1.username, "permalink" => "https:///message-1-permalink.com"}
+      msg2 = {"iid" => "msg2", "text" => "Ruby tip/TIL: Array#sample...", "user" => user2.id, "username" => user2.username, "permalink" => "https:///message-2-permalink.com"}
       stub_slack_message_search_request(
         query: search_query,
         body: {
@@ -79,8 +79,8 @@
       messages = slack.search_messages(search_query)
 
       expect(messages).to match_array [
-        TestFactories.create_slack_message(id: msg1["id"], text: msg1["text"], user: user1, permalink: msg1["permalink"]),
-        TestFactories.create_slack_message(id: msg2["id"], text: msg2["text"], user: user2, permalink: msg2["permalink"])
+        TestFactories.create_slack_message(id: msg1["iid"], text: msg1["text"], user: user1, permalink: msg1["permalink"]),
+        TestFactories.create_slack_message(id: msg2["iid"], text: msg2["text"], user: user2, permalink: msg2["permalink"])
       ]
     end
 
@@ -89,8 +89,8 @@
       stub_slack_auth_test_request(status: 200, token: token)
       search_query = "tip in:dev"
       user1 = TestFactories.create_slack_user(id: "user-id-1", name: "User 1", username: "username-1")
-      msg1 = {"id" => "msg1", "text" => "TIL", "user" => user1.id, "username" => user1.username, "permalink" => "https:///message-1-permalink.com"}
-      msg2 = {"id" => "msg2", "text" => "Ruby tip/TIL: Array#sample...", "user" => user1.id, "username" => user1.username, "permalink" => "https:///message-2-permalink.com"}
+      msg1 = {"iid" => "msg1", "text" => "TIL", "user" => user1.id, "username" => user1.username, "permalink" => "https:///message-1-permalink.com"}
+      msg2 = {"iid" => "msg2", "text" => "Ruby tip/TIL: Array#sample...", "user" => user1.id, "username" => user1.username, "permalink" => "https:///message-2-permalink.com"}
       stub_slack_message_search_request(
         query: search_query,
         body: {
@@ -121,8 +121,8 @@
       search_query = "tip in:dev"
       user1 = TestFactories.create_slack_user(id: "user-id-1", name: "User 1", username: "username-1")
       user2 = TestFactories.create_slack_user(id: "user-id-2", name: "User 2", username: "username-2")
-      msg1 = {"id" => "msg1", "text" => "TIL", "user" => user1.id, "username" => user1.username, "permalink" => "https:///message-1-permalink.com"}
-      msg2 = {"id" => "msg2", "text" => "Ruby tip/TIL: Array#sample...", "user" => user2.id, "username" => user2.username, "permalink" => "https:///message-2-permalink.com"}
+      msg1 = {"iid" => "msg1", "text" => "TIL", "user" => user1.id, "username" => user1.username, "permalink" => "https:///message-1-permalink.com"}
+      msg2 = {"iid" => "msg2", "text" => "Ruby tip/TIL: Array#sample...", "user" => user2.id, "username" => user2.username, "permalink" => "https:///message-2-permalink.com"}
       allow(sleepy_slack_client).to receive(:search_messages).with({query: search_query}) {
         sleep(search_query_time)
 
@@ -168,8 +168,8 @@
         search_query = "tip in:dev"
         user1 = TestFactories.create_slack_user(id: "user-id-1", name: "User 1", username: "username-1")
         user2 = TestFactories.create_slack_user(id: "user-id-2", name: "User 2", username: "username-2")
-        msg1 = {"id" => "msg1", "text" => "TIL", "user" => user1.id, "username" => user1.username, "permalink" => "https:///message-1-permalink.com"}
-        msg2 = {"id" => "msg2", "text" => "Ruby tip/TIL: Array#sample...", "user" => user2.id, "username" => user2.username, "permalink" => "https:///message-2-permalink.com"}
+        msg1 = {"iid" => "msg1", "text" => "TIL", "user" => user1.id, "username" => user1.username, "permalink" => "https:///message-1-permalink.com"}
+        msg2 = {"iid" => "msg2", "text" => "Ruby tip/TIL: Array#sample...", "user" => user2.id, "username" => user2.username, "permalink" => "https:///message-2-permalink.com"}
         stub_slack_message_search_request(
           query: search_query,
           body: {