diff --git a/phpBB/phpbb/template/twig/node/definenode.php b/phpBB/phpbb/template/twig/node/definenode.php
index 0e31e8b4ce..fb5053ac18 100644
--- a/phpBB/phpbb/template/twig/node/definenode.php
+++ b/phpBB/phpbb/template/twig/node/definenode.php
@@ -14,9 +14,9 @@
 
 namespace phpbb\template\twig\node;
 
-class definenode extends \Twig_Node
+class definenode extends \Twig\Node\Node
 {
-	public function __construct($capture, \Twig_Node $name, \Twig_Node $value, $lineno, $tag = null)
+	public function __construct($capture, \Twig\Node\Node $name, \Twig\Node\Node $value, $lineno, $tag = null)
 	{
 		parent::__construct(array('name' => $name, 'value' => $value), array('capture' => $capture, 'safe' => false), $lineno, $tag);
 	}
diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index 55e6019113..cff29afef0 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -13,7 +13,7 @@
 
 namespace phpbb\template\twig\node;
 
-class event extends \Twig_Node
+class event extends \Twig\Node\Node
 {
 	/**
 	* The subdirectory in which all template listener files must be placed
diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 27fe8ee1b4..cf9beeac9b 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -13,7 +13,7 @@
 
 namespace phpbb\template\twig\node;
 
-abstract class includeasset extends \Twig_Node
+abstract class includeasset extends \Twig\Node\Node
 {
 	public function __construct(\Twig\Node\Expression\AbstractExpression $expr, $lineno, $tag = null)
 	{
diff --git a/phpBB/phpbb/template/twig/node/includenode.php b/phpBB/phpbb/template/twig/node/includenode.php
index bfd74dad16..2887d1a725 100644
--- a/phpBB/phpbb/template/twig/node/includenode.php
+++ b/phpBB/phpbb/template/twig/node/includenode.php
@@ -13,7 +13,7 @@
 
 namespace phpbb\template\twig\node;
 
-class includenode extends \Twig_Node_Include
+class includenode extends \Twig\Node\IncludeNode
 {
 	/**
 	* Compiles the node to PHP.
diff --git a/phpBB/phpbb/template/twig/node/includephp.php b/phpBB/phpbb/template/twig/node/includephp.php
index 4f06bc0f59..0011f67e37 100644
--- a/phpBB/phpbb/template/twig/node/includephp.php
+++ b/phpBB/phpbb/template/twig/node/includephp.php
@@ -14,7 +14,7 @@
 
 namespace phpbb\template\twig\node;
 
-class includephp extends \Twig_Node
+class includephp extends \Twig\Node\Node
 {
 	/** @var \Twig_Environment */
 	protected $environment;
diff --git a/phpBB/phpbb/template/twig/node/php.php b/phpBB/phpbb/template/twig/node/php.php
index 7db20277f1..46c1dde5d8 100644
--- a/phpBB/phpbb/template/twig/node/php.php
+++ b/phpBB/phpbb/template/twig/node/php.php
@@ -13,12 +13,12 @@
 
 namespace phpbb\template\twig\node;
 
-class php extends \Twig_Node
+class php extends \Twig\Node\Node
 {
 	/** @var \Twig_Environment */
 	protected $environment;
 
-	public function __construct(\Twig_Node_Text $text, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
+	public function __construct(\Twig\Node\TextNode $text, \phpbb\template\twig\environment $environment, $lineno, $tag = null)
 	{
 		$this->environment = $environment;
 
diff --git a/phpBB/phpbb/template/twig/tokenparser/defineparser.php b/phpBB/phpbb/template/twig/tokenparser/defineparser.php
index 30cf871062..08696b4ca4 100644
--- a/phpBB/phpbb/template/twig/tokenparser/defineparser.php
+++ b/phpBB/phpbb/template/twig/tokenparser/defineparser.php
@@ -21,7 +21,7 @@ class defineparser extends \Twig\TokenParser\AbstractTokenParser
 	*
 	* @param \Twig\Token $token A Twig_Token instance
 	*
-	* @return \Twig_Node A Twig_Node instance
+	* @return \Twig\Node\Node A Twig_Node instance
 	* @throws \Twig_Error_Syntax
 	* @throws \phpbb\template\twig\node\definenode
 	*/
diff --git a/phpBB/phpbb/template/twig/tokenparser/event.php b/phpBB/phpbb/template/twig/tokenparser/event.php
index ef56a8719d..5aae2721c8 100644
--- a/phpBB/phpbb/template/twig/tokenparser/event.php
+++ b/phpBB/phpbb/template/twig/tokenparser/event.php
@@ -33,7 +33,7 @@ class event extends \Twig\TokenParser\AbstractTokenParser
 	*
 	* @param \Twig\Token $token A Twig_Token instance
 	*
-	* @return \Twig_Node A Twig_Node instance
+	* @return \Twig\Node\Node A Twig_Node instance
 	*/
 	public function parse(\Twig\Token $token)
 	{
diff --git a/phpBB/phpbb/template/twig/tokenparser/includecss.php b/phpBB/phpbb/template/twig/tokenparser/includecss.php
index e41ed8ee1c..72e2bc96dd 100644
--- a/phpBB/phpbb/template/twig/tokenparser/includecss.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includecss.php
@@ -20,7 +20,7 @@ class includecss extends \Twig\TokenParser\AbstractTokenParser
 	*
 	* @param \Twig\Token $token A Twig_Token instance
 	*
-	* @return \Twig_Node A Twig_Node instance
+	* @return \Twig\Node\Node A Twig_Node instance
 	*/
 	public function parse(\Twig\Token $token)
 	{
diff --git a/phpBB/phpbb/template/twig/tokenparser/includejs.php b/phpBB/phpbb/template/twig/tokenparser/includejs.php
index f01eb69806..4f5b67696e 100644
--- a/phpBB/phpbb/template/twig/tokenparser/includejs.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includejs.php
@@ -20,7 +20,7 @@ class includejs extends \Twig\TokenParser\AbstractTokenParser
 	*
 	* @param \Twig\Token $token A Twig_Token instance
 	*
-	* @return \Twig_Node A Twig_Node instance
+	* @return \Twig\Node\Node A Twig_Node instance
 	*/
 	public function parse(\Twig\Token $token)
 	{
diff --git a/phpBB/phpbb/template/twig/tokenparser/includeparser.php b/phpBB/phpbb/template/twig/tokenparser/includeparser.php
index 61d20b72f0..5ff2582e35 100644
--- a/phpBB/phpbb/template/twig/tokenparser/includeparser.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includeparser.php
@@ -21,7 +21,7 @@ class includeparser extends \Twig\TokenParser\IncludeTokenParser
 	*
 	* @param \Twig\Token $token A Twig_Token instance
 	*
-	* @return \Twig_Node A Twig_Node instance
+	* @return \Twig\Node\Node A Twig_Node instance
 	*/
 	public function parse(\Twig\Token $token)
 	{
diff --git a/phpBB/phpbb/template/twig/tokenparser/includephp.php b/phpBB/phpbb/template/twig/tokenparser/includephp.php
index ff316a4eaa..02b565c297 100644
--- a/phpBB/phpbb/template/twig/tokenparser/includephp.php
+++ b/phpBB/phpbb/template/twig/tokenparser/includephp.php
@@ -34,7 +34,7 @@ class includephp extends \Twig\TokenParser\AbstractTokenParser
 	*
 	* @param \Twig\Token $token A Twig_Token instance
 	*
-	* @return \Twig_Node A Twig_Node instance
+	* @return \Twig\Node\Node A Twig_Node instance
 	*/
 	public function parse(\Twig\Token $token)
 	{
diff --git a/phpBB/phpbb/template/twig/tokenparser/php.php b/phpBB/phpbb/template/twig/tokenparser/php.php
index 5650c9571b..38ecba77ca 100644
--- a/phpBB/phpbb/template/twig/tokenparser/php.php
+++ b/phpBB/phpbb/template/twig/tokenparser/php.php
@@ -33,7 +33,7 @@ class php extends \Twig\TokenParser\AbstractTokenParser
 	*
 	* @param \Twig\Token $token A Twig_Token instance
 	*
-	* @return \Twig_Node A Twig_Node instance
+	* @return \Twig\Node\Node A Twig_Node instance
 	*/
 	public function parse(\Twig\Token $token)
 	{