diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js
similarity index 90%
rename from js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
rename to js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js
index f7b04cc6..43330538 100644
--- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
+++ b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js
@@ -4,9 +4,9 @@ import EditionListStore from '../../stores/edition_list_store';
 import EditionListActions from '../../actions/edition_list_actions';
 
 import AclButton from '../acl_button';
-import PieceListToolbarSelectedEditionsWidget from './piece_list_toolbar_selected_editions_widget';
+import PieceListBulkModalSelectedEditionsWidget from './piece_list_bulk_modal_selected_editions_widget';
 
-let PieceListToolbar = React.createClass({
+let PieceListBulkModal = React.createClass({
     propTypes: {
         className: React.PropTypes.string
     },
@@ -82,15 +82,15 @@ let PieceListToolbar = React.createClass({
             return (
                 <div className={this.props.className}>
                     <div className="row no-margin">
-                        <div className="col-xs-12 col-sm-12 col-md-12 col-lg-12 piece-list-toolbar">
+                        <div className="col-xs-12 col-sm-12 col-md-12 col-lg-12 piece-list-bulk-modal">
                             <p></p>
                             <div className="row">
                                 <div className="text-center">
-                                    <PieceListToolbarSelectedEditionsWidget
+                                    <PieceListBulkModalSelectedEditionsWidget
                                         numberOfSelectedEditions={this.fetchSelectedEditionList().length} />
                                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                     <span 
-                                        className="piece-list-toolbar-clear-all"
+                                        className="piece-list-bulk-modal-clear-all"
                                         onClick={this.clearAllSelections}>clear all</span>
                                 </div>
                             </div>
@@ -114,4 +114,4 @@ let PieceListToolbar = React.createClass({
     }
 });
 
-export default PieceListToolbar;
\ No newline at end of file
+export default PieceListBulkModal;
\ No newline at end of file
diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_selected_editions_widget.js b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js
similarity index 74%
rename from js/components/ascribe_piece_list_toolbar/piece_list_toolbar_selected_editions_widget.js
rename to js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js
index 5c020d45..22b35a4a 100644
--- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_selected_editions_widget.js
+++ b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal_selected_editions_widget.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-let PieceListToolbarSelectedEditionsWidget = React.createClass({
+let PieceListBulkModalSelectedEditionsWidget = React.createClass({
     propTypes: {
         numberOfSelectedEditions: React.PropTypes.number.isRequired
     },
@@ -14,4 +14,4 @@ let PieceListToolbarSelectedEditionsWidget = React.createClass({
     }
 });
 
-export default PieceListToolbarSelectedEditionsWidget;
\ No newline at end of file
+export default PieceListBulkModalSelectedEditionsWidget;
\ No newline at end of file
diff --git a/js/components/piece_list.js b/js/components/piece_list.js
index 9580ffb1..2a75b7da 100644
--- a/js/components/piece_list.js
+++ b/js/components/piece_list.js
@@ -10,7 +10,7 @@ import AccordionListItemTableEditions from './ascribe_accordion_list/accordion_l
 
 import Pagination from './ascribe_pagination/pagination';
 
-import PieceListToolbar from './ascribe_piece_list_toolbar/piece_list_toolbar';
+import PieceListBulkModal from './ascribe_piece_list_bulk_modal/piece_list_bulk_modal';
 
 
 let PieceList = React.createClass({
@@ -50,7 +50,7 @@ let PieceList = React.createClass({
         
         return (
             <div>
-                <PieceListToolbar className="ascribe-piece-list-toolbar" />
+                <PieceListBulkModal className="ascribe-piece-list-bulk-modal" />
                 <AccordionList
                     className="ascribe-accordion-list"
                     changeOrder={this.accordionChangeOrder}
diff --git a/sass/ascribe-accordion_list.scss b/sass/ascribe_accordion_list.scss
similarity index 100%
rename from sass/ascribe-accordion_list.scss
rename to sass/ascribe_accordion_list.scss
diff --git a/sass/ascribe-piece-list-toolbar.scss b/sass/ascribe_piece_list_bulk_modal.scss
similarity index 85%
rename from sass/ascribe-piece-list-toolbar.scss
rename to sass/ascribe_piece_list_bulk_modal.scss
index 6093aed9..4a6b98d7 100644
--- a/sass/ascribe-piece-list-toolbar.scss
+++ b/sass/ascribe_piece_list_bulk_modal.scss
@@ -1,4 +1,4 @@
-.ascribe-piece-list-toolbar {
+.ascribe-piece-list-bulk-modal {
     position: fixed;
     top:0;
     width:1170px;
@@ -14,7 +14,7 @@
     z-index:9999;
 }
 
-.piece-list-toolbar-clear-all {
+.piece-list-bulk-modal-clear-all {
     text-decoration: underline;
     cursor:pointer;
 }
\ No newline at end of file
diff --git a/sass/ascribe-variables.scss b/sass/ascribe_variables.scss
similarity index 100%
rename from sass/ascribe-variables.scss
rename to sass/ascribe_variables.scss
diff --git a/sass/main.scss b/sass/main.scss
index 471a6124..0457a53e 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -1,12 +1,12 @@
 // If you import a new .scss file, make sure to restart gulp
 // otherwise it will not be included
 @import 'variables';
-@import 'ascribe-variables';
+@import 'ascribe_variables';
 @import '../node_modules/bootstrap-sass/assets/stylesheets/bootstrap';
 @import './ascribe-fonts/style';
 @import './ascribe-fonts/ascribe-fonts';
-@import 'ascribe-accordion_list';
-@import 'ascribe-piece-list-toolbar';
+@import 'ascribe_accordion_list';
+@import 'ascribe_piece_list_bulk_modal';
 
 .hidden {
     display: none;