diff --git a/static/css/utils/inputs.scss b/static/css/utils/inputs.scss
index 6eaabc448..15b8bb47e 100644
--- a/static/css/utils/inputs.scss
+++ b/static/css/utils/inputs.scss
@@ -25,26 +25,26 @@
   color: var(--color-fontsec);
 }
 
-.form-group__label {
+.form-group-label {
   font-weight: 600;
   padding-top: 6px;
 }
 
-.form-group__label__hint {
+.form-group-label__hint {
   margin-top: 7px;
   color: var(--color-fontsec);
   font-size: 0.9rem;
 }
 
 .form-group--required {
-  .form-group__label__caption::after {
+  .form-group-label__caption::after {
     content: ' *';
     color: var(--color-error);
   }
 }
 
 .form-group--optional {
-  .form-group__label__caption::after {
+  .form-group-label__caption::after {
     content: '';
   }
 }
diff --git a/templates/widgets/aform/aform.hamlet b/templates/widgets/aform/aform.hamlet
index eddce8fdc..91ebc2b93 100644
--- a/templates/widgets/aform/aform.hamlet
+++ b/templates/widgets/aform/aform.hamlet
@@ -3,7 +3,7 @@ $newline never
 $case formLayout
   $of FormDBTablePagesize
     $forall view <- fieldViews
-      <label .form-group__label.label-pagesize for=#{fvId view}>#{fvLabel view}
+      <label .form-group-label.label-pagesize for=#{fvId view}>#{fvLabel view}
       ^{fvInput view}
   $of _
     $forall view <- fieldViews
@@ -13,11 +13,11 @@ $case formLayout
       $else
         <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
           $if not (Blaze.null $ fvLabel view)
-            <label .form-group__label for=#{fvId view}>
-              <span .form-group__label__caption>
+            <label .form-group-label for=#{fvId view}>
+              <span .form-group-label__caption>
                 #{fvLabel view}
               $maybe hint <- fvTooltip view
-                <div .form-group__label__hint>^{hint}
+                <div .form-group-label__hint>^{hint}
           <div .form-group__input>
             ^{fvInput view}
             $maybe err <- fvErrors view