diff --git a/components/00_Tools/_bemGenerator.styl b/components/00_Tools/_bemGenerator.styl
index b9c7294..1a298f6 100644
--- a/components/00_Tools/_bemGenerator.styl
+++ b/components/00_Tools/_bemGenerator.styl
@@ -84,8 +84,7 @@ RV-Level(name, name_delimiter, allowed_parent_levels, selector_callback)
 
 RV-Block(name)
 	.{name}
-		+prefix-classes(name)
-			{block}
+		{block}
 	
 	_bem_context._alias_map = {}
 	_bem_context._alias_stack = () ()
@@ -93,10 +92,10 @@ RV-Block(name)
 RV-Element(name=null)
 	+RV-Level(name, '__', ('RV-Block' 'RV-Block--modifier'), @(name){
 		if is_nested_in('RV-Block--modifier') {
-			return '& .__' + name
+			return '& ^[-1]__' + name
 		}
 		else {
-			return '&__' + name
+			return '& &__' + name
 		}
 	})
 		{block}