3 files changed, 7 insertions, 7 deletions
diff --git a/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss b/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss
index 2b627df3e7..f24a40f5b6 100644
--- a/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss
+++ b/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss
@@ -42,10 +42,10 @@
 
   // If the shadow-list only contains one shadow
   // (we can't use the recursive replace function because that will mess up the list delimeters)
-  @if last($shadow-list) == hilite {
-    @return replace($shadow-list, hilite, $hilite);
-  } @else if last($shadow-list) == shade {
-    @return replace($shadow-list, shade, $shade);
+  @if last($shadow-list) == v-hilite {
+    @return replace($shadow-list, v-hilite, $hilite);
+  } @else if last($shadow-list) == v-shade {
+    @return replace($shadow-list, v-shade, $shade);
   }
   
   // If there are multiple shadows in a list, recurse and separate lists with a comma
diff --git a/WebContent/VAADIN/themes/valo/util/_color.scss b/WebContent/VAADIN/themes/valo/util/_color.scss
index 77fe0ed5c7..c2fb9f1a1b 100644
--- a/WebContent/VAADIN/themes/valo/util/_color.scss
+++ b/WebContent/VAADIN/themes/valo/util/_color.scss
@@ -97,7 +97,7 @@ $v-luminance-threshold: 150 !default;
 
 @function v-valo-focus-box-shadow ($color: null, $focus-style: $v-focus-style) {
   $focus-color: v-valo-focus-color($color: $color);
-  @return replace($focus-style, focus-color, transparentize($focus-color, .5));
+  @return replace($focus-style, v-focus-color, transparentize($focus-color, .5));
 }
 
 
diff --git a/WebContent/VAADIN/themes/valo/util/_gradient.scss b/WebContent/VAADIN/themes/valo/util/_gradient.scss
index 6266fe9864..9c738edfe5 100644
--- a/WebContent/VAADIN/themes/valo/util/_gradient.scss
+++ b/WebContent/VAADIN/themes/valo/util/_gradient.scss
@@ -12,12 +12,12 @@
 @function v-valo-gradient-color-stops($color, $style: $v-gradient-style, $depth: $v-gradient-depth) {
   @if $depth > 0 {
     
-    @if $style == linear or $style == linear-reverse {
+    @if $style == v-linear or $style == v-linear-reverse {
       $start: blend-overlay(transparentize(#fff, 1-$depth/100%), $color);
       $end: blend-overlay(transparentize(#000, max(0, 1-$depth/100%)), $color);
       $end: blend-multiply(transparentize(#000, max(0, 1-$depth/200%)), $end);
       
-      @if $style == linear {
+      @if $style == v-linear {
         @return $start 2%, $end 98%;
       } @else {
         @return $end 2%, $start 98%;