diff --git a/models/comment.rb b/models/comment.rb
index 3758c038..ede762a4 100644
--- a/models/comment.rb
+++ b/models/comment.rb
@@ -4,8 +4,10 @@ class Comment < Sequel::Model
   many_to_one :actioning_site, class: :Site
   one_to_many :comment_likes
 
-  def liking_site_names
-    comment_likes_dataset.select(:id, :actioning_site_id).all.collect {|comment_like| comment_like.actioning_site_dataset.select(:username).first.username }
+  def liking_site_titles
+    comment_likes_dataset.select(:id, :actioning_site_id).all.collect do |comment_like|
+      comment_like.actioning_site_dataset.select(:username,:domain,:title).first.title
+    end
   end
 
   def site_likes?(site)
diff --git a/models/event.rb b/models/event.rb
index d63c8160..2d7adcff 100644
--- a/models/event.rb
+++ b/models/event.rb
@@ -17,8 +17,10 @@ class Event < Sequel::Model
     false
   end
 
-  def liking_site_names
-    likes_dataset.select(:actioning_site_id).all.collect {|like| like.actioning_site_dataset.select(:username).first.username }
+  def liking_site_titles
+    likes_dataset.select(:actioning_site_id).all.collect do |like|
+      like.actioning_site_dataset.select(:domain,:title,:username).first.title
+    end
   end
 
   def add_site_comment(site, message)
diff --git a/views/_news.erb b/views/_news.erb
index ee0c4952..1c5933ac 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -60,17 +60,17 @@
     <div class="content">
       <div class="comments">
         <% event.comments.each do |comment| %>
-          <% comment_actioning_site = comment.actioning_site_dataset.select(:username).first %>
+          <% comment_actioning_site = comment.actioning_site_dataset.select(:title, :domain, :username).first %>
           <div class="comment" id="comment_<%= comment.id %>">
             <img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '82x62') %>">
-            <a href="/site/<%= comment_actioning_site.username %>" class="user"><%= comment_actioning_site.username %></a>
+            <a href="/site/<%= comment_actioning_site.username %>" class="user"><%= comment_actioning_site.title %></a>
             <span class="date"><%= comment.created_at.ago %></span>
             <p><%= comment.message %></p>
           </div>
           <div class="actions">
             <% comment_likes_count = comment.comment_likes_dataset.count %>
             <% if current_site %>
-              <a href="#" class="comment_like" id="comment_<%= comment.id %>_like" data-placement="bottom" data-toggle="tooltip" data-original-title="<%= comment.liking_site_names.join('<br>') %>" onclick="Comment.toggleLike(<%= comment.id %>, '<%= csrf_token %>'); return false"><%= comment.site_likes?(current_site) ? 'Unlike' : 'Like' %><%= comment_likes_count > 0 ? " (#{comment_likes_count})" : '' %></a>
+              <a href="#" class="comment_like" id="comment_<%= comment.id %>_like" data-placement="bottom" data-toggle="tooltip" data-original-title="<%= comment.liking_site_titles.join('<br>') %>" onclick="Comment.toggleLike(<%= comment.id %>, '<%= csrf_token %>'); return false"><%= comment.site_likes?(current_site) ? 'Unlike' : 'Like' %><%= comment_likes_count > 0 ? " (#{comment_likes_count})" : '' %></a>
             <% else %>
               <% if comment_likes_count > 0 %>
                 <%= comment_likes_count %>&nbsp;<%= comment_likes_count == 1 ? 'like' : 'likes' %>
diff --git a/views/_news_actions.erb b/views/_news_actions.erb
index 34a880cd..b499c9fd 100644
--- a/views/_news_actions.erb
+++ b/views/_news_actions.erb
@@ -1,7 +1,7 @@
 <div id="event_<%= event.id %>_actions" class="actions">
   <% event_likes_count = event.likes_dataset.count %>
   <% if current_site %>
-    <a href="#" id="like" data-placement="bottom" data-toggle="tooltip" data-original-title="<%= event.liking_site_names.join('<br>') %>" onclick="new Like(<%= event.id %>, '<%= csrf_token %>').toggleLike(); return false"><%= event.site_likes?(current_site) ? 'Unlike' : 'Like' %><%= event_likes_count > 0 ? " (#{event_likes_count})" : '' %></a>
+    <a href="#" id="like" data-placement="bottom" data-toggle="tooltip" data-original-title="<%= event.liking_site_titles.join('<br>') %>" onclick="new Like(<%= event.id %>, '<%= csrf_token %>').toggleLike(); return false"><%= event.site_likes?(current_site) ? 'Unlike' : 'Like' %><%= event_likes_count > 0 ? " (#{event_likes_count})" : '' %></a>
   <% else %>
     <% if event_likes_count > 0 %>
       <%= event_likes_count %>&nbsp;<%= event_likes_count == 1 ? 'like' : 'likes' %>
diff --git a/views/_news_profile_comment.erb b/views/_news_profile_comment.erb
index 5e4e411d..48d1a28f 100644
--- a/views/_news_profile_comment.erb
+++ b/views/_news_profile_comment.erb
@@ -1,6 +1,6 @@
 <div class="title">
   <div class="icon" style="background-image:url(<%= profile_comment.actioning_site.screenshot_url('index.html', '82x62') %>);"></div>
-  <a href="/site/<%= profile_comment.actioning_site.username %>" class="user"><%= profile_comment.actioning_site.username %></a> 
+  <a href="/site/<%= profile_comment.actioning_site.username %>" class="user"><%= profile_comment.actioning_site.title %></a> 
   <span class="date"><%= profile_comment.created_at.ago %></span>
   <div class="comment"><%= profile_comment.message %></div>
 </div>
\ No newline at end of file