diff --git a/lib/Twig/Node/Module.php b/lib/Twig/Node/Module.php
index 224410a2a..551458ab5 100644
--- a/lib/Twig/Node/Module.php
+++ b/lib/Twig/Node/Module.php
@@ -249,7 +249,7 @@ class Twig_Node_Module extends Twig_Node
                 ->addIndentation()->repr($name)->raw(" => array(\n")
                 ->indent()
                 ->write("'method' => ")->repr($node->getAttribute('method'))->raw(",\n")
-                ->write("'arguments' => array(\n")
+                ->write("'default_argument_values' => array(\n")
                 ->indent()
             ;
             foreach ($node->getNode('arguments') as $argument => $value) {
@@ -257,7 +257,7 @@ class Twig_Node_Module extends Twig_Node
             }
             $compiler
                 ->outdent()
-                ->write("),\n")
+                ->write(")\n")
                 ->outdent()
                 ->write("),\n")
             ;
diff --git a/lib/Twig/Template.php b/lib/Twig/Template.php
index a42fab283..a27b801cf 100644
--- a/lib/Twig/Template.php
+++ b/lib/Twig/Template.php
@@ -479,7 +479,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
 
         $i = 0;
         $args = array();
-        foreach ($template->macros[$macro]['arguments'] as $name => $value) {
+        foreach ($template->macros[$macro]['default_argument_values'] as $name => $value) {
             if (isset($namedNames[$name])) {
                 if ($i < $positionalCount) {
                     throw new Twig_Error_Runtime(sprintf('Argument "%s" is defined twice for macro "%s" defined in the template "%s".', $name, $macro, $template->getTemplateName()));
@@ -499,8 +499,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
         }
 
         if ($namedCount > 0) {
-            $parameters = array_keys(array_diff_key($namedNames, $template->macros[$macro]['arguments']));
-
+            $parameters = array_keys(array_diff_key($namedNames, $template->macros[$macro]['default_argument_values']));
             throw new Twig_Error_Runtime(sprintf('Unknown argument%s "%s" for macro "%s" defined in the template "%s".', count($parameters) > 1 ? 's' : '' , implode('", "', $parameters), $macro, $template->getTemplateName()));
         }