diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35dd6553ce8a..12f50dcfd38b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -701,8 +701,8 @@ consolidating all the changes shown in the previous 1.6.0 release candidates.**
   ([bcd0d4](https://github.com/angular/angular.js/commit/bcd0d4d896d0dfdd988ff4f849c1d40366125858))**:
 
 Previously, `$compileProvider.preAssignBindingsEnabled` was
-set to true by default. This means bindings were pre-assigned in component
-constructors. In Angular 1.5+ the place to put the initialization logic
+set to true by default. This means bindings were pre-assigned in component/directive
+controller constructors. In Angular 1.5+ the place to put the initialization logic
 relying on bindings being present is the controller `$onInit` method.
 
 To migrate follow the example below:
diff --git a/docs/content/guide/migration.ngdoc b/docs/content/guide/migration.ngdoc
index 0d4b7d3b92b4..6b87e8c4ef3d 100644
--- a/docs/content/guide/migration.ngdoc
+++ b/docs/content/guide/migration.ngdoc
@@ -75,7 +75,7 @@ commits for more info.
 - **$location** now uses `'!'` as the default hash-prefix for hash-bang URLs, instead of the empty
   string. ([Details](guide/migration#commit-aa077e8))
 
-- **$compile** will (by default) not pre-assign bindings on controller instances.
+- **$compile** will (by default) not pre-assign bindings in component/directive controller constructors.
   ([Details](guide/migration#commit-bcd0d4))
 
 - **http** imposes additional restrictions to **JSONP** requests for security reasons
@@ -412,7 +412,7 @@ if the option does not provide a value attribute.
 <major />
 <a name="commit-bcd0d4"></a>
 **Due to [bcd0d4](https://github.com/angular/angular.js/commit/bcd0d4d896d0dfdd988ff4f849c1d40366125858)**,
-pre-assigning bindings on controller instances is disabled by default. It is still possible to turn
+pre-assigning bindings in component/directive controller constructors is disabled by default. It is still possible to turn
 it back on, which should help during the migration. Pre-assigning bindings has been deprecated and
 will be removed in a future version, so we strongly recommend migrating your applications to not
 rely on it as soon as possible.