diff --git a/node_modules_build/kwf-webpack/loader-kwc/component-file-loader.js b/node_modules_build/kwf-webpack/loader-kwc/component-file-loader.js
index e0cd55b6d6..1ebed825c6 100644
--- a/node_modules_build/kwf-webpack/loader-kwc/component-file-loader.js
+++ b/node_modules_build/kwf-webpack/loader-kwc/component-file-loader.js
@@ -11,7 +11,8 @@ module.exports = function(source, map) {
     this.cacheable();
 
     source = source.replace(/\.kwcClass/g, '.'+query.cls);
-    source = source.replace(/kwcBem/g, query.cls);
+    source = source.replace(/kwcBem__/g, query.cls+'__');
+    source = source.replace(/kwcBem--/g, query.cls+'--');
 
     return source;
 };