diff --git a/templates/course/lecturerMassInput/layout.hamlet b/templates/course/lecturerMassInput/layout.hamlet
index 8dc00bc90..223ed386e 100644
--- a/templates/course/lecturerMassInput/layout.hamlet
+++ b/templates/course/lecturerMassInput/layout.hamlet
@@ -2,10 +2,10 @@ $newline never
 <table>
   <tbody>
     $forall coord <- review liveCoords lLength
-      <tr .massinput--cell>
+      <tr .massinput__cell>
         ^{cellWdgts ! coord}
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr .massinput--add>
+    <tr .massinput__cell>
       ^{addWdgts ! (0, 0)}
diff --git a/templates/sheetCorrectors/layout.hamlet b/templates/sheetCorrectors/layout.hamlet
index 3f6bb4f87..bd28b651d 100644
--- a/templates/sheetCorrectors/layout.hamlet
+++ b/templates/sheetCorrectors/layout.hamlet
@@ -9,10 +9,10 @@ $newline never
       <td>
   <tbody>
     $forall coord <- review liveCoords lLength
-      <tr .massinput--cell .table__row>
+      <tr .massinput__cell .table__row>
         ^{cellWdgts ! coord}
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr .massinput--add>
+    <tr .massinput__cell>
       ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/massinput/list/layout.hamlet b/templates/widgets/massinput/list/layout.hamlet
index 5f5676bb6..5c747e041 100644
--- a/templates/widgets/massinput/list/layout.hamlet
+++ b/templates/widgets/massinput/list/layout.hamlet
@@ -1,14 +1,14 @@
 $newline never
 <table>
   <tbody>
-    <tr .massinput--cell>
+    <tr .massinput__cell>
       $forall coord <- review liveCoords lLength
         <td>
           ^{cellWdgts ! coord}
         <td>
           ^{fvInput (delButtons ! coord)}
   <tfoot>
-    <tr>
+    <tr .massinput__cell>
+      <td>
       <td>
-      <td .massinput--add>
         ^{addWdgts ! (0, 0)}
diff --git a/templates/widgets/massinput/row.hamlet b/templates/widgets/massinput/row.hamlet
index 8c43c9896..17d909baa 100644
--- a/templates/widgets/massinput/row.hamlet
+++ b/templates/widgets/massinput/row.hamlet
@@ -1,7 +1,7 @@
-<ul .massinput--row .#{"massinput--dim" <> toPathPiece dimIx}>
+<ul .massinput__row .#{"massinput--dim" <> toPathPiece dimIx}>
   $forall (cellCoord, cell) <- cells
-    <li .massinput--cell data-massinput-coord=#{toPathPiece cellCoord}>
+    <li .massinput__cell data-massinput-coord=#{toPathPiece cellCoord}>
       ^{cell}
   $maybe add <- addWidget
-    <li .massinput--add>
+    <li .massinput__cell>
       ^{add}