diff --git a/app/assets/stylesheets/_neat.scss b/app/assets/stylesheets/_neat.scss
index 174f832d..7f8c439e 100644
--- a/app/assets/stylesheets/_neat.scss
+++ b/app/assets/stylesheets/_neat.scss
@@ -19,5 +19,5 @@
 @import "grid/media";
 @import "grid/to-deprecate";
 @import "grid/visual-grid";
-@import "grid/display";
-@import "grid/direction";
+@import "grid/display-context";
+@import "grid/direction-context";
diff --git a/app/assets/stylesheets/grid/_direction.scss b/app/assets/stylesheets/grid/_direction-context.scss
similarity index 93%
rename from app/assets/stylesheets/grid/_direction.scss
rename to app/assets/stylesheets/grid/_direction-context.scss
index 2bda7cb9..8da37606 100644
--- a/app/assets/stylesheets/grid/_direction.scss
+++ b/app/assets/stylesheets/grid/_direction-context.scss
@@ -17,7 +17,7 @@
  *      ...
  *   }
  */
-@mixin direction($direction: left-to-right) {
+@mixin direction-context($direction: left-to-right) {
   $scope-direction: $layout-direction;
 
   @if to-lower-case($direction) == "left-to-right" {
diff --git a/app/assets/stylesheets/grid/_display.scss b/app/assets/stylesheets/grid/_display-context.scss
similarity index 93%
rename from app/assets/stylesheets/grid/_display.scss
rename to app/assets/stylesheets/grid/_display-context.scss
index 5dbcee44..e1d81c9c 100644
--- a/app/assets/stylesheets/grid/_display.scss
+++ b/app/assets/stylesheets/grid/_display-context.scss
@@ -17,7 +17,7 @@
  *      ...
  *   }
  */
-@mixin display($display: block) {
+@mixin display-context($display: block) {
   $scope-display: $container-display-table;
   $container-display-table: $display == table !global;
 
diff --git a/spec/neat/direction_spec.rb b/spec/neat/direction_spec.rb
index 6ee47ec1..9a6d6ea0 100644
--- a/spec/neat/direction_spec.rb
+++ b/spec/neat/direction_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe "@include direction() {...}" do
+describe "@include direction-context() {...}" do
   before(:all) do
-    ParserSupport.parse_file("direction")
+    ParserSupport.parse_file("direction-context")
   end
 
   context "with no argument" do
diff --git a/spec/neat/display_spec.rb b/spec/neat/display_spec.rb
index 69bb2aca..37e56f58 100644
--- a/spec/neat/display_spec.rb
+++ b/spec/neat/display_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe "@include display() {...}" do
+describe "@include display-context() {...}" do
   before(:all) do
-    ParserSupport.parse_file("display")
+    ParserSupport.parse_file("display-context")
   end
 
   context "with argument (table)" do
diff --git a/test/direction.scss b/test/direction-context.scss
similarity index 64%
rename from test/direction.scss
rename to test/direction-context.scss
index 969f7b08..728bb3d4 100644
--- a/test/direction.scss
+++ b/test/direction-context.scss
@@ -1,12 +1,12 @@
 @import 'setup';
 
-@include direction() {
+@include direction-context() {
   .default-block {
     @include span-columns(6);
   }
 }
 
-@include direction(right-to-left) {
+@include direction-context(right-to-left) {
   .right-to-left-block {
     @include span-columns(6);
   }
diff --git a/test/display.scss b/test/display-context.scss
similarity index 59%
rename from test/display.scss
rename to test/display-context.scss
index 1f47238c..bd2d7b75 100644
--- a/test/display.scss
+++ b/test/display-context.scss
@@ -1,13 +1,13 @@
 @import 'setup';
 
-@include display(table) {
+@include display-context(table) {
   .display-table-block {
     @include span-columns(6);
   }
 }
 
-@include display(table) {
-  @include display(block) {
+@include display-context(table) {
+  @include display-context(block) {
     .display-nested-block {
       @include span-columns(6);
     }