diff --git a/lib/liquid/parser_switching.rb b/lib/liquid/parser_switching.rb
index 4b35e213..ca426766 100644
--- a/lib/liquid/parser_switching.rb
+++ b/lib/liquid/parser_switching.rb
@@ -3,19 +3,15 @@
 module Liquid
   module ParserSwitching
     def parse_with_selected_parser(markup)
-      strict2_parse_with_error_context(markup)
-    end
-
-    private
-
-    def strict2_parse_with_error_context(markup)
-      strict2_parse(markup)
+      parse_markup(markup)
     rescue SyntaxError => e
       e.line_number    = line_number
       e.markup_context = markup_context(markup)
       raise e
     end
 
+    private
+
     def markup_context(markup)
       "in \"#{markup.strip}\""
     end
diff --git a/lib/liquid/tags/case.rb b/lib/liquid/tags/case.rb
index e14f338d..ca1d329c 100644
--- a/lib/liquid/tags/case.rb
+++ b/lib/liquid/tags/case.rb
@@ -83,7 +83,7 @@ module Liquid
 
     private
 
-    def strict2_parse(markup)
+    def parse_markup(markup)
       parser = @parse_context.new_parser(markup)
       @left = safe_parse_expression(parser)
       parser.consume(:end_of_string)
@@ -92,14 +92,10 @@ module Liquid
     def record_when_condition(markup)
       body = new_body
 
-      if strict2_mode?
-        parse_strict2_when(markup, body)
-      else
-        parse_lax_when(markup, body)
-      end
+      parse_when(markup, body)
     end
 
-    def parse_strict2_when(markup, body)
+    def parse_when(markup, body)
       parser = @parse_context.new_parser(markup)
 
       loop do
diff --git a/lib/liquid/tags/cycle.rb b/lib/liquid/tags/cycle.rb
index 2d372cee..a98d2539 100644
--- a/lib/liquid/tags/cycle.rb
+++ b/lib/liquid/tags/cycle.rb
@@ -54,7 +54,7 @@ module Liquid
     private
 
     # cycle [name:] expression(, expression)*
-    def strict2_parse(markup)
+    def parse_markup(markup)
       p = @parse_context.new_parser(markup)
 
       @variables = []
diff --git a/lib/liquid/tags/for.rb b/lib/liquid/tags/for.rb
index 4b89b797..cac9d239 100644
--- a/lib/liquid/tags/for.rb
+++ b/lib/liquid/tags/for.rb
@@ -70,7 +70,7 @@ module Liquid
 
     protected
 
-    def strict2_parse(markup)
+    def parse_markup(markup)
       p = @parse_context.new_parser(markup)
       @variable_name = p.consume(:id)
       raise SyntaxError, options[:locale].t("errors.syntax.for_invalid_in") unless p.id?('in')
diff --git a/lib/liquid/tags/if.rb b/lib/liquid/tags/if.rb
index 287fe78a..06c752da 100644
--- a/lib/liquid/tags/if.rb
+++ b/lib/liquid/tags/if.rb
@@ -77,7 +77,7 @@ module Liquid
       Condition.parse_expression(parse_context, markup, safe: safe)
     end
 
-    def strict2_parse(markup)
+    def parse_markup(markup)
       p = @parse_context.new_parser(markup)
       condition = parse_binary_comparisons(p)
       p.consume(:end_of_string)
diff --git a/lib/liquid/tags/include.rb b/lib/liquid/tags/include.rb
index 49bc032f..b50c68a6 100644
--- a/lib/liquid/tags/include.rb
+++ b/lib/liquid/tags/include.rb
@@ -81,7 +81,7 @@ module Liquid
     alias_method :parse_context, :options
     private :parse_context
 
-    def strict2_parse(markup)
+    def parse_markup(markup)
       p = @parse_context.new_parser(markup)
 
       @template_name_expr = safe_parse_expression(p)
diff --git a/lib/liquid/tags/render.rb b/lib/liquid/tags/render.rb
index 43d0bca8..5c071c80 100644
--- a/lib/liquid/tags/render.rb
+++ b/lib/liquid/tags/render.rb
@@ -84,10 +84,10 @@ module Liquid
     end
 
     # render (string) (with|for expression)? (as id)? (key: value)*
-    def strict2_parse(markup)
+    def parse_markup(markup)
       p = @parse_context.new_parser(markup)
 
-      @template_name_expr = parse_expression(strict2_template_name(p), safe: true)
+      @template_name_expr = parse_expression(template_name(p), safe: true)
       with_or_for         = p.id?("for") || p.id?("with")
       @variable_name_expr = safe_parse_expression(p) if with_or_for
       @alias_name         = p.consume(:id) if p.id?("as")
@@ -106,7 +106,7 @@ module Liquid
       p.consume(:end_of_string)
     end
 
-    def strict2_template_name(p)
+    def template_name(p)
       p.consume(:string)
     end
 
diff --git a/lib/liquid/tags/table_row.rb b/lib/liquid/tags/table_row.rb
index 07c6da23..c9114754 100644
--- a/lib/liquid/tags/table_row.rb
+++ b/lib/liquid/tags/table_row.rb
@@ -33,7 +33,7 @@ module Liquid
       parse_with_selected_parser(markup)
     end
 
-    def strict2_parse(markup)
+    def parse_markup(markup)
       p = @parse_context.new_parser(markup)
 
       @variable_name = p.consume(:id)
diff --git a/lib/liquid/variable.rb b/lib/liquid/variable.rb
index 0a0ad21e..fcc72351 100644
--- a/lib/liquid/variable.rb
+++ b/lib/liquid/variable.rb
@@ -41,14 +41,14 @@ module Liquid
       "in \"{{#{markup}}}\""
     end
 
-    def strict2_parse(markup)
+    def parse_markup(markup)
       @filters = []
       p = @parse_context.new_parser(markup)
 
       return if p.look(:end_of_string)
 
       @name = parse_context.safe_parse_expression(p)
-      @filters << strict2_parse_filter_expressions(p) while p.consume?(:pipe)
+      @filters << parse_filter_expressions(p) while p.consume?(:pipe)
       p.consume(:end_of_string)
     end
 
@@ -99,7 +99,7 @@ module Liquid
     # argument = (positional_argument | keyword_argument)
     # positional_argument = expression
     # keyword_argument = id ":" expression
-    def strict2_parse_filter_expressions(p)
+    def parse_filter_expressions(p)
       filtername = p.consume(:id)
       filter_args = []
       keyword_args = {}