diff --git a/spec/lrama/context_spec.rb b/spec/lrama/context_spec.rb
index a8ff640d..d81d5964 100644
--- a/spec/lrama/context_spec.rb
+++ b/spec/lrama/context_spec.rb
@@ -5,7 +5,7 @@
   describe "basic" do
     it do
       y = File.read(fixture_path("context/basic.y"))
-      grammar = Lrama::Parser.new(y).parse
+      grammar = Lrama::NewParser.new(y).parse
       states = Lrama::States.new(grammar, warning)
       states.compute
       context = Lrama::Context.new(states)
@@ -181,7 +181,7 @@
 %%
         INPUT
 
-        grammar = Lrama::Parser.new(y).parse
+        grammar = Lrama::NewParser.new(y).parse
         states = Lrama::States.new(grammar, warning)
         states.compute
         context = Lrama::Context.new(states)
@@ -230,7 +230,7 @@
 %%
         INPUT
 
-        grammar = Lrama::Parser.new(y).parse
+        grammar = Lrama::NewParser.new(y).parse
         states = Lrama::States.new(grammar, warning)
         states.compute
         context = Lrama::Context.new(states)
diff --git a/spec/lrama/states_spec.rb b/spec/lrama/states_spec.rb
index e46c3759..4ac84c38 100644
--- a/spec/lrama/states_spec.rb
+++ b/spec/lrama/states_spec.rb
@@ -5,7 +5,7 @@
   describe '#compute' do
     it "basic" do
       y = File.read(fixture_path("common/basic.y"))
-      grammar = Lrama::Parser.new(y).parse
+      grammar = Lrama::NewParser.new(y).parse
       states = Lrama::States.new(grammar, warning)
       states.compute
 
@@ -298,7 +298,7 @@ class    go to state 5
 
     it '#State#accessing_symbol' do
       y = File.read(fixture_path("common/basic.y"))
-      grammar = Lrama::Parser.new(y).parse
+      grammar = Lrama::NewParser.new(y).parse
       states = Lrama::States.new(grammar, warning)
       states.compute
 
@@ -338,7 +338,7 @@ class    go to state 5
   describe '#reads_relation' do
     it do
       y = File.read(fixture_path("states/reads_relation.y"))
-      grammar = Lrama::Parser.new(y).parse
+      grammar = Lrama::NewParser.new(y).parse
       states = Lrama::States.new(grammar, warning)
       states.compute
 
@@ -605,7 +605,7 @@ class    go to state 5
   describe '#includes_relation' do
     it do
       y = File.read(fixture_path("states/includes_relation.y"))
-      grammar = Lrama::Parser.new(y).parse
+      grammar = Lrama::NewParser.new(y).parse
       states = Lrama::States.new(grammar, warning)
       states.compute
 
@@ -904,7 +904,7 @@ class    go to state 5
 
 %%
         INPUT
-        grammar = Lrama::Parser.new(y).parse
+        grammar = Lrama::NewParser.new(y).parse
         states = Lrama::States.new(grammar, warning)
         states.compute
 
@@ -973,7 +973,7 @@ class    go to state 5
 
 %%
         INPUT
-        grammar = Lrama::Parser.new(y).parse
+        grammar = Lrama::NewParser.new(y).parse
         states = Lrama::States.new(grammar, warning)
         states.compute
 
@@ -1063,7 +1063,7 @@ class    go to state 5
 
 %%
         INPUT
-        grammar = Lrama::Parser.new(y).parse
+        grammar = Lrama::NewParser.new(y).parse
         states = Lrama::States.new(grammar, warning)
         states.compute
 
@@ -1180,7 +1180,7 @@ class    go to state 5
 
 %%
         INPUT
-        grammar = Lrama::Parser.new(y).parse
+        grammar = Lrama::NewParser.new(y).parse
         states = Lrama::States.new(grammar, warning)
         states.compute
 
@@ -1426,7 +1426,7 @@ class    go to state 5
 
 %%
       INPUT
-      grammar = Lrama::Parser.new(y).parse
+      grammar = Lrama::NewParser.new(y).parse
       states = Lrama::States.new(grammar, warning)
       states.compute
 
@@ -1598,7 +1598,7 @@ class    go to state 5
 
 %%
       INPUT
-      grammar = Lrama::Parser.new(y).parse
+      grammar = Lrama::NewParser.new(y).parse
       states = Lrama::States.new(grammar, warning)
       states.compute
 
@@ -1816,7 +1816,7 @@ class : keyword_class tSTRING keyword_end %prec tPLUS
           end
 
           it "has errors for r/r conflicts" do
-            grammar = Lrama::Parser.new(header + y).parse
+            grammar = Lrama::NewParser.new(header + y).parse
             states = Lrama::States.new(grammar, warning)
             states.compute
 
@@ -1840,7 +1840,7 @@ class : keyword_class tSTRING keyword_end %prec tPLUS
           end
 
           it "has errors for s/r conflicts and r/r conflicts" do
-            grammar = Lrama::Parser.new(header + y).parse
+            grammar = Lrama::NewParser.new(header + y).parse
             states = Lrama::States.new(grammar, warning)
             states.compute
 
@@ -1864,7 +1864,7 @@ class : keyword_class tSTRING keyword_end %prec tPLUS
         end
 
         it "has warns for s/r conflicts and r/r conflicts" do
-          grammar = Lrama::Parser.new(header + y).parse
+          grammar = Lrama::NewParser.new(header + y).parse
           states = Lrama::States.new(grammar, warning)
           states.compute