diff --git a/app/views/conferences/_conference_details.html.haml b/app/views/conferences/_conference_details.html.haml
index ebf80ef6..8a144617 100644
--- a/app/views/conferences/_conference_details.html.haml
+++ b/app/views/conferences/_conference_details.html.haml
@@ -12,7 +12,7 @@
               = date_string(conference.start_date, conference.end_date)
           - if conference.venue
             %p
-              = "#{conference.venue.city}/#{conference.venue.country_name}"
+              = "#{conference.venue.name} / #{conference.venue.city}"
           - unless conference.description.blank?
             %p
               = markdown(conference.description)
diff --git a/app/views/conferences/index.html.haml b/app/views/conferences/index.html.haml
index 032db5c3..5c0ceea8 100644
--- a/app/views/conferences/index.html.haml
+++ b/app/views/conferences/index.html.haml
@@ -2,7 +2,7 @@
   .row
     .col-md-12
       .page-header
-        %h2 Upcoming Conferences
+        %h2 Upcoming Events
   - @current.each do |conference|
     = render partial: 'conference_details', locals: { conference: conference }
   -if @antiquated and @antiquated.any?