Avoid circular reference for Ruby 2.2.0

Ruby 2.2 now prints a warning when it detects an argument defaulting to a variable/method. Renaming things to avoid this warning.
Merge pull request #134 from pat/patch-1

Avoid circular reference for Ruby 2.2.0