diff --git a/app/assets/javascripts/app/helpers/handlebars-helpers.js b/app/assets/javascripts/app/helpers/handlebars-helpers.js
index 0a75ebbb6..a6ed3de0c 100644
--- a/app/assets/javascripts/app/helpers/handlebars-helpers.js
+++ b/app/assets/javascripts/app/helpers/handlebars-helpers.js
@@ -116,7 +116,7 @@ Handlebars.registerHelper("isCurrentProfilePage", function(id, diasporaHandle, o
 });
 
 Handlebars.registerHelper('aspectMembershipIndicator', function(contact,in_aspect) {
-  if(!app.aspect || !app.aspect.get('id')) return '<div class="aspect_membership_dropdown placeholder"></div>';
+  if(!app.aspect || !app.aspect.get('id')) return '<div class="aspect-membership-dropdown placeholder"></div>';
 
   var html = "<i class=\"entypo-";
   if( in_aspect === 'in_aspect' ) {
diff --git a/app/assets/javascripts/app/pages/getting_started.js b/app/assets/javascripts/app/pages/getting_started.js
index 4cf3044c4..91fc2e1be 100644
--- a/app/assets/javascripts/app/pages/getting_started.js
+++ b/app/assets/javascripts/app/pages/getting_started.js
@@ -5,7 +5,7 @@ app.pages.GettingStarted = app.views.Base.extend({
   templateName: false,
 
   subviews: {
-    ".aspect_membership_dropdown": "aspectMembershipView"
+    ".aspect-membership-dropdown": "aspectMembershipView"
   },
 
   initialize: function(opts) {
diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js
index 60db01eeb..905693b99 100644
--- a/app/assets/javascripts/app/router.js
+++ b/app/assets/javascripts/app/router.js
@@ -229,7 +229,7 @@ app.Router = Backbone.Router.extend({
   },
 
   renderAspectMembershipDropdowns: function($context) {
-    $context.find(".aspect_membership_dropdown.placeholder").each(function() {
+    $context.find(".aspect-membership-dropdown.placeholder").each(function() {
       var personId = $(this).data("personId");
       var view = new app.views.AspectMembership({person: app.contacts.findWhere({"person_id": personId}).person});
       $(this).html(view.render().$el);
diff --git a/app/assets/javascripts/app/views/aspect_membership_view.js b/app/assets/javascripts/app/views/aspect_membership_view.js
index 65bd571b5..2b46c2ed7 100644
--- a/app/assets/javascripts/app/views/aspect_membership_view.js
+++ b/app/assets/javascripts/app/views/aspect_membership_view.js
@@ -9,7 +9,7 @@
  */
 app.views.AspectMembership = app.views.Base.extend({
   templateName: "aspect_membership_dropdown",
-  className: "btn-group aspect-dropdown aspect_membership_dropdown",
+  className: "btn-group aspect-dropdown aspect-membership-dropdown",
 
   subviews: {
     ".newAspectContainer": "aspectCreateView"
@@ -124,7 +124,7 @@ app.views.AspectMembership = app.views.Base.extend({
   // show an error flash msg
   _displayError: function(model, resp) {
     this._done();
-    this.dropdown.closest(".aspect_membership_dropdown").removeClass("open"); // close the dropdown
+    this.dropdown.closest(".aspect-membership-dropdown").removeClass("open"); // close the dropdown
     app.flashMessages.handleAjaxError(resp);
   },
 
diff --git a/app/assets/javascripts/app/views/contact_view.js b/app/assets/javascripts/app/views/contact_view.js
index 1a0a676d6..c62eccfe9 100644
--- a/app/assets/javascripts/app/views/contact_view.js
+++ b/app/assets/javascripts/app/views/contact_view.js
@@ -4,7 +4,7 @@ app.views.Contact = app.views.Base.extend({
   templateName: 'contact',
 
   subviews: {
-    ".aspect_membership_dropdown": "AspectMembershipView"
+    ".aspect-membership-dropdown": "AspectMembershipView"
   },
 
   events: {
diff --git a/app/assets/javascripts/app/views/profile_header_view.js b/app/assets/javascripts/app/views/profile_header_view.js
index 14247369a..f23ffc680 100644
--- a/app/assets/javascripts/app/views/profile_header_view.js
+++ b/app/assets/javascripts/app/views/profile_header_view.js
@@ -4,7 +4,7 @@ app.views.ProfileHeader = app.views.Base.extend({
   templateName: 'profile_header',
 
   subviews: {
-    ".aspect_membership_dropdown": "aspectMembershipView"
+    ".aspect-membership-dropdown": "aspectMembershipView"
   },
 
   events: {
diff --git a/app/assets/javascripts/contact-list.js b/app/assets/javascripts/contact-list.js
index c5734d583..7f7ea5245 100644
--- a/app/assets/javascripts/contact-list.js
+++ b/app/assets/javascripts/contact-list.js
@@ -18,7 +18,7 @@ var List = {
 
     if (data.contacts) {
       var contacts = new app.collections.Contacts(data.contacts);
-      $(".aspect_membership_dropdown.placeholder").each(function() {
+      $(".aspect-membership-dropdown.placeholder").each(function() {
         var personId = $(this).data("personId");
         var view = new app.views.AspectMembership({person: contacts.findWhere({"person_id": personId}).person});
         $(this).html(view.render().$el);
diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss
index 9bd9df45a..55fe8f924 100644
--- a/app/assets/stylesheets/header.scss
+++ b/app/assets/stylesheets/header.scss
@@ -94,7 +94,7 @@
           margin-right: 10px;
           opacity: 1;
         }
-        & > .pull-right > .aspect_membership_dropdown { display: none; }
+        & > .pull-right > .aspect-membership-dropdown { display: none; }
       }
       .ajax-loader {
         border-bottom: 1px solid $border-grey;
diff --git a/app/assets/stylesheets/hovercard.scss b/app/assets/stylesheets/hovercard.scss
index 50867da4b..c664ee467 100644
--- a/app/assets/stylesheets/hovercard.scss
+++ b/app/assets/stylesheets/hovercard.scss
@@ -65,7 +65,7 @@
     margin-bottom: 5px;
   }
 
-  .btn-group.aspect_membership_dropdown { margin: 0 !important; }
+  .btn-group.aspect-membership-dropdown { margin: 0 !important; }
 }
 
 #hovercard_container {
diff --git a/app/assets/stylesheets/notifications.scss b/app/assets/stylesheets/notifications.scss
index d3ffa2f2b..d75e1bdf7 100644
--- a/app/assets/stylesheets/notifications.scss
+++ b/app/assets/stylesheets/notifications.scss
@@ -96,6 +96,6 @@
       opacity: 0;
     }
 
-    .btn-group.aspect_membership_dropdown { margin: 5px 0; }
+    .btn-group.aspect-membership-dropdown { margin: 5px 0; }
   }
 }
diff --git a/app/assets/stylesheets/people.scss b/app/assets/stylesheets/people.scss
index 5e2e5a1a4..65a9100ae 100644
--- a/app/assets/stylesheets/people.scss
+++ b/app/assets/stylesheets/people.scss
@@ -20,7 +20,7 @@
       width: 50px;
       height: 50px;
     }
-    .btn-group.aspect_membership_dropdown { margin: 12px 0; }
+    .btn-group.aspect-membership-dropdown { margin: 12px 0; }
     .thats_you {
       line-height: 50px;
       margin-right: 10px;
diff --git a/app/assets/templates/profile_header_tpl.jst.hbs b/app/assets/templates/profile_header_tpl.jst.hbs
index 4885810e5..e6f94881f 100644
--- a/app/assets/templates/profile_header_tpl.jst.hbs
+++ b/app/assets/templates/profile_header_tpl.jst.hbs
@@ -33,7 +33,7 @@
         {{else}} {{#if is_blocked}}
           <a href="#" id="unblock_user_button" class="btn btn-danger">{{t 'people.stop_ignoring'}}</a>
         {{else}}
-          <div class="placeholder aspect_membership_dropdown"></div>
+          <div class="placeholder aspect-membership-dropdown"></div>
         {{/if}}{{/if}}
       </div>
     {{/if}}
diff --git a/app/views/aspect_memberships/_aspect_membership_dropdown.haml b/app/views/aspect_memberships/_aspect_membership_dropdown.haml
index 0274ba91d..a7e690c8b 100644
--- a/app/views/aspect_memberships/_aspect_membership_dropdown.haml
+++ b/app/views/aspect_memberships/_aspect_membership_dropdown.haml
@@ -1 +1 @@
-.placeholder.aspect_membership_dropdown
+.placeholder.aspect-membership-dropdown
diff --git a/app/views/notifications/_notification.haml b/app/views/notifications/_notification.haml
index 23ff76fd3..cba9824c4 100644
--- a/app/views/notifications/_notification.haml
+++ b/app/views/notifications/_notification.haml
@@ -6,7 +6,7 @@
     - if note.target.present?
       - gon_load_contact(note.contact)
       .pull-right
-        .aspect_membership_dropdown.placeholder{data: {person_id: note.target.id}}
+        .aspect-membership-dropdown.placeholder{data: {person_id: note.target.id}}
 
   .media-object.pull-left
     = person_image_link note.actors.first, :size => :thumb_small, :class => 'hovercardable'
diff --git a/app/views/people/_relationship_action.haml b/app/views/people/_relationship_action.haml
index 01593dec7..c05e8dedf 100644
--- a/app/views/people/_relationship_action.haml
+++ b/app/views/people/_relationship_action.haml
@@ -1,5 +1,5 @@
 - unless person == current_user.person
-  .aspect_membership_dropdown.placeholder{data: {person_id: person.id}}
+  .aspect-membership-dropdown.placeholder{data: {person_id: person.id}}
 -else
   %span.thats_you
     = t("people.person.thats_you")
diff --git a/features/desktop/connects_users.feature b/features/desktop/connects_users.feature
index b9f934735..7016c8351 100644
--- a/features/desktop/connects_users.feature
+++ b/features/desktop/connects_users.feature
@@ -30,7 +30,7 @@ Feature: following and being followed
     When I sign in as "alice@alice.alice"
     And I am on "bob@bob.bob"'s page
 
-    And I press the first ".aspect_membership_dropdown .dropdown-toggle"
+    And I press the first ".aspect-membership-dropdown .dropdown-toggle"
     And I press the first "a" within ".add_aspect"
 
     And I fill in "aspect_name" with "Super People" in the aspect creation modal
diff --git a/features/step_definitions/aspects_steps.rb b/features/step_definitions/aspects_steps.rb
index 8d05a421e..d7c981479 100644
--- a/features/step_definitions/aspects_steps.rb
+++ b/features/step_definitions/aspects_steps.rb
@@ -15,13 +15,13 @@ module AspectCukeHelpers
   end
 
   def toggle_aspect_via_ui(aspect_name)
-    aspects_dropdown = find(".aspect_membership_dropdown .dropdown-toggle", match: :first)
+    aspects_dropdown = find(".aspect-membership-dropdown .dropdown-toggle", match: :first)
     aspects_dropdown.trigger "click"
-    selected_aspect_count = all(".aspect_membership_dropdown.open .dropdown-menu li.selected").length
-    aspect = find(".aspect_membership_dropdown.open .dropdown-menu li", text: aspect_name)
+    selected_aspect_count = all(".aspect-membership-dropdown.open .dropdown-menu li.selected").length
+    aspect = find(".aspect-membership-dropdown.open .dropdown-menu li", text: aspect_name)
     aspect_selected = aspect["class"].include? "selected"
     aspect.trigger "click"
-    expect(find(".aspect_membership_dropdown .dropdown-menu", visible: false)).to have_no_css(".loading")
+    expect(find(".aspect-membership-dropdown .dropdown-menu", visible: false)).to have_no_css(".loading")
 
     # close dropdown
     page.should have_no_css('#profile.loading')
@@ -31,7 +31,7 @@ module AspectCukeHelpers
   end
 
   def aspect_dropdown_visible?
-    expect(find('.aspect_membership_dropdown.open')).to be_visible
+    expect(find('.aspect-membership-dropdown.open')).to be_visible
   end
 end
 World(AspectCukeHelpers)
diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb
index 58a078bcb..505786eb7 100644
--- a/spec/controllers/notifications_controller_spec.rb
+++ b/spec/controllers/notifications_controller_spec.rb
@@ -119,7 +119,7 @@ describe NotificationsController, :type => :controller do
         eve.share_with(alice.person, eve.aspects.first)
         get :index, params: {per_page: 5}
 
-        expect(Nokogiri(response.body).css(".aspect_membership_dropdown")).not_to be_empty
+        expect(Nokogiri(response.body).css(".aspect-membership-dropdown")).not_to be_empty
       end
 
       it 'succeeds on mobile' do