diff --git a/extensions/gii/CHANGELOG.md b/extensions/gii/CHANGELOG.md
index e66648dd36..71bb4e27fb 100644
--- a/extensions/gii/CHANGELOG.md
+++ b/extensions/gii/CHANGELOG.md
@@ -4,7 +4,6 @@ Yii Framework 2 gii extension Change Log
 2.0.0-rc under development
 --------------------------
 
-- Enh #3811: Now Gii model generator makes autocomplete for model class field (mitalcoi)
 - Bug #1263: Fixed the issue that Gii and Debug modules might be affected by incompatible asset manager configuration (qiangxue)
 - Bug #2314: Gii model generator does not generate correct relation type in some special case (qiangxue)
 - Bug #3265: Fixed incorrect controller class name validation (suralc)
@@ -12,6 +11,7 @@ Yii Framework 2 gii extension Change Log
 - Enh #2018: Search model is not required anymore in CRUD generator (johonunu)
 - Enh #3088: The gii module will manage their own URL rules now (qiangxue)
 - Enh #3222: Added `useTablePrefix` option to the model generator for Gii (horizons2)
+- Enh #3811: Now Gii model generator makes autocomplete for model class field (mitalcoi)
 
 
 2.0.0-beta April 13, 2014
diff --git a/extensions/gii/assets/gii.js b/extensions/gii/assets/gii.js
index 41ce65012d..bc68586023 100644
--- a/extensions/gii/assets/gii.js
+++ b/extensions/gii/assets/gii.js
@@ -151,7 +151,7 @@ yii.gii = (function ($) {
                 $('#model-generator .field-generator-modelclass').toggle($(this).val().indexOf('*') == -1);
             }).change();
 
-      //model generator: translate table name to model class
+            // model generator: translate table name to model class
             $('#generator-tablename').on('blur', function () {
                 var tableName = $(this).val();
                 if ($('#generator-modelclass').val()=='' && tableName && tableName.indexOf('*') === -1){
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 271ab3bc10..2669ccf129 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -4,7 +4,6 @@ Yii Framework 2 Change Log
 2.0.0-rc under development
 --------------------------
 
-- Enh #3811: Now Gii model generator makes autocomplete for model class field (mitalcoi)
 - Bug #1263: Fixed the issue that Gii and Debug modules might be affected by incompatible asset manager configuration (qiangxue)
 - Bug #2314: Gii model generator does not generate correct relation type in some special case (qiangxue)
 - Bug #2563: Theming is not working if the path map of the theme contains ".." or "." in the paths (qiangxue)
@@ -109,6 +108,7 @@ Yii Framework 2 Change Log
 - Enh #3773: Added `FileValidator::mimeTypes` to support validating MIME types of files (Ragazzo)
 - Enh #3774: Added `FileValidator::checkExtensionByMimeType` to support validating file types against file mime-types (Ragazzo)
 - Enh #3801: Base migration controller `yii\console\controllers\BaseMigrateController` extracted (klimov-paul)
+- Enh #3811: Now Gii model generator makes autocomplete for model class field (mitalcoi)
 - Enh #3939: `\yii\Inflector::slug()` improvements (samdark)
     - Added protected `\yii\Inflector::transliterate()` that could be replaced with custom translit implementation.
     - Added proper tests for both intl-based slug and PHP fallback.