diff --git a/lib/liquid/block.rb b/lib/liquid/block.rb
index e6384c0d..03e741d3 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/document.rb b/lib/liquid/document.rb
index 241ea61e..5dd82e21 100644
--- a/lib/liquid/document.rb
+++ b/lib/liquid/document.rb
@@ -3,7 +3,7 @@ module Liquid
     # we don't need markup to open this block
     def initialize(tokens, options = {})
       @options = options
-      parse(tokens)
+      parse_body(tokens)
     end
 
     # There isn't a real delimiter
diff --git a/lib/liquid/tags/raw.rb b/lib/liquid/tags/raw.rb
index d28cd289..7b3ddb6e 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/o
 
-    def parse(tokens)
+    def parse_body(tokens)
       @nodelist ||= []
       @nodelist.clear
       while token = tokens.shift