diff --git a/framework/yii/gii/Generator.php b/framework/yii/gii/Generator.php
index 40588d9..db05aa3 100644
--- a/framework/yii/gii/Generator.php
+++ b/framework/yii/gii/Generator.php
@@ -211,6 +211,7 @@ abstract class Generator extends Model
 			'__line__',
 			'__method__',
 			'__namespace__',
+			'__trait__',
 			'abstract',
 			'and',
 			'array',
@@ -218,6 +219,7 @@ abstract class Generator extends Model
 			'break',
 			'case',
 			'catch',
+			'callable',
 			'cfunction',
 			'class',
 			'clone',
@@ -242,7 +244,7 @@ abstract class Generator extends Model
 			'exit',
 			'extends',
 			'final',
-			'final',
+			'finally',
 			'for',
 			'foreach',
 			'function',
@@ -253,6 +255,7 @@ abstract class Generator extends Model
 			'include',
 			'include_once',
 			'instanceof',
+			'insteadof',
 			'interface',
 			'isset',
 			'list',
@@ -273,6 +276,7 @@ abstract class Generator extends Model
 			'switch',
 			'this',
 			'throw',
+			'trait',
 			'try',
 			'unset',
 			'use',