diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/geoip/styles.less b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/geoip/styles.less
index b6bbcf63ee5aa..fef99d4c0d9a0 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/geoip/styles.less
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/geoip/styles.less
@@ -1,13 +1,13 @@
 processor-ui-geoip {
   .advanced-section {
     margin-top: 15px;
+  }
 
-    &-heading{
-      .btn {
-        background-color: transparent;
-        color: black;
-        border: transparent;
-      }
+  .advanced-section-heading {
+    .btn {
+      background-color: transparent;
+      color: black;
+      border: transparent;
     }
   }
 }
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_pipeline_setup.less b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_pipeline_setup.less
index dc93652a124df..0bd1a3846ad44 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_pipeline_setup.less
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_pipeline_setup.less
@@ -53,18 +53,18 @@ pipeline-setup {
   .add-processor {
     padding:10px;
     margin-bottom: 10px;
+  }
 
-    &-dropdown {
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
+  .add-processor-dropdown {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
 
-      select.form-control {
-        background-color: @settings-filebeat-wizard-processor-select-bg;
-        border: none;
-        width: auto;
-        margin-right: 5px;
-      }
+    select.form-control {
+      background-color: @settings-filebeat-wizard-processor-select-bg;
+      border: none;
+      width: auto;
+      margin-right: 5px;
     }
   }
 
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container.less b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container.less
index 9d47774a55eb1..4c64b650960c8 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container.less
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container.less
@@ -13,11 +13,6 @@ processor-ui-container {
     overflow: hidden;
     position: relative;
 
-    &-content {
-      padding: 10px;
-      background-color: white;
-    }
-
     .overlay {
       display: none;
       position: absolute;
@@ -36,6 +31,11 @@ processor-ui-container {
     }
   }
 
+  .processor-ui-container-body-content {
+    padding: 10px;
+    background-color: white;
+  }
+
   label {
     font-weight: normal;
   }
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container_header.less b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container_header.less
index 47dbc49de7d0c..246a4ab0792cd 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container_header.less
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/styles/_processor_ui_container_header.less
@@ -15,33 +15,33 @@ processor-ui-container-header {
       width: 22px;
       border-radius: 4px;
     }
+  }
 
-    &-toggle {
-      flex: 0 0 auto;
-      margin-right: 5px;
-    }
-
-    &-title {
-      flex: 1 1 auto;
-      .ellipsis();
-      font-weight: bold;
+  .processor-ui-container-header-toggle {
+    flex: 0 0 auto;
+    margin-right: 5px;
+  }
 
-      .processor-title {
-        width: 100%;
-      }
+  .processor-ui-container-header-title {
+    flex: 1 1 auto;
+    .ellipsis();
+    font-weight: bold;
 
-      .processor-description {
-        font-weight: normal;
-      }
+    .processor-title {
+      width: 100%;
+    }
 
-      .processor-description.danger {
-        font-weight: bold;
-        color: @brand-danger;
-      }
+    .processor-description {
+      font-weight: normal;
     }
 
-    &-controls {
-      flex: 0 0 auto;
+    .processor-description.danger {
+      font-weight: bold;
+      color: @brand-danger;
     }
   }
+
+  .processor-ui-container-header-controls {
+    flex: 0 0 auto;
+  }
 }
diff --git a/src/core_plugins/timelion/public/chart.less b/src/core_plugins/timelion/public/chart.less
index 4d18be967e676..4c6078f76f221 100644
--- a/src/core_plugins/timelion/public/chart.less
+++ b/src/core_plugins/timelion/public/chart.less
@@ -1,13 +1,11 @@
-.chart {
-  &-top-title {
-    flex: 0;
-    text-align: center;
-    font-weight: bold;
-    font-size: 11px;
-  }
+.chart-top-title {
+  flex: 0;
+  text-align: center;
+  font-weight: bold;
+  font-size: 11px;
+}
 
-  &-canvas {
-    min-width: 100%;
-    flex: 1;
-  }
+.chart-canvas {
+  min-width: 100%;
+  flex: 1;
 }
diff --git a/src/core_plugins/timelion/public/suggestions.less b/src/core_plugins/timelion/public/suggestions.less
index d04e83446a782..076c756b30cc5 100644
--- a/src/core_plugins/timelion/public/suggestions.less
+++ b/src/core_plugins/timelion/public/suggestions.less
@@ -16,17 +16,6 @@
     border-bottom: 1px solid @gray-lighter;
     padding: 5px 20px;
 
-    &-details {
-      background-color: @body-bg;
-      padding: 10px;
-      border-radius: @border-radius-base;
-
-      > table {
-        color: @text-color;
-        margin-bottom: 0px;
-      }
-    }
-
     &:hover {
       background-color: @gray-lighter;
     }
@@ -35,4 +24,15 @@
       background-color: @gray-lighter;
     }
   }
+
+  .suggestion-details {
+    background-color: @body-bg;
+    padding: 10px;
+    border-radius: @border-radius-base;
+
+    > table {
+      color: @text-color;
+      margin-bottom: 0px;
+    }
+  }
 }
diff --git a/src/core_plugins/timelion/public/vis/timelion_vis.less b/src/core_plugins/timelion/public/vis/timelion_vis.less
index 942894eb45838..8ce5d759366d5 100644
--- a/src/core_plugins/timelion/public/vis/timelion_vis.less
+++ b/src/core_plugins/timelion/public/vis/timelion_vis.less
@@ -14,12 +14,12 @@
     display: flex;
     flex-direction: column;
   }
+}
 
-  &-editor-expression {
-    position: relative;
+.timelion-vis-editor-expression {
+  position: relative;
 
-    .suggestions {
-      position: absolute;
-    }
+  .suggestions {
+    position: absolute;
   }
 }