diff --git a/CHANGELOG.md b/CHANGELOG.md
index 263b43a5..9b14d824 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ Version 0.9.4-dev
         Old: Unexpected token T_STATIC on line 1
         New: Syntax error, unexpected T_STATIC, expecting T_STRING or T_NS_SEPARATOR or '{'
 
+* `PHPParser_PrettyPrinter_Zend` was renamed to `PHPParser_PrettyPrinter_Default` as the default pretty printer only
+  very loosely applies the Zend Coding Standard. The class `PHPParser_PrettyPrinter_Zend` extends
+  `PHPParser_PrettyPrinter_Default` to maintain backwards compatibility.
+
 Version 0.9.3 (22.11.2012)
 --------------------------
 
diff --git a/doc/2_Usage_of_basic_components.markdown b/doc/2_Usage_of_basic_components.markdown
index f1f3d423..23f85d0e 100644
--- a/doc/2_Usage_of_basic_components.markdown
+++ b/doc/2_Usage_of_basic_components.markdown
@@ -121,15 +121,14 @@ Pretty printer
 
 The pretty printer component compiles the AST back to PHP code. As the parser does not retain formatting
 information the formatting is done using a specified scheme. Currently there is only one scheme available,
-namely `PHPParser_PrettyPrinter_Zend` (the name "Zend" might be misleading. It does not strictly adhere
-to the Zend Coding Standard.)
+namely `PHPParser_PrettyPrinter_Default`.
 
 ```php
 <?php
 $code = "<?php echo 'Hi ', hi\\getTarget();";
 
 $parser        = new PHPParser_Parser(new PHPParser_Lexer);
-$prettyPrinter = new PHPParser_PrettyPrinter_Zend;
+$prettyPrinter = new PHPParser_PrettyPrinter_Default;
 
 try {
     // parse
@@ -156,7 +155,7 @@ The above code will output:
     <?php echo 'Hallo ', hi\getTarget();
 
 As you can see the source code was first parsed using `PHPParser_Parser->parse`, then changed and then
-again converted to code using `PHPParser_PrettyPrinter_Zend->prettyPrint`.
+again converted to code using `PHPParser_PrettyPrinter_Default->prettyPrint`.
 
 The `prettyPrint` method pretty prints a statements array. It is also possible to pretty print only a
 single expression using `prettyPrintExpr`.
@@ -178,7 +177,7 @@ $code = "<?php // some code";
 
 $parser        = new PHPParser_Parser(new PHPParser_Lexer);
 $traverser     = new PHPParser_NodeTraverser;
-$prettyPrinter = new PHPParser_PrettyPrinter_Zend;
+$prettyPrinter = new PHPParser_PrettyPrinter_Default;
 
 // add your visitor
 $traverser->addVisitor(new MyNodeVisitor);
@@ -283,7 +282,7 @@ const OUT_DIR = '/some/other/path';
 // use the emulative lexer here, as we are running PHP 5.2 but want to parse PHP 5.3
 $parser        = new PHPParser_Parser(new PHPParser_Lexer_Emulative);
 $traverser     = new PHPParser_NodeTraverser;
-$prettyPrinter = new PHPParser_PrettyPrinter_Zend;
+$prettyPrinter = new PHPParser_PrettyPrinter_Default;
 
 $traverser->addVisitor(new PHPParser_NodeVisitor_NameResolver); // we will need resolved names
 $traverser->addVisitor(new NodeVisitor_NamespaceConverter);     // our own node visitor
diff --git a/lib/PHPParser/PrettyPrinter/Default.php b/lib/PHPParser/PrettyPrinter/Default.php
new file mode 100644
index 00000000..8cccf91a
--- /dev/null
+++ b/lib/PHPParser/PrettyPrinter/Default.php
@@ -0,0 +1,724 @@
+<?php
+
+class PHPParser_PrettyPrinter_Default extends PHPParser_PrettyPrinterAbstract
+{
+    // Special nodes
+
+    public function pParam(PHPParser_Node_Param $node) {
+        return ($node->type ? (is_string($node->type) ? $node->type : $this->p($node->type)) . ' ' : '')
+             . ($node->byRef ? '&' : '')
+             . '$' . $node->name
+             . ($node->default ? ' = ' . $this->p($node->default) : '');
+    }
+
+    public function pArg(PHPParser_Node_Arg $node) {
+        return ($node->byRef ? '&' : '') . $this->p($node->value);
+    }
+
+    public function pConst(PHPParser_Node_Const $node) {
+        return $node->name . ' = ' . $this->p($node->value);
+    }
+
+    // Names
+
+    public function pName(PHPParser_Node_Name $node) {
+        return implode('\\', $node->parts);
+    }
+
+    public function pName_FullyQualified(PHPParser_Node_Name_FullyQualified $node) {
+        return '\\' . implode('\\', $node->parts);
+    }
+
+    public function pName_Relative(PHPParser_Node_Name_Relative $node) {
+        return 'namespace\\' . implode('\\', $node->parts);
+    }
+
+    // Magic Constants
+
+    public function pScalar_ClassConst(PHPParser_Node_Scalar_ClassConst $node) {
+        return '__CLASS__';
+    }
+
+    public function pScalar_TraitConst(PHPParser_Node_Scalar_TraitConst $node) {
+        return '__TRAIT__';
+    }
+
+    public function pScalar_DirConst(PHPParser_Node_Scalar_DirConst $node) {
+        return '__DIR__';
+    }
+
+    public function pScalar_FileConst(PHPParser_Node_Scalar_FileConst $node) {
+        return '__FILE__';
+    }
+
+    public function pScalar_FuncConst(PHPParser_Node_Scalar_FuncConst $node) {
+        return '__FUNCTION__';
+    }
+
+    public function pScalar_LineConst(PHPParser_Node_Scalar_LineConst $node) {
+        return '__LINE__';
+    }
+
+    public function pScalar_MethodConst(PHPParser_Node_Scalar_MethodConst $node) {
+        return '__METHOD__';
+    }
+
+    public function pScalar_NSConst(PHPParser_Node_Scalar_NSConst $node) {
+        return '__NAMESPACE__';
+    }
+
+    // Scalars
+
+    public function pScalar_String(PHPParser_Node_Scalar_String $node) {
+        return '\'' . $this->pNoIndent(addcslashes($node->value, '\'\\')) . '\'';
+    }
+
+    public function pScalar_Encapsed(PHPParser_Node_Scalar_Encapsed $node) {
+        return '"' . $this->pEncapsList($node->parts, '"') . '"';
+    }
+
+    public function pScalar_LNumber(PHPParser_Node_Scalar_LNumber $node) {
+        return (string) $node->value;
+    }
+
+    public function pScalar_DNumber(PHPParser_Node_Scalar_DNumber $node) {
+        $stringValue = (string) $node->value;
+
+        // ensure that number is really printed as float
+        return ctype_digit($stringValue) ? $stringValue . '.0' : $stringValue;
+    }
+
+    // Assignments
+
+    public function pExpr_Assign(PHPParser_Node_Expr_Assign $node) {
+        return $this->pInfixOp('Expr_Assign', $node->var, ' = ', $node->expr);
+    }
+
+    public function pExpr_AssignRef(PHPParser_Node_Expr_AssignRef $node) {
+        return $this->pInfixOp('Expr_AssignRef', $node->var, ' =& ', $node->expr);
+    }
+
+    public function pExpr_AssignPlus(PHPParser_Node_Expr_AssignPlus $node) {
+        return $this->pInfixOp('Expr_AssignPlus', $node->var, ' += ', $node->expr);
+    }
+
+    public function pExpr_AssignMinus(PHPParser_Node_Expr_AssignMinus $node) {
+        return $this->pInfixOp('Expr_AssignMinus', $node->var, ' -= ', $node->expr);
+    }
+
+    public function pExpr_AssignMul(PHPParser_Node_Expr_AssignMul $node) {
+        return $this->pInfixOp('Expr_AssignMul', $node->var, ' *= ', $node->expr);
+    }
+
+    public function pExpr_AssignDiv(PHPParser_Node_Expr_AssignDiv $node) {
+        return $this->pInfixOp('Expr_AssignDiv', $node->var, ' /= ', $node->expr);
+    }
+
+    public function pExpr_AssignConcat(PHPParser_Node_Expr_AssignConcat $node) {
+        return $this->pInfixOp('Expr_AssignConcat', $node->var, ' .= ', $node->expr);
+    }
+
+    public function pExpr_AssignMod(PHPParser_Node_Expr_AssignMod $node) {
+        return $this->pInfixOp('Expr_AssignMod', $node->var, ' %= ', $node->expr);
+    }
+
+    public function pExpr_AssignBitwiseAnd(PHPParser_Node_Expr_AssignBitwiseAnd $node) {
+        return $this->pInfixOp('Expr_AssignBitwiseAnd', $node->var, ' &= ', $node->expr);
+    }
+
+    public function pExpr_AssignBitwiseOr(PHPParser_Node_Expr_AssignBitwiseOr $node) {
+        return $this->pInfixOp('Expr_AssignBitwiseOr', $node->var, ' |= ', $node->expr);
+    }
+
+    public function pExpr_AssignBitwiseXor(PHPParser_Node_Expr_AssignBitwiseXor $node) {
+        return $this->pInfixOp('Expr_AssignBitwiseXor', $node->var, ' ^= ', $node->expr);
+    }
+
+    public function pExpr_AssignShiftLeft(PHPParser_Node_Expr_AssignShiftLeft $node) {
+        return $this->pInfixOp('Expr_AssignShiftLeft', $node->var, ' <<= ', $node->expr);
+    }
+
+    public function pExpr_AssignShiftRight(PHPParser_Node_Expr_AssignShiftRight $node) {
+        return $this->pInfixOp('Expr_AssignShiftRight', $node->var, ' >>= ', $node->expr);
+    }
+
+    // Binary expressions
+
+    public function pExpr_Plus(PHPParser_Node_Expr_Plus $node) {
+        return $this->pInfixOp('Expr_Plus', $node->left, ' + ', $node->right);
+    }
+
+    public function pExpr_Minus(PHPParser_Node_Expr_Minus $node) {
+        return $this->pInfixOp('Expr_Minus', $node->left, ' - ', $node->right);
+    }
+
+    public function pExpr_Mul(PHPParser_Node_Expr_Mul $node) {
+        return $this->pInfixOp('Expr_Mul', $node->left, ' * ', $node->right);
+    }
+
+    public function pExpr_Div(PHPParser_Node_Expr_Div $node) {
+        return $this->pInfixOp('Expr_Div', $node->left, ' / ', $node->right);
+    }
+
+    public function pExpr_Concat(PHPParser_Node_Expr_Concat $node) {
+        return $this->pInfixOp('Expr_Concat', $node->left, ' . ', $node->right);
+    }
+
+    public function pExpr_Mod(PHPParser_Node_Expr_Mod $node) {
+        return $this->pInfixOp('Expr_Mod', $node->left, ' % ', $node->right);
+    }
+
+    public function pExpr_BooleanAnd(PHPParser_Node_Expr_BooleanAnd $node) {
+        return $this->pInfixOp('Expr_BooleanAnd', $node->left, ' && ', $node->right);
+    }
+
+    public function pExpr_BooleanOr(PHPParser_Node_Expr_BooleanOr $node) {
+        return $this->pInfixOp('Expr_BooleanOr', $node->left, ' || ', $node->right);
+    }
+
+    public function pExpr_BitwiseAnd(PHPParser_Node_Expr_BitwiseAnd $node) {
+        return $this->pInfixOp('Expr_BitwiseAnd', $node->left, ' & ', $node->right);
+    }
+
+    public function pExpr_BitwiseOr(PHPParser_Node_Expr_BitwiseOr $node) {
+        return $this->pInfixOp('Expr_BitwiseOr', $node->left, ' | ', $node->right);
+    }
+
+    public function pExpr_BitwiseXor(PHPParser_Node_Expr_BitwiseXor $node) {
+        return $this->pInfixOp('Expr_BitwiseXor', $node->left, ' ^ ', $node->right);
+    }
+
+    public function pExpr_ShiftLeft(PHPParser_Node_Expr_ShiftLeft $node) {
+        return $this->pInfixOp('Expr_ShiftLeft', $node->left, ' << ', $node->right);
+    }
+
+    public function pExpr_ShiftRight(PHPParser_Node_Expr_ShiftRight $node) {
+        return $this->pInfixOp('Expr_ShiftRight', $node->left, ' >> ', $node->right);
+    }
+
+    public function pExpr_LogicalAnd(PHPParser_Node_Expr_LogicalAnd $node) {
+        return $this->pInfixOp('Expr_LogicalAnd', $node->left, ' and ', $node->right);
+    }
+
+    public function pExpr_LogicalOr(PHPParser_Node_Expr_LogicalOr $node) {
+        return $this->pInfixOp('Expr_LogicalOr', $node->left, ' or ', $node->right);
+    }
+
+    public function pExpr_LogicalXor(PHPParser_Node_Expr_LogicalXor $node) {
+        return $this->pInfixOp('Expr_LogicalXor', $node->left, ' xor ', $node->right);
+    }
+
+    public function pExpr_Equal(PHPParser_Node_Expr_Equal $node) {
+        return $this->pInfixOp('Expr_Equal', $node->left, ' == ', $node->right);
+    }
+
+    public function pExpr_NotEqual(PHPParser_Node_Expr_NotEqual $node) {
+        return $this->pInfixOp('Expr_NotEqual', $node->left, ' != ', $node->right);
+    }
+
+    public function pExpr_Identical(PHPParser_Node_Expr_Identical $node) {
+        return $this->pInfixOp('Expr_Identical', $node->left, ' === ', $node->right);
+    }
+
+    public function pExpr_NotIdentical(PHPParser_Node_Expr_NotIdentical $node) {
+        return $this->pInfixOp('Expr_NotIdentical', $node->left, ' !== ', $node->right);
+    }
+
+    public function pExpr_Greater(PHPParser_Node_Expr_Greater $node) {
+        return $this->pInfixOp('Expr_Greater', $node->left, ' > ', $node->right);
+    }
+
+    public function pExpr_GreaterOrEqual(PHPParser_Node_Expr_GreaterOrEqual $node) {
+        return $this->pInfixOp('Expr_GreaterOrEqual', $node->left, ' >= ', $node->right);
+    }
+
+    public function pExpr_Smaller(PHPParser_Node_Expr_Smaller $node) {
+        return $this->pInfixOp('Expr_Smaller', $node->left, ' < ', $node->right);
+    }
+
+    public function pExpr_SmallerOrEqual(PHPParser_Node_Expr_SmallerOrEqual $node) {
+        return $this->pInfixOp('Expr_SmallerOrEqual', $node->left, ' <= ', $node->right);
+    }
+
+    public function pExpr_Instanceof(PHPParser_Node_Expr_Instanceof $node) {
+        return $this->pInfixOp('Expr_Instanceof', $node->expr, ' instanceof ', $node->class);
+    }
+
+    // Unary expressions
+
+    public function pExpr_BooleanNot(PHPParser_Node_Expr_BooleanNot $node) {
+        return $this->pPrefixOp('Expr_BooleanNot', '!', $node->expr);
+    }
+
+    public function pExpr_BitwiseNot(PHPParser_Node_Expr_BitwiseNot $node) {
+        return $this->pPrefixOp('Expr_BitwiseNot', '~', $node->expr);
+    }
+
+    public function pExpr_UnaryMinus(PHPParser_Node_Expr_UnaryMinus $node) {
+        return $this->pPrefixOp('Expr_UnaryMinus', '-', $node->expr);
+    }
+
+    public function pExpr_UnaryPlus(PHPParser_Node_Expr_UnaryPlus $node) {
+        return $this->pPrefixOp('Expr_UnaryPlus', '+', $node->expr);
+    }
+
+    public function pExpr_PreInc(PHPParser_Node_Expr_PreInc $node) {
+        return $this->pPrefixOp('Expr_PreInc', '++', $node->var);
+    }
+
+    public function pExpr_PreDec(PHPParser_Node_Expr_PreDec $node) {
+        return $this->pPrefixOp('Expr_PreDec', '--', $node->var);
+    }
+
+    public function pExpr_PostInc(PHPParser_Node_Expr_PostInc $node) {
+        return $this->pPostfixOp('Expr_PostInc', $node->var, '++');
+    }
+
+    public function pExpr_PostDec(PHPParser_Node_Expr_PostDec $node) {
+        return $this->pPostfixOp('Expr_PostDec', $node->var, '--');
+    }
+
+    public function pExpr_ErrorSuppress(PHPParser_Node_Expr_ErrorSuppress $node) {
+        return $this->pPrefixOp('Expr_ErrorSuppress', '@', $node->expr);
+    }
+
+    // Casts
+
+    public function pExpr_Cast_Int(PHPParser_Node_Expr_Cast_Int $node) {
+        return $this->pPrefixOp('Expr_Cast_Int', '(int) ', $node->expr);
+    }
+
+    public function pExpr_Cast_Double(PHPParser_Node_Expr_Cast_Double $node) {
+        return $this->pPrefixOp('Expr_Cast_Double', '(double) ', $node->expr);
+    }
+
+    public function pExpr_Cast_String(PHPParser_Node_Expr_Cast_String $node) {
+        return $this->pPrefixOp('Expr_Cast_String', '(string) ', $node->expr);
+    }
+
+    public function pExpr_Cast_Array(PHPParser_Node_Expr_Cast_Array $node) {
+        return $this->pPrefixOp('Expr_Cast_Array', '(array) ', $node->expr);
+    }
+
+    public function pExpr_Cast_Object(PHPParser_Node_Expr_Cast_Object $node) {
+        return $this->pPrefixOp('Expr_Cast_Object', '(object) ', $node->expr);
+    }
+
+    public function pExpr_Cast_Bool(PHPParser_Node_Expr_Cast_Bool $node) {
+        return $this->pPrefixOp('Expr_Cast_Bool', '(bool) ', $node->expr);
+    }
+
+    public function pExpr_Cast_Unset(PHPParser_Node_Expr_Cast_Unset $node) {
+        return $this->pPrefixOp('Expr_Cast_Unset', '(unset) ', $node->expr);
+    }
+
+    // Function calls and similar constructs
+
+    public function pExpr_FuncCall(PHPParser_Node_Expr_FuncCall $node) {
+        return $this->p($node->name) . '(' . $this->pCommaSeparated($node->args) . ')';
+    }
+
+    public function pExpr_MethodCall(PHPParser_Node_Expr_MethodCall $node) {
+        return $this->pVarOrNewExpr($node->var) . '->' . $this->pObjectProperty($node->name)
+             . '(' . $this->pCommaSeparated($node->args) . ')';
+    }
+
+    public function pExpr_StaticCall(PHPParser_Node_Expr_StaticCall $node) {
+        return $this->p($node->class) . '::'
+             . ($node->name instanceof PHPParser_Node_Expr
+                ? ($node->name instanceof PHPParser_Node_Expr_Variable
+                   || $node->name instanceof PHPParser_Node_Expr_ArrayDimFetch
+                   ? $this->p($node->name)
+                   : '{' . $this->p($node->name) . '}')
+                : $node->name)
+             . '(' . $this->pCommaSeparated($node->args) . ')';
+    }
+
+    public function pExpr_Empty(PHPParser_Node_Expr_Empty $node) {
+        return 'empty(' . $this->p($node->expr) . ')';
+    }
+
+    public function pExpr_Isset(PHPParser_Node_Expr_Isset $node) {
+        return 'isset(' . $this->pCommaSeparated($node->vars) . ')';
+    }
+
+    public function pExpr_Print(PHPParser_Node_Expr_Print $node) {
+        return 'print ' . $this->p($node->expr);
+    }
+
+    public function pExpr_Eval(PHPParser_Node_Expr_Eval $node) {
+        return 'eval(' . $this->p($node->expr) . ')';
+    }
+
+    public function pExpr_Include(PHPParser_Node_Expr_Include $node) {
+        static $map = array(
+            PHPParser_Node_Expr_Include::TYPE_INCLUDE      => 'include',
+            PHPParser_Node_Expr_Include::TYPE_INCLUDE_ONCE => 'include_once',
+            PHPParser_Node_Expr_Include::TYPE_REQUIRE      => 'require',
+            PHPParser_Node_Expr_Include::TYPE_REQUIRE_ONCE => 'require_once',
+        );
+
+        return $map[$node->type] . ' ' . $this->p($node->expr);
+    }
+
+    public function pExpr_List(PHPParser_Node_Expr_List $node) {
+        $pList = array();
+        foreach ($node->vars as $var) {
+            if (null === $var) {
+                $pList[] = '';
+            } else {
+                $pList[] = $this->p($var);
+            }
+        }
+
+        return 'list(' . implode(', ', $pList) . ')';
+    }
+
+    // Other
+
+    public function pExpr_Variable(PHPParser_Node_Expr_Variable $node) {
+        if ($node->name instanceof PHPParser_Node_Expr) {
+            return '${' . $this->p($node->name) . '}';
+        } else {
+            return '$' . $node->name;
+        }
+    }
+
+    public function pExpr_Array(PHPParser_Node_Expr_Array $node) {
+        return 'array(' . $this->pCommaSeparated($node->items) . ')';
+    }
+
+    public function pExpr_ArrayItem(PHPParser_Node_Expr_ArrayItem $node) {
+        return (null !== $node->key ? $this->p($node->key) . ' => ' : '')
+             . ($node->byRef ? '&' : '') . $this->p($node->value);
+    }
+
+    public function pExpr_ArrayDimFetch(PHPParser_Node_Expr_ArrayDimFetch $node) {
+        return $this->pVarOrNewExpr($node->var)
+             . '[' . (null !== $node->dim ? $this->p($node->dim) : '') . ']';
+    }
+
+    public function pExpr_ConstFetch(PHPParser_Node_Expr_ConstFetch $node) {
+        return $this->p($node->name);
+    }
+
+    public function pExpr_ClassConstFetch(PHPParser_Node_Expr_ClassConstFetch $node) {
+        return $this->p($node->class) . '::' . $node->name;
+    }
+
+    public function pExpr_PropertyFetch(PHPParser_Node_Expr_PropertyFetch $node) {
+        return $this->pVarOrNewExpr($node->var) . '->' . $this->pObjectProperty($node->name);
+    }
+
+    public function pExpr_StaticPropertyFetch(PHPParser_Node_Expr_StaticPropertyFetch $node) {
+        return $this->p($node->class) . '::$' . $this->pObjectProperty($node->name);
+    }
+
+    public function pExpr_ShellExec(PHPParser_Node_Expr_ShellExec $node) {
+        return '`' . $this->pEncapsList($node->parts, '`') . '`';
+    }
+
+    public function pExpr_Closure(PHPParser_Node_Expr_Closure $node) {
+        return ($node->static ? 'static ' : '')
+             . 'function ' . ($node->byRef ? '&' : '')
+             . '(' . $this->pCommaSeparated($node->params) . ')'
+             . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')': '')
+             . ' {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pExpr_ClosureUse(PHPParser_Node_Expr_ClosureUse $node) {
+        return ($node->byRef ? '&' : '') . '$' . $node->var;
+    }
+
+    public function pExpr_New(PHPParser_Node_Expr_New $node) {
+        return 'new ' . $this->p($node->class) . '(' . $this->pCommaSeparated($node->args) . ')';
+    }
+
+    public function pExpr_Clone(PHPParser_Node_Expr_Clone $node) {
+        return 'clone ' . $this->p($node->expr);
+    }
+
+    public function pExpr_Ternary(PHPParser_Node_Expr_Ternary $node) {
+        // a bit of cheating: we treat the ternary as a binary op where the ?...: part is the operator.
+        // this is okay because the part between ? and : never needs parentheses.
+        return $this->pInfixOp('Expr_Ternary',
+            $node->cond, ' ?' . (null !== $node->if ? ' ' . $this->p($node->if) . ' ' : '') . ': ', $node->else
+        );
+    }
+
+    public function pExpr_Exit(PHPParser_Node_Expr_Exit $node) {
+        return 'die' . (null !== $node->expr ? '(' . $this->p($node->expr) . ')' : '');
+    }
+
+    public function pExpr_Yield(PHPParser_Node_Expr_Yield $node) {
+        if ($node->value === null) {
+            return 'yield';
+        } else {
+            // this is a bit ugly, but currently there is no way to detect whether the parentheses are necessary
+            return '(yield '
+                 . ($node->key !== null ? $this->p($node->key) . ' => ' : '')
+                 . $this->p($node->value)
+                 . ')';
+        }
+    }
+
+    // Declarations
+
+    public function pStmt_Namespace(PHPParser_Node_Stmt_Namespace $node) {
+        return 'namespace' . (null !== $node->name ? ' ' . $this->p($node->name) : '')
+             . ' {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_Use(PHPParser_Node_Stmt_Use $node) {
+        return 'use ' . $this->pCommaSeparated($node->uses) . ';';
+    }
+
+    public function pStmt_UseUse(PHPParser_Node_Stmt_UseUse $node) {
+        return $this->p($node->name)
+             . ($node->name->getLast() !== $node->alias ? ' as ' . $node->alias : '');
+    }
+
+    public function pStmt_Interface(PHPParser_Node_Stmt_Interface $node) {
+        return 'interface ' . $node->name
+             . (!empty($node->extends) ? ' extends ' . $this->pCommaSeparated($node->extends) : '')
+             . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_Class(PHPParser_Node_Stmt_Class $node) {
+        return $this->pModifiers($node->type)
+             . 'class ' . $node->name
+             . (null !== $node->extends ? ' extends ' . $this->p($node->extends) : '')
+             . (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '')
+             . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_Trait(PHPParser_Node_Stmt_Trait $node) {
+        return 'trait ' . $node->name
+             . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_TraitUse(PHPParser_Node_Stmt_TraitUse $node) {
+        return 'use ' . $this->pCommaSeparated($node->traits)
+             . (empty($node->adaptations)
+                ? ';'
+                : ' {' . "\n" . $this->pStmts($node->adaptations) . "\n" . '}');
+    }
+
+    public function pStmt_TraitUseAdaptation_Precedence(PHPParser_Node_Stmt_TraitUseAdaptation_Precedence $node) {
+        return $this->p($node->trait) . '::' . $node->method
+             . ' insteadof ' . $this->pCommaSeparated($node->insteadof) . ';';
+    }
+
+    public function pStmt_TraitUseAdaptation_Alias(PHPParser_Node_Stmt_TraitUseAdaptation_Alias $node) {
+        return (null !== $node->trait ? $this->p($node->trait) . '::' : '')
+             . $node->method . ' as'
+             . (null !== $node->newModifier ? ' ' . $this->pModifiers($node->newModifier) : '')
+             . (null !== $node->newName     ? ' ' . $node->newName                        : '')
+             . ';';
+    }
+
+    public function pStmt_Property(PHPParser_Node_Stmt_Property $node) {
+        return $this->pModifiers($node->type) . $this->pCommaSeparated($node->props) . ';';
+    }
+
+    public function pStmt_PropertyProperty(PHPParser_Node_Stmt_PropertyProperty $node) {
+        return '$' . $node->name
+             . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
+    }
+
+    public function pStmt_ClassMethod(PHPParser_Node_Stmt_ClassMethod $node) {
+        return $this->pModifiers($node->type)
+             . 'function ' . ($node->byRef ? '&' : '') . $node->name
+             . '(' . $this->pCommaSeparated($node->params) . ')'
+             . (null !== $node->stmts
+                ? "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}'
+                : ';');
+    }
+
+    public function pStmt_ClassConst(PHPParser_Node_Stmt_ClassConst $node) {
+        return 'const ' . $this->pCommaSeparated($node->consts) . ';';
+    }
+
+    public function pStmt_Function(PHPParser_Node_Stmt_Function $node) {
+        return 'function ' . ($node->byRef ? '&' : '') . $node->name
+             . '(' . $this->pCommaSeparated($node->params) . ')'
+             . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_Const(PHPParser_Node_Stmt_Const $node) {
+        return 'const ' . $this->pCommaSeparated($node->consts) . ';';
+    }
+
+    public function pStmt_Declare(PHPParser_Node_Stmt_Declare $node) {
+        return 'declare (' . $this->pCommaSeparated($node->declares) . ') {'
+             . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_DeclareDeclare(PHPParser_Node_Stmt_DeclareDeclare $node) {
+        return $node->key . ' = ' . $this->p($node->value);
+    }
+
+    // Control flow
+
+    public function pStmt_If(PHPParser_Node_Stmt_If $node) {
+        return 'if (' . $this->p($node->cond) . ') {'
+             . "\n" . $this->pStmts($node->stmts) . "\n" . '}'
+             . $this->pImplode($node->elseifs)
+             . (null !== $node->else ? $this->p($node->else) : '');
+    }
+
+    public function pStmt_Elseif(PHPParser_Node_Stmt_Elseif $node) {
+        return ' elseif (' . $this->p($node->cond) . ') {'
+             . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_Else(PHPParser_Node_Stmt_Else $node) {
+        return ' else {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_For(PHPParser_Node_Stmt_For $node) {
+        return 'for ('
+             . $this->pCommaSeparated($node->init) . ';' . (!empty($node->cond) ? ' ' : '')
+             . $this->pCommaSeparated($node->cond) . ';' . (!empty($node->loop) ? ' ' : '')
+             . $this->pCommaSeparated($node->loop)
+             . ') {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_Foreach(PHPParser_Node_Stmt_Foreach $node) {
+        return 'foreach (' . $this->p($node->expr) . ' as '
+             . (null !== $node->keyVar ? $this->p($node->keyVar) . ' => ' : '')
+             . ($node->byRef ? '&' : '') . $this->p($node->valueVar) . ') {'
+             . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_While(PHPParser_Node_Stmt_While $node) {
+        return 'while (' . $this->p($node->cond) . ') {'
+             . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_Do(PHPParser_Node_Stmt_Do $node) {
+        return 'do {' . "\n" . $this->pStmts($node->stmts) . "\n"
+             . '} while (' . $this->p($node->cond) . ');';
+    }
+
+    public function pStmt_Switch(PHPParser_Node_Stmt_Switch $node) {
+        return 'switch (' . $this->p($node->cond) . ') {'
+             . "\n" . $this->pStmts($node->cases) . "\n" . '}';
+    }
+
+    public function pStmt_Case(PHPParser_Node_Stmt_Case $node) {
+        return (null !== $node->cond ? 'case ' . $this->p($node->cond) : 'default') . ':'
+             . ($node->stmts ? "\n" . $this->pStmts($node->stmts) : '');
+    }
+
+    public function pStmt_TryCatch(PHPParser_Node_Stmt_TryCatch $node) {
+        return 'try {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}'
+             . $this->pImplode($node->catches)
+             . ($node->finallyStmts !== null
+                ? ' finally {' . "\n" . $this->pStmts($node->finallyStmts) . "\n" . '}'
+                : '');
+    }
+
+    public function pStmt_Catch(PHPParser_Node_Stmt_Catch $node) {
+        return ' catch (' . $this->p($node->type) . ' $' . $node->var . ') {'
+             . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
+    }
+
+    public function pStmt_Break(PHPParser_Node_Stmt_Break $node) {
+        return 'break' . ($node->num !== null ? ' ' . $this->p($node->num) : '') . ';';
+    }
+
+    public function pStmt_Continue(PHPParser_Node_Stmt_Continue $node) {
+        return 'continue' . ($node->num !== null ? ' ' . $this->p($node->num) : '') . ';';
+    }
+
+    public function pStmt_Return(PHPParser_Node_Stmt_Return $node) {
+        return 'return' . (null !== $node->expr ? ' ' . $this->p($node->expr) : '') . ';';
+    }
+
+    public function pStmt_Throw(PHPParser_Node_Stmt_Throw $node) {
+        return 'throw ' . $this->p($node->expr) . ';';
+    }
+
+    public function pStmt_Label(PHPParser_Node_Stmt_Label $node) {
+        return $node->name . ':';
+    }
+
+    public function pStmt_Goto(PHPParser_Node_Stmt_Goto $node) {
+        return 'goto ' . $node->name . ';';
+    }
+
+    // Other
+
+    public function pStmt_Echo(PHPParser_Node_Stmt_Echo $node) {
+        return 'echo ' . $this->pCommaSeparated($node->exprs) . ';';
+    }
+
+    public function pStmt_Static(PHPParser_Node_Stmt_Static $node) {
+        return 'static ' . $this->pCommaSeparated($node->vars) . ';';
+    }
+
+    public function pStmt_Global(PHPParser_Node_Stmt_Global $node) {
+        return 'global ' . $this->pCommaSeparated($node->vars) . ';';
+    }
+
+    public function pStmt_StaticVar(PHPParser_Node_Stmt_StaticVar $node) {
+        return '$' . $node->name
+             . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
+    }
+
+    public function pStmt_Unset(PHPParser_Node_Stmt_Unset $node) {
+        return 'unset(' . $this->pCommaSeparated($node->vars) . ');';
+    }
+
+    public function pStmt_InlineHTML(PHPParser_Node_Stmt_InlineHTML $node) {
+        return '?>' . $this->pNoIndent(
+            ("\n" === $node->value[0] || "\r" === $node->value[0] ? "\n" : '')
+            . $node->value
+        ) . '<?php ';
+    }
+
+    public function pStmt_HaltCompiler(PHPParser_Node_Stmt_HaltCompiler $node) {
+        return '__halt_compiler();' . $node->remaining;
+    }
+
+    // Helpers
+
+    public function pObjectProperty($node) {
+        if ($node instanceof PHPParser_Node_Expr) {
+            return '{' . $this->p($node) . '}';
+        } else {
+            return $node;
+        }
+    }
+
+    public function pModifiers($modifiers) {
+        return ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC    ? 'public '    : '')
+             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_PROTECTED ? 'protected ' : '')
+             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_PRIVATE   ? 'private '   : '')
+             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_STATIC    ? 'static '    : '')
+             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_ABSTRACT  ? 'abstract '  : '')
+             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_FINAL     ? 'final '     : '');
+    }
+
+    public function pEncapsList(array $encapsList, $quote) {
+        $return = '';
+        foreach ($encapsList as $element) {
+            if (is_string($element)) {
+                $return .= addcslashes($element, "\n\r\t\f\v$" . $quote . "\\");
+            } else {
+                $return .= '{' . $this->p($element) . '}';
+            }
+        }
+
+        return $return;
+    }
+
+    public function pVarOrNewExpr(PHPParser_Node $node) {
+        if ($node instanceof PHPParser_Node_Expr_New) {
+            return '(' . $this->p($node) . ')';
+        } else {
+            return $this->p($node);
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/PHPParser/PrettyPrinter/Zend.php b/lib/PHPParser/PrettyPrinter/Zend.php
index a4fc09d2..f9fd0c4c 100644
--- a/lib/PHPParser/PrettyPrinter/Zend.php
+++ b/lib/PHPParser/PrettyPrinter/Zend.php
@@ -1,724 +1,10 @@
 <?php
 
-class PHPParser_PrettyPrinter_Zend extends PHPParser_PrettyPrinterAbstract
+/**
+ * This class is only retained for backwards compatibility. Use PHPParser_PrettyPrinter_Default instead.
+ *
+ * @deprecated
+ */
+class PHPParser_PrettyPrinter_Zend extends PHPParser_PrettyPrinter_Default
 {
-    // Special nodes
-
-    public function pParam(PHPParser_Node_Param $node) {
-        return ($node->type ? (is_string($node->type) ? $node->type : $this->p($node->type)) . ' ' : '')
-             . ($node->byRef ? '&' : '')
-             . '$' . $node->name
-             . ($node->default ? ' = ' . $this->p($node->default) : '');
-    }
-
-    public function pArg(PHPParser_Node_Arg $node) {
-        return ($node->byRef ? '&' : '') . $this->p($node->value);
-    }
-
-    public function pConst(PHPParser_Node_Const $node) {
-        return $node->name . ' = ' . $this->p($node->value);
-    }
-
-    // Names
-
-    public function pName(PHPParser_Node_Name $node) {
-        return implode('\\', $node->parts);
-    }
-
-    public function pName_FullyQualified(PHPParser_Node_Name_FullyQualified $node) {
-        return '\\' . implode('\\', $node->parts);
-    }
-
-    public function pName_Relative(PHPParser_Node_Name_Relative $node) {
-        return 'namespace\\' . implode('\\', $node->parts);
-    }
-
-    // Magic Constants
-
-    public function pScalar_ClassConst(PHPParser_Node_Scalar_ClassConst $node) {
-        return '__CLASS__';
-    }
-
-    public function pScalar_TraitConst(PHPParser_Node_Scalar_TraitConst $node) {
-        return '__TRAIT__';
-    }
-
-    public function pScalar_DirConst(PHPParser_Node_Scalar_DirConst $node) {
-        return '__DIR__';
-    }
-
-    public function pScalar_FileConst(PHPParser_Node_Scalar_FileConst $node) {
-        return '__FILE__';
-    }
-
-    public function pScalar_FuncConst(PHPParser_Node_Scalar_FuncConst $node) {
-        return '__FUNCTION__';
-    }
-
-    public function pScalar_LineConst(PHPParser_Node_Scalar_LineConst $node) {
-        return '__LINE__';
-    }
-
-    public function pScalar_MethodConst(PHPParser_Node_Scalar_MethodConst $node) {
-        return '__METHOD__';
-    }
-
-    public function pScalar_NSConst(PHPParser_Node_Scalar_NSConst $node) {
-        return '__NAMESPACE__';
-    }
-
-    // Scalars
-
-    public function pScalar_String(PHPParser_Node_Scalar_String $node) {
-        return '\'' . $this->pNoIndent(addcslashes($node->value, '\'\\')) . '\'';
-    }
-
-    public function pScalar_Encapsed(PHPParser_Node_Scalar_Encapsed $node) {
-        return '"' . $this->pEncapsList($node->parts, '"') . '"';
-    }
-
-    public function pScalar_LNumber(PHPParser_Node_Scalar_LNumber $node) {
-        return (string) $node->value;
-    }
-
-    public function pScalar_DNumber(PHPParser_Node_Scalar_DNumber $node) {
-        $stringValue = (string) $node->value;
-
-        // ensure that number is really printed as float
-        return ctype_digit($stringValue) ? $stringValue . '.0' : $stringValue;
-    }
-
-    // Assignments
-
-    public function pExpr_Assign(PHPParser_Node_Expr_Assign $node) {
-        return $this->pInfixOp('Expr_Assign', $node->var, ' = ', $node->expr);
-    }
-
-    public function pExpr_AssignRef(PHPParser_Node_Expr_AssignRef $node) {
-        return $this->pInfixOp('Expr_AssignRef', $node->var, ' =& ', $node->expr);
-    }
-
-    public function pExpr_AssignPlus(PHPParser_Node_Expr_AssignPlus $node) {
-        return $this->pInfixOp('Expr_AssignPlus', $node->var, ' += ', $node->expr);
-    }
-
-    public function pExpr_AssignMinus(PHPParser_Node_Expr_AssignMinus $node) {
-        return $this->pInfixOp('Expr_AssignMinus', $node->var, ' -= ', $node->expr);
-    }
-
-    public function pExpr_AssignMul(PHPParser_Node_Expr_AssignMul $node) {
-        return $this->pInfixOp('Expr_AssignMul', $node->var, ' *= ', $node->expr);
-    }
-
-    public function pExpr_AssignDiv(PHPParser_Node_Expr_AssignDiv $node) {
-        return $this->pInfixOp('Expr_AssignDiv', $node->var, ' /= ', $node->expr);
-    }
-
-    public function pExpr_AssignConcat(PHPParser_Node_Expr_AssignConcat $node) {
-        return $this->pInfixOp('Expr_AssignConcat', $node->var, ' .= ', $node->expr);
-    }
-
-    public function pExpr_AssignMod(PHPParser_Node_Expr_AssignMod $node) {
-        return $this->pInfixOp('Expr_AssignMod', $node->var, ' %= ', $node->expr);
-    }
-
-    public function pExpr_AssignBitwiseAnd(PHPParser_Node_Expr_AssignBitwiseAnd $node) {
-        return $this->pInfixOp('Expr_AssignBitwiseAnd', $node->var, ' &= ', $node->expr);
-    }
-
-    public function pExpr_AssignBitwiseOr(PHPParser_Node_Expr_AssignBitwiseOr $node) {
-        return $this->pInfixOp('Expr_AssignBitwiseOr', $node->var, ' |= ', $node->expr);
-    }
-
-    public function pExpr_AssignBitwiseXor(PHPParser_Node_Expr_AssignBitwiseXor $node) {
-        return $this->pInfixOp('Expr_AssignBitwiseXor', $node->var, ' ^= ', $node->expr);
-    }
-
-    public function pExpr_AssignShiftLeft(PHPParser_Node_Expr_AssignShiftLeft $node) {
-        return $this->pInfixOp('Expr_AssignShiftLeft', $node->var, ' <<= ', $node->expr);
-    }
-
-    public function pExpr_AssignShiftRight(PHPParser_Node_Expr_AssignShiftRight $node) {
-        return $this->pInfixOp('Expr_AssignShiftRight', $node->var, ' >>= ', $node->expr);
-    }
-
-    // Binary expressions
-
-    public function pExpr_Plus(PHPParser_Node_Expr_Plus $node) {
-        return $this->pInfixOp('Expr_Plus', $node->left, ' + ', $node->right);
-    }
-
-    public function pExpr_Minus(PHPParser_Node_Expr_Minus $node) {
-        return $this->pInfixOp('Expr_Minus', $node->left, ' - ', $node->right);
-    }
-
-    public function pExpr_Mul(PHPParser_Node_Expr_Mul $node) {
-        return $this->pInfixOp('Expr_Mul', $node->left, ' * ', $node->right);
-    }
-
-    public function pExpr_Div(PHPParser_Node_Expr_Div $node) {
-        return $this->pInfixOp('Expr_Div', $node->left, ' / ', $node->right);
-    }
-
-    public function pExpr_Concat(PHPParser_Node_Expr_Concat $node) {
-        return $this->pInfixOp('Expr_Concat', $node->left, ' . ', $node->right);
-    }
-
-    public function pExpr_Mod(PHPParser_Node_Expr_Mod $node) {
-        return $this->pInfixOp('Expr_Mod', $node->left, ' % ', $node->right);
-    }
-
-    public function pExpr_BooleanAnd(PHPParser_Node_Expr_BooleanAnd $node) {
-        return $this->pInfixOp('Expr_BooleanAnd', $node->left, ' && ', $node->right);
-    }
-
-    public function pExpr_BooleanOr(PHPParser_Node_Expr_BooleanOr $node) {
-        return $this->pInfixOp('Expr_BooleanOr', $node->left, ' || ', $node->right);
-    }
-
-    public function pExpr_BitwiseAnd(PHPParser_Node_Expr_BitwiseAnd $node) {
-        return $this->pInfixOp('Expr_BitwiseAnd', $node->left, ' & ', $node->right);
-    }
-
-    public function pExpr_BitwiseOr(PHPParser_Node_Expr_BitwiseOr $node) {
-        return $this->pInfixOp('Expr_BitwiseOr', $node->left, ' | ', $node->right);
-    }
-
-    public function pExpr_BitwiseXor(PHPParser_Node_Expr_BitwiseXor $node) {
-        return $this->pInfixOp('Expr_BitwiseXor', $node->left, ' ^ ', $node->right);
-    }
-
-    public function pExpr_ShiftLeft(PHPParser_Node_Expr_ShiftLeft $node) {
-        return $this->pInfixOp('Expr_ShiftLeft', $node->left, ' << ', $node->right);
-    }
-
-    public function pExpr_ShiftRight(PHPParser_Node_Expr_ShiftRight $node) {
-        return $this->pInfixOp('Expr_ShiftRight', $node->left, ' >> ', $node->right);
-    }
-
-    public function pExpr_LogicalAnd(PHPParser_Node_Expr_LogicalAnd $node) {
-        return $this->pInfixOp('Expr_LogicalAnd', $node->left, ' and ', $node->right);
-    }
-
-    public function pExpr_LogicalOr(PHPParser_Node_Expr_LogicalOr $node) {
-        return $this->pInfixOp('Expr_LogicalOr', $node->left, ' or ', $node->right);
-    }
-
-    public function pExpr_LogicalXor(PHPParser_Node_Expr_LogicalXor $node) {
-        return $this->pInfixOp('Expr_LogicalXor', $node->left, ' xor ', $node->right);
-    }
-
-    public function pExpr_Equal(PHPParser_Node_Expr_Equal $node) {
-        return $this->pInfixOp('Expr_Equal', $node->left, ' == ', $node->right);
-    }
-
-    public function pExpr_NotEqual(PHPParser_Node_Expr_NotEqual $node) {
-        return $this->pInfixOp('Expr_NotEqual', $node->left, ' != ', $node->right);
-    }
-
-    public function pExpr_Identical(PHPParser_Node_Expr_Identical $node) {
-        return $this->pInfixOp('Expr_Identical', $node->left, ' === ', $node->right);
-    }
-
-    public function pExpr_NotIdentical(PHPParser_Node_Expr_NotIdentical $node) {
-        return $this->pInfixOp('Expr_NotIdentical', $node->left, ' !== ', $node->right);
-    }
-
-    public function pExpr_Greater(PHPParser_Node_Expr_Greater $node) {
-        return $this->pInfixOp('Expr_Greater', $node->left, ' > ', $node->right);
-    }
-
-    public function pExpr_GreaterOrEqual(PHPParser_Node_Expr_GreaterOrEqual $node) {
-        return $this->pInfixOp('Expr_GreaterOrEqual', $node->left, ' >= ', $node->right);
-    }
-
-    public function pExpr_Smaller(PHPParser_Node_Expr_Smaller $node) {
-        return $this->pInfixOp('Expr_Smaller', $node->left, ' < ', $node->right);
-    }
-
-    public function pExpr_SmallerOrEqual(PHPParser_Node_Expr_SmallerOrEqual $node) {
-        return $this->pInfixOp('Expr_SmallerOrEqual', $node->left, ' <= ', $node->right);
-    }
-
-    public function pExpr_Instanceof(PHPParser_Node_Expr_Instanceof $node) {
-        return $this->pInfixOp('Expr_Instanceof', $node->expr, ' instanceof ', $node->class);
-    }
-
-    // Unary expressions
-
-    public function pExpr_BooleanNot(PHPParser_Node_Expr_BooleanNot $node) {
-        return $this->pPrefixOp('Expr_BooleanNot', '!', $node->expr);
-    }
-
-    public function pExpr_BitwiseNot(PHPParser_Node_Expr_BitwiseNot $node) {
-        return $this->pPrefixOp('Expr_BitwiseNot', '~', $node->expr);
-    }
-
-    public function pExpr_UnaryMinus(PHPParser_Node_Expr_UnaryMinus $node) {
-        return $this->pPrefixOp('Expr_UnaryMinus', '-', $node->expr);
-    }
-
-    public function pExpr_UnaryPlus(PHPParser_Node_Expr_UnaryPlus $node) {
-        return $this->pPrefixOp('Expr_UnaryPlus', '+', $node->expr);
-    }
-
-    public function pExpr_PreInc(PHPParser_Node_Expr_PreInc $node) {
-        return $this->pPrefixOp('Expr_PreInc', '++', $node->var);
-    }
-
-    public function pExpr_PreDec(PHPParser_Node_Expr_PreDec $node) {
-        return $this->pPrefixOp('Expr_PreDec', '--', $node->var);
-    }
-
-    public function pExpr_PostInc(PHPParser_Node_Expr_PostInc $node) {
-        return $this->pPostfixOp('Expr_PostInc', $node->var, '++');
-    }
-
-    public function pExpr_PostDec(PHPParser_Node_Expr_PostDec $node) {
-        return $this->pPostfixOp('Expr_PostDec', $node->var, '--');
-    }
-
-    public function pExpr_ErrorSuppress(PHPParser_Node_Expr_ErrorSuppress $node) {
-        return $this->pPrefixOp('Expr_ErrorSuppress', '@', $node->expr);
-    }
-
-    // Casts
-
-    public function pExpr_Cast_Int(PHPParser_Node_Expr_Cast_Int $node) {
-        return $this->pPrefixOp('Expr_Cast_Int', '(int) ', $node->expr);
-    }
-
-    public function pExpr_Cast_Double(PHPParser_Node_Expr_Cast_Double $node) {
-        return $this->pPrefixOp('Expr_Cast_Double', '(double) ', $node->expr);
-    }
-
-    public function pExpr_Cast_String(PHPParser_Node_Expr_Cast_String $node) {
-        return $this->pPrefixOp('Expr_Cast_String', '(string) ', $node->expr);
-    }
-
-    public function pExpr_Cast_Array(PHPParser_Node_Expr_Cast_Array $node) {
-        return $this->pPrefixOp('Expr_Cast_Array', '(array) ', $node->expr);
-    }
-
-    public function pExpr_Cast_Object(PHPParser_Node_Expr_Cast_Object $node) {
-        return $this->pPrefixOp('Expr_Cast_Object', '(object) ', $node->expr);
-    }
-
-    public function pExpr_Cast_Bool(PHPParser_Node_Expr_Cast_Bool $node) {
-        return $this->pPrefixOp('Expr_Cast_Bool', '(bool) ', $node->expr);
-    }
-
-    public function pExpr_Cast_Unset(PHPParser_Node_Expr_Cast_Unset $node) {
-        return $this->pPrefixOp('Expr_Cast_Unset', '(unset) ', $node->expr);
-    }
-
-    // Function calls and similar constructs
-
-    public function pExpr_FuncCall(PHPParser_Node_Expr_FuncCall $node) {
-        return $this->p($node->name) . '(' . $this->pCommaSeparated($node->args) . ')';
-    }
-
-    public function pExpr_MethodCall(PHPParser_Node_Expr_MethodCall $node) {
-        return $this->pVarOrNewExpr($node->var) . '->' . $this->pObjectProperty($node->name)
-             . '(' . $this->pCommaSeparated($node->args) . ')';
-    }
-
-    public function pExpr_StaticCall(PHPParser_Node_Expr_StaticCall $node) {
-        return $this->p($node->class) . '::'
-             . ($node->name instanceof PHPParser_Node_Expr
-                ? ($node->name instanceof PHPParser_Node_Expr_Variable
-                   || $node->name instanceof PHPParser_Node_Expr_ArrayDimFetch
-                   ? $this->p($node->name)
-                   : '{' . $this->p($node->name) . '}')
-                : $node->name)
-             . '(' . $this->pCommaSeparated($node->args) . ')';
-    }
-
-    public function pExpr_Empty(PHPParser_Node_Expr_Empty $node) {
-        return 'empty(' . $this->p($node->expr) . ')';
-    }
-
-    public function pExpr_Isset(PHPParser_Node_Expr_Isset $node) {
-        return 'isset(' . $this->pCommaSeparated($node->vars) . ')';
-    }
-
-    public function pExpr_Print(PHPParser_Node_Expr_Print $node) {
-        return 'print ' . $this->p($node->expr);
-    }
-
-    public function pExpr_Eval(PHPParser_Node_Expr_Eval $node) {
-        return 'eval(' . $this->p($node->expr) . ')';
-    }
-
-    public function pExpr_Include(PHPParser_Node_Expr_Include $node) {
-        static $map = array(
-            PHPParser_Node_Expr_Include::TYPE_INCLUDE      => 'include',
-            PHPParser_Node_Expr_Include::TYPE_INCLUDE_ONCE => 'include_once',
-            PHPParser_Node_Expr_Include::TYPE_REQUIRE      => 'require',
-            PHPParser_Node_Expr_Include::TYPE_REQUIRE_ONCE => 'require_once',
-        );
-
-        return $map[$node->type] . ' ' . $this->p($node->expr);
-    }
-
-    public function pExpr_List(PHPParser_Node_Expr_List $node) {
-        $pList = array();
-        foreach ($node->vars as $var) {
-            if (null === $var) {
-                $pList[] = '';
-            } else {
-                $pList[] = $this->p($var);
-            }
-        }
-
-        return 'list(' . implode(', ', $pList) . ')';
-    }
-
-    // Other
-
-    public function pExpr_Variable(PHPParser_Node_Expr_Variable $node) {
-        if ($node->name instanceof PHPParser_Node_Expr) {
-            return '${' . $this->p($node->name) . '}';
-        } else {
-            return '$' . $node->name;
-        }
-    }
-
-    public function pExpr_Array(PHPParser_Node_Expr_Array $node) {
-        return 'array(' . $this->pCommaSeparated($node->items) . ')';
-    }
-
-    public function pExpr_ArrayItem(PHPParser_Node_Expr_ArrayItem $node) {
-        return (null !== $node->key ? $this->p($node->key) . ' => ' : '')
-             . ($node->byRef ? '&' : '') . $this->p($node->value);
-    }
-
-    public function pExpr_ArrayDimFetch(PHPParser_Node_Expr_ArrayDimFetch $node) {
-        return $this->pVarOrNewExpr($node->var)
-             . '[' . (null !== $node->dim ? $this->p($node->dim) : '') . ']';
-    }
-
-    public function pExpr_ConstFetch(PHPParser_Node_Expr_ConstFetch $node) {
-        return $this->p($node->name);
-    }
-
-    public function pExpr_ClassConstFetch(PHPParser_Node_Expr_ClassConstFetch $node) {
-        return $this->p($node->class) . '::' . $node->name;
-    }
-
-    public function pExpr_PropertyFetch(PHPParser_Node_Expr_PropertyFetch $node) {
-        return $this->pVarOrNewExpr($node->var) . '->' . $this->pObjectProperty($node->name);
-    }
-
-    public function pExpr_StaticPropertyFetch(PHPParser_Node_Expr_StaticPropertyFetch $node) {
-        return $this->p($node->class) . '::$' . $this->pObjectProperty($node->name);
-    }
-
-    public function pExpr_ShellExec(PHPParser_Node_Expr_ShellExec $node) {
-        return '`' . $this->pEncapsList($node->parts, '`') . '`';
-    }
-
-    public function pExpr_Closure(PHPParser_Node_Expr_Closure $node) {
-        return ($node->static ? 'static ' : '')
-             . 'function ' . ($node->byRef ? '&' : '')
-             . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')': '')
-             . ' {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pExpr_ClosureUse(PHPParser_Node_Expr_ClosureUse $node) {
-        return ($node->byRef ? '&' : '') . '$' . $node->var;
-    }
-
-    public function pExpr_New(PHPParser_Node_Expr_New $node) {
-        return 'new ' . $this->p($node->class) . '(' . $this->pCommaSeparated($node->args) . ')';
-    }
-
-    public function pExpr_Clone(PHPParser_Node_Expr_Clone $node) {
-        return 'clone ' . $this->p($node->expr);
-    }
-
-    public function pExpr_Ternary(PHPParser_Node_Expr_Ternary $node) {
-        // a bit of cheating: we treat the ternary as a binary op where the ?...: part is the operator.
-        // this is okay because the part between ? and : never needs parentheses.
-        return $this->pInfixOp('Expr_Ternary',
-            $node->cond, ' ?' . (null !== $node->if ? ' ' . $this->p($node->if) . ' ' : '') . ': ', $node->else
-        );
-    }
-
-    public function pExpr_Exit(PHPParser_Node_Expr_Exit $node) {
-        return 'die' . (null !== $node->expr ? '(' . $this->p($node->expr) . ')' : '');
-    }
-
-    public function pExpr_Yield(PHPParser_Node_Expr_Yield $node) {
-        if ($node->value === null) {
-            return 'yield';
-        } else {
-            // this is a bit ugly, but currently there is no way to detect whether the parentheses are necessary
-            return '(yield '
-                 . ($node->key !== null ? $this->p($node->key) . ' => ' : '')
-                 . $this->p($node->value)
-                 . ')';
-        }
-    }
-
-    // Declarations
-
-    public function pStmt_Namespace(PHPParser_Node_Stmt_Namespace $node) {
-        return 'namespace' . (null !== $node->name ? ' ' . $this->p($node->name) : '')
-             . ' {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_Use(PHPParser_Node_Stmt_Use $node) {
-        return 'use ' . $this->pCommaSeparated($node->uses) . ';';
-    }
-
-    public function pStmt_UseUse(PHPParser_Node_Stmt_UseUse $node) {
-        return $this->p($node->name)
-             . ($node->name->getLast() !== $node->alias ? ' as ' . $node->alias : '');
-    }
-
-    public function pStmt_Interface(PHPParser_Node_Stmt_Interface $node) {
-        return 'interface ' . $node->name
-             . (!empty($node->extends) ? ' extends ' . $this->pCommaSeparated($node->extends) : '')
-             . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_Class(PHPParser_Node_Stmt_Class $node) {
-        return $this->pModifiers($node->type)
-             . 'class ' . $node->name
-             . (null !== $node->extends ? ' extends ' . $this->p($node->extends) : '')
-             . (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '')
-             . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_Trait(PHPParser_Node_Stmt_Trait $node) {
-        return 'trait ' . $node->name
-             . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_TraitUse(PHPParser_Node_Stmt_TraitUse $node) {
-        return 'use ' . $this->pCommaSeparated($node->traits)
-             . (empty($node->adaptations)
-                ? ';'
-                : ' {' . "\n" . $this->pStmts($node->adaptations) . "\n" . '}');
-    }
-
-    public function pStmt_TraitUseAdaptation_Precedence(PHPParser_Node_Stmt_TraitUseAdaptation_Precedence $node) {
-        return $this->p($node->trait) . '::' . $node->method
-             . ' insteadof ' . $this->pCommaSeparated($node->insteadof) . ';';
-    }
-
-    public function pStmt_TraitUseAdaptation_Alias(PHPParser_Node_Stmt_TraitUseAdaptation_Alias $node) {
-        return (null !== $node->trait ? $this->p($node->trait) . '::' : '')
-             . $node->method . ' as'
-             . (null !== $node->newModifier ? ' ' . $this->pModifiers($node->newModifier) : '')
-             . (null !== $node->newName     ? ' ' . $node->newName                        : '')
-             . ';';
-    }
-
-    public function pStmt_Property(PHPParser_Node_Stmt_Property $node) {
-        return $this->pModifiers($node->type) . $this->pCommaSeparated($node->props) . ';';
-    }
-
-    public function pStmt_PropertyProperty(PHPParser_Node_Stmt_PropertyProperty $node) {
-        return '$' . $node->name
-             . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
-    }
-
-    public function pStmt_ClassMethod(PHPParser_Node_Stmt_ClassMethod $node) {
-        return $this->pModifiers($node->type)
-             . 'function ' . ($node->byRef ? '&' : '') . $node->name
-             . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (null !== $node->stmts
-                ? "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}'
-                : ';');
-    }
-
-    public function pStmt_ClassConst(PHPParser_Node_Stmt_ClassConst $node) {
-        return 'const ' . $this->pCommaSeparated($node->consts) . ';';
-    }
-
-    public function pStmt_Function(PHPParser_Node_Stmt_Function $node) {
-        return 'function ' . ($node->byRef ? '&' : '') . $node->name
-             . '(' . $this->pCommaSeparated($node->params) . ')'
-             . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_Const(PHPParser_Node_Stmt_Const $node) {
-        return 'const ' . $this->pCommaSeparated($node->consts) . ';';
-    }
-
-    public function pStmt_Declare(PHPParser_Node_Stmt_Declare $node) {
-        return 'declare (' . $this->pCommaSeparated($node->declares) . ') {'
-             . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_DeclareDeclare(PHPParser_Node_Stmt_DeclareDeclare $node) {
-        return $node->key . ' = ' . $this->p($node->value);
-    }
-
-    // Control flow
-
-    public function pStmt_If(PHPParser_Node_Stmt_If $node) {
-        return 'if (' . $this->p($node->cond) . ') {'
-             . "\n" . $this->pStmts($node->stmts) . "\n" . '}'
-             . $this->pImplode($node->elseifs)
-             . (null !== $node->else ? $this->p($node->else) : '');
-    }
-
-    public function pStmt_Elseif(PHPParser_Node_Stmt_Elseif $node) {
-        return ' elseif (' . $this->p($node->cond) . ') {'
-             . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_Else(PHPParser_Node_Stmt_Else $node) {
-        return ' else {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_For(PHPParser_Node_Stmt_For $node) {
-        return 'for ('
-             . $this->pCommaSeparated($node->init) . ';' . (!empty($node->cond) ? ' ' : '')
-             . $this->pCommaSeparated($node->cond) . ';' . (!empty($node->loop) ? ' ' : '')
-             . $this->pCommaSeparated($node->loop)
-             . ') {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_Foreach(PHPParser_Node_Stmt_Foreach $node) {
-        return 'foreach (' . $this->p($node->expr) . ' as '
-             . (null !== $node->keyVar ? $this->p($node->keyVar) . ' => ' : '')
-             . ($node->byRef ? '&' : '') . $this->p($node->valueVar) . ') {'
-             . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_While(PHPParser_Node_Stmt_While $node) {
-        return 'while (' . $this->p($node->cond) . ') {'
-             . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_Do(PHPParser_Node_Stmt_Do $node) {
-        return 'do {' . "\n" . $this->pStmts($node->stmts) . "\n"
-             . '} while (' . $this->p($node->cond) . ');';
-    }
-
-    public function pStmt_Switch(PHPParser_Node_Stmt_Switch $node) {
-        return 'switch (' . $this->p($node->cond) . ') {'
-             . "\n" . $this->pStmts($node->cases) . "\n" . '}';
-    }
-
-    public function pStmt_Case(PHPParser_Node_Stmt_Case $node) {
-        return (null !== $node->cond ? 'case ' . $this->p($node->cond) : 'default') . ':'
-             . ($node->stmts ? "\n" . $this->pStmts($node->stmts) : '');
-    }
-
-    public function pStmt_TryCatch(PHPParser_Node_Stmt_TryCatch $node) {
-        return 'try {' . "\n" . $this->pStmts($node->stmts) . "\n" . '}'
-             . $this->pImplode($node->catches)
-             . ($node->finallyStmts !== null
-                ? ' finally {' . "\n" . $this->pStmts($node->finallyStmts) . "\n" . '}'
-                : '');
-    }
-
-    public function pStmt_Catch(PHPParser_Node_Stmt_Catch $node) {
-        return ' catch (' . $this->p($node->type) . ' $' . $node->var . ') {'
-             . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-
-    public function pStmt_Break(PHPParser_Node_Stmt_Break $node) {
-        return 'break' . ($node->num !== null ? ' ' . $this->p($node->num) : '') . ';';
-    }
-
-    public function pStmt_Continue(PHPParser_Node_Stmt_Continue $node) {
-        return 'continue' . ($node->num !== null ? ' ' . $this->p($node->num) : '') . ';';
-    }
-
-    public function pStmt_Return(PHPParser_Node_Stmt_Return $node) {
-        return 'return' . (null !== $node->expr ? ' ' . $this->p($node->expr) : '') . ';';
-    }
-
-    public function pStmt_Throw(PHPParser_Node_Stmt_Throw $node) {
-        return 'throw ' . $this->p($node->expr) . ';';
-    }
-
-    public function pStmt_Label(PHPParser_Node_Stmt_Label $node) {
-        return $node->name . ':';
-    }
-
-    public function pStmt_Goto(PHPParser_Node_Stmt_Goto $node) {
-        return 'goto ' . $node->name . ';';
-    }
-
-    // Other
-
-    public function pStmt_Echo(PHPParser_Node_Stmt_Echo $node) {
-        return 'echo ' . $this->pCommaSeparated($node->exprs) . ';';
-    }
-
-    public function pStmt_Static(PHPParser_Node_Stmt_Static $node) {
-        return 'static ' . $this->pCommaSeparated($node->vars) . ';';
-    }
-
-    public function pStmt_Global(PHPParser_Node_Stmt_Global $node) {
-        return 'global ' . $this->pCommaSeparated($node->vars) . ';';
-    }
-
-    public function pStmt_StaticVar(PHPParser_Node_Stmt_StaticVar $node) {
-        return '$' . $node->name
-             . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
-    }
-
-    public function pStmt_Unset(PHPParser_Node_Stmt_Unset $node) {
-        return 'unset(' . $this->pCommaSeparated($node->vars) . ');';
-    }
-
-    public function pStmt_InlineHTML(PHPParser_Node_Stmt_InlineHTML $node) {
-        return '?>' . $this->pNoIndent(
-            ("\n" === $node->value[0] || "\r" === $node->value[0] ? "\n" : '')
-            . $node->value
-        ) . '<?php ';
-    }
-
-    public function pStmt_HaltCompiler(PHPParser_Node_Stmt_HaltCompiler $node) {
-        return '__halt_compiler();' . $node->remaining;
-    }
-
-    // Helpers
-
-    public function pObjectProperty($node) {
-        if ($node instanceof PHPParser_Node_Expr) {
-            return '{' . $this->p($node) . '}';
-        } else {
-            return $node;
-        }
-    }
-
-    public function pModifiers($modifiers) {
-        return ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_PUBLIC    ? 'public '    : '')
-             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_PROTECTED ? 'protected ' : '')
-             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_PRIVATE   ? 'private '   : '')
-             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_STATIC    ? 'static '    : '')
-             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_ABSTRACT  ? 'abstract '  : '')
-             . ($modifiers & PHPParser_Node_Stmt_Class::MODIFIER_FINAL     ? 'final '     : '');
-    }
-
-    public function pEncapsList(array $encapsList, $quote) {
-        $return = '';
-        foreach ($encapsList as $element) {
-            if (is_string($element)) {
-                $return .= addcslashes($element, "\n\r\t\f\v$" . $quote . "\\");
-            } else {
-                $return .= '{' . $this->p($element) . '}';
-            }
-        }
-
-        return $return;
-    }
-
-    public function pVarOrNewExpr(PHPParser_Node $node) {
-        if ($node instanceof PHPParser_Node_Expr_New) {
-            return '(' . $this->p($node) . ')';
-        } else {
-            return $this->p($node);
-        }
-    }
 }
\ No newline at end of file
diff --git a/test/PHPParser/Tests/NodeVisitor/NameResolverTest.php b/test/PHPParser/Tests/NodeVisitor/NameResolverTest.php
index 16501e81..8bba60fc 100644
--- a/test/PHPParser/Tests/NodeVisitor/NameResolverTest.php
+++ b/test/PHPParser/Tests/NodeVisitor/NameResolverTest.php
@@ -74,7 +74,7 @@ namespace {
 EOC;
 
         $parser        = new PHPParser_Parser(new PHPParser_Lexer_Emulative);
-        $prettyPrinter = new PHPParser_PrettyPrinter_Zend;
+        $prettyPrinter = new PHPParser_PrettyPrinter_Default;
         $traverser     = new PHPParser_NodeTraverser;
         $traverser->addVisitor(new PHPParser_NodeVisitor_NameResolver);
 
@@ -141,7 +141,7 @@ namespace NS {
 EOC;
 
         $parser        = new PHPParser_Parser(new PHPParser_Lexer_Emulative);
-        $prettyPrinter = new PHPParser_PrettyPrinter_Zend;
+        $prettyPrinter = new PHPParser_PrettyPrinter_Default;
         $traverser     = new PHPParser_NodeTraverser;
         $traverser->addVisitor(new PHPParser_NodeVisitor_NameResolver);
 
diff --git a/test/PHPParser/Tests/PrettyPrinterTest.php b/test/PHPParser/Tests/PrettyPrinterTest.php
index 989d3f67..b2fbe932 100644
--- a/test/PHPParser/Tests/PrettyPrinterTest.php
+++ b/test/PHPParser/Tests/PrettyPrinterTest.php
@@ -10,7 +10,7 @@ class PHPParser_Tests_PrettyPrinterTest extends PHPParser_Tests_CodeTestAbstract
      */
     public function testPrettyPrint($name, $code, $dump) {
         $parser = new PHPParser_Parser(new PHPParser_Lexer_Emulative);
-        $prettyPrinter = new PHPParser_PrettyPrinter_Zend;
+        $prettyPrinter = new PHPParser_PrettyPrinter_Default;
 
         $stmts = $parser->parse($code);
         $this->assertEquals(
diff --git a/test/PHPParser/Tests/TemplateTest.php b/test/PHPParser/Tests/TemplateTest.php
index 4981015c..a926c5c6 100644
--- a/test/PHPParser/Tests/TemplateTest.php
+++ b/test/PHPParser/Tests/TemplateTest.php
@@ -8,7 +8,7 @@ class PHPParser_Tests_TemplateTest extends PHPUnit_Framework_TestCase
      */
     public function testPlaceholderReplacement($templateCode, $placeholders, $expectedPrettyPrint) {
         $parser = new PHPParser_Parser(new PHPParser_Lexer);
-        $prettyPrinter = new PHPParser_PrettyPrinter_Zend;
+        $prettyPrinter = new PHPParser_PrettyPrinter_Default;
 
         $template = new PHPParser_Template($parser, $templateCode);
         $this->assertEquals(
diff --git a/test_old/run.php b/test_old/run.php
index b014dff9..3b1c82f3 100644
--- a/test_old/run.php
+++ b/test_old/run.php
@@ -69,7 +69,7 @@ require_once dirname(__FILE__) . '/../lib/PHPParser/Autoloader.php';
 PHPParser_Autoloader::register();
 
 $parser        = new PHPParser_Parser(new PHPParser_Lexer_Emulative);
-$prettyPrinter = new PHPParser_PrettyPrinter_Zend;
+$prettyPrinter = new PHPParser_PrettyPrinter_Default;
 $nodeDumper    = new PHPParser_NodeDumper;
 
 $parseFail = $ppFail = $compareFail = $count = 0;