diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss
index f627e8059..3e3b77bdb 100644
--- a/app/assets/stylesheets/conversations.scss
+++ b/app/assets/stylesheets/conversations.scss
@@ -148,7 +148,7 @@
     }
   }
 
-  .stream_container .conversation-participants {
+  .stream-container .conversation-participants {
     margin-bottom: 20px;
 
     .hide_conversation, .delete_conversation {
diff --git a/app/assets/stylesheets/interactions.scss b/app/assets/stylesheets/interactions.scss
index 211f27acd..2f6ef48c7 100644
--- a/app/assets/stylesheets/interactions.scss
+++ b/app/assets/stylesheets/interactions.scss
@@ -22,7 +22,7 @@
   }
 }
 
-.stream_container,
+.stream-container,
 .single-post-interactions {
   .control-icons {
     float: right;
diff --git a/app/assets/stylesheets/profile.scss b/app/assets/stylesheets/profile.scss
index cec99ef33..7ac209b53 100644
--- a/app/assets/stylesheets/profile.scss
+++ b/app/assets/stylesheets/profile.scss
@@ -137,7 +137,7 @@
 
   }
 
-  .stream_container > .pagination { text-align: center; }
+  .stream-container > .pagination { text-align: center; }
 
   #people_stream {
     background-color: $white;
diff --git a/app/assets/stylesheets/stream.scss b/app/assets/stylesheets/stream.scss
index 56bc4d5a6..38f8139f7 100644
--- a/app/assets/stylesheets/stream.scss
+++ b/app/assets/stylesheets/stream.scss
@@ -1,4 +1,4 @@
-.stream_container {
+.stream-container {
   .stream-title {
     margin: 12px 0;
   }
diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml
index c60d0d22e..d26d7c782 100644
--- a/app/views/conversations/index.haml
+++ b/app/views/conversations/index.haml
@@ -22,7 +22,7 @@
               = will_paginate @visibilities, previous_label: "«", next_label: "»", inner_window: 1,
                   renderer: WillPaginate::ActionView::BootstrapLinkRenderer
     .col-md-8
-      .conversations-form-container.stream_container
+      .conversations-form-container.stream-container
         #conversation-show{class: @conversation ? "" : "hidden"}
           - if @conversation
             = render 'conversations/show', conversation: @conversation
diff --git a/app/views/people/contacts.haml b/app/views/people/contacts.haml
index 3eeddb083..01567d6fe 100644
--- a/app/views/people/contacts.haml
+++ b/app/views/people/contacts.haml
@@ -11,7 +11,7 @@
       .profile_header
         -# more JS
 
-      .stream_container
+      .stream-container
         #people_stream.stream
           - @hashes.each do |hash|
             = render partial: 'people/person', locals: hash
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 4f2e40336..1d725f382 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -18,7 +18,7 @@
       .profile_header
         -# more JS
 
-      .stream_container
+      .stream-container
 
         - if user_signed_in? && current_user.person.id == @person.id && !current_page?(person_photos_path(@person))
           = render 'publisher/publisher', publisher_aspects_for(nil)
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index 3a8b0225a..2dc05a9e1 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -176,7 +176,7 @@
               = link_to t("layouts.application.powered_by"), "https://diasporafoundation.org"
 
     .col-md-9
-      .stream_container#aspect_stream_container
+      .stream-container#aspect-stream-container
         = render "aspects/aspect_stream", stream: @stream
 
       %a.entypo-chevron-up.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
diff --git a/app/views/tags/show.haml b/app/views/tags/show.haml
index 7df542990..8f42ba032 100644
--- a/app/views/tags/show.haml
+++ b/app/views/tags/show.haml
@@ -20,7 +20,7 @@
           = render partial: "people/index", locals: {people: @stream.tagged_people}
 
     .col-md-9
-      .stream_container
+      .stream-container
         #author_info
           %h2
             = @stream.display_tag_name
diff --git a/features/desktop/conversations.feature b/features/desktop/conversations.feature
index a9408fb69..a8affa3ad 100644
--- a/features/desktop/conversations.feature
+++ b/features/desktop/conversations.feature
@@ -24,12 +24,12 @@ Feature: private conversations
     And I should see "less than a minute ago" within "#conversation-show"
     And I should see "Alice Awesome" as a participant
     And "Alice Awesome" should be part of active conversation
-    And I should see "hello, alice!" within ".stream_container"
+    And I should see "hello, alice!" within ".stream-container"
     When I sign in as "alice@alice.alice"
     Then I should have 1 unread private message
     And I should have 1 email delivery
     When I reply with "hey, how you doing?"
-    Then I should see "hey, how you doing?" within ".stream_container"
+    Then I should see "hey, how you doing?" within ".stream-container"
 
   Scenario: send a message using keyboard shortcuts
     When I sign in as "bob@bob.bob"
@@ -37,9 +37,9 @@ Feature: private conversations
     Then I should see "Greetings" within "#conversation-inbox"
     And I should see "Greetings" within "#conversation-show"
     And "Alice Awesome" should be part of active conversation
-    And I should see "hello, alice!" within ".stream_container"
+    And I should see "hello, alice!" within ".stream-container"
     When I reply with "hey, how you doing?" using keyboard shortcuts
-    Then I should see "hey, how you doing?" within ".stream_container"
+    Then I should see "hey, how you doing?" within ".stream-container"
     When I sign in as "alice@alice.alice"
     Then I should have 2 unread private messages
     And I should have 2 email delivery
@@ -54,7 +54,7 @@ Feature: private conversations
     Then I should see "Greetings" within "#conversation-inbox"
     And I should see "Greetings" within "#conversation-show"
     And "Alice Awesome" should be part of active conversation
-    And I should see "hello, alice!" within ".stream_container"
+    And I should see "hello, alice!" within ".stream-container"
 
   Scenario: delete a conversation
     When I sign in as "bob@bob.bob"
@@ -66,7 +66,7 @@ Feature: private conversations
     Then I should have 1 unread private message
     And I should have 1 email delivery
     When I reply with "hey, how you doing?"
-    Then I should see "hey, how you doing?" within ".stream_container"
+    Then I should see "hey, how you doing?" within ".stream-container"
     When I sign in as "bob@bob.bob"
     Then I should have 1 email delivery
     And I should have no unread private messages
diff --git a/features/step_definitions/aspects_steps.rb b/features/step_definitions/aspects_steps.rb
index 39726a308..89f7cb5aa 100644
--- a/features/step_definitions/aspects_steps.rb
+++ b/features/step_definitions/aspects_steps.rb
@@ -46,7 +46,7 @@ end
 
 When /^I select only "([^"]*)" aspect$/ do |aspect_name|
   click_link "My aspects"
-  expect(find("#aspect_stream_container")).to have_css(".loader.hidden", visible: false)
+  expect(find("#aspect-stream-container")).to have_css(".loader.hidden", visible: false)
   within("#aspects_list") do
     all(".selected").each do |node|
       aspect_item = node.find(:xpath, "..")
diff --git a/features/step_definitions/oembed_steps.rb b/features/step_definitions/oembed_steps.rb
index 7732146a0..d09465b0a 100644
--- a/features/step_definitions/oembed_steps.rb
+++ b/features/step_definitions/oembed_steps.rb
@@ -125,10 +125,10 @@ end
 Then /^I should see a video player$/ do
   visit aspects_path
   find('.post-content .oembed')
-  find('.stream_container').should have_css('.post-content .oembed img')
+  find('.stream-container').should have_css('.post-content .oembed img')
 end
 
 Then /^I should not see a video player$/ do
-  find('.stream_container').should_not have_css('.post-content .oembed img')
+  find('.stream-container').should_not have_css('.post-content .oembed img')
 end