diff --git a/lib/liquid/block.rb b/lib/liquid/block.rb
index 631bae6..5d9aab1 100644
--- a/lib/liquid/block.rb
+++ b/lib/liquid/block.rb
@@ -7,14 +7,14 @@ module Liquid
 
     def initialize(tag_name, markup, tokens)
       super
-      parse(tokens)
+      parse_body(tokens)
     end
 
     def blank?
       @blank || false
     end
 
-    def parse(tokens)
+    def parse_body(tokens)
       @blank = true
       @nodelist ||= []
       @nodelist.clear
diff --git a/lib/liquid/tags/raw.rb b/lib/liquid/tags/raw.rb
index 59e52c9..8caef54 100644
--- a/lib/liquid/tags/raw.rb
+++ b/lib/liquid/tags/raw.rb
@@ -2,7 +2,7 @@ module Liquid
   class Raw < Block
     FullTokenPossiblyInvalid = /\A(.*)#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/om
 
-    def parse(tokens)
+    def parse_body(tokens)
       @nodelist ||= []
       @nodelist.clear
       while token = tokens.shift