diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4e0585d..0cdb74d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,7 +5,7 @@ Drupal 7.20, xxxx-xx-xx (development version)
   certain non-MySQL databases.
 - Refactored the Field module's caching behavior to obtain large improvements
   in memory usage for sites with many fields and instances (API addition:
-  http://drupal.org/node/1880666).
+  http://drupal.org/node/1915646).
 - Fixed entity argument not being passed to implementations of
   hook_file_download_access_alter(). The fix adds an additional context
   parameter that can be passed when calling drupal_alter() for any hook (API
diff --git a/modules/field/field.info.class.inc b/modules/field/field.info.class.inc
index de50a1b..3b89898 100644
--- a/modules/field/field.info.class.inc
+++ b/modules/field/field.info.class.inc
@@ -217,7 +217,7 @@ class FieldInfo {
 
         // Initialize empty arrays for all existing entity types and bundles.
         // This is not strictly needed, but is done to preserve the behavior of
-        // field_info_instances() before http://drupal.org/node/1880666.
+        // field_info_instances() before http://drupal.org/node/1915646.
         foreach (field_info_bundles() as $existing_entity_type => $bundles) {
           foreach ($bundles as $bundle => $bundle_info) {
             $this->bundleInstances[$existing_entity_type][$bundle] = array();
diff --git a/modules/field/field.info.inc b/modules/field/field.info.inc
index 7711395..396ad5f 100644
--- a/modules/field/field.info.inc
+++ b/modules/field/field.info.inc
@@ -68,7 +68,7 @@ function field_info_cache_clear() {
  *
  * Deprecated. This function is kept to ensure backwards compatibility, but has
  * a serious performance impact, and should be absolutely avoided.
- * See http://drupal.org/node/1880666.
+ * See http://drupal.org/node/1915646.
  *
  * Use the regular field_info_*() API functions to access the information, or
  * field_info_cache_clear() to clear the cached data.
@@ -234,7 +234,7 @@ function _field_info_collate_types($reset = FALSE) {
  * Prepares a field definition for the current run-time context.
  *
  * The functionality has moved to the FieldInfo class. This function is kept as
- * a backwards-compatibility layer. See http://drupal.org/node/1880666.
+ * a backwards-compatibility layer. See http://drupal.org/node/1915646.
  *
  * @see FieldInfo::prepareField()
  */
@@ -247,7 +247,7 @@ function _field_info_prepare_field($field) {
  * Prepares an instance definition for the current run-time context.
  *
  * The functionality has moved to the FieldInfo class. This function is kept as
- * a backwards-compatibility layer. See http://drupal.org/node/1880666.
+ * a backwards-compatibility layer. See http://drupal.org/node/1915646.
  *
  * @see FieldInfo::prepareInstance()
  */
@@ -260,7 +260,7 @@ function _field_info_prepare_instance($instance, $field) {
  * Adapts display specifications to the current run-time context.
  *
  * The functionality has moved to the FieldInfo class. This function is kept as
- * a backwards-compatibility layer. See http://drupal.org/node/1880666.
+ * a backwards-compatibility layer. See http://drupal.org/node/1915646.
  *
  * @see FieldInfo::prepareInstanceDisplay()
  */
@@ -273,7 +273,7 @@ function _field_info_prepare_instance_display($field, $display) {
  * Prepares widget specifications for the current run-time context.
  *
  * The functionality has moved to the FieldInfo class. This function is kept as
- * a backwards-compatibility layer. See http://drupal.org/node/1880666.
+ * a backwards-compatibility layer. See http://drupal.org/node/1915646.
  *
  * @see FieldInfo::prepareInstanceWidget()
  */
@@ -286,7 +286,7 @@ function _field_info_prepare_instance_widget($field, $widget) {
  * Prepares 'extra fields' for the current run-time context.
  *
  * The functionality has moved to the FieldInfo class. This function is kept as
- * a backwards-compatibility layer. See http://drupal.org/node/1880666.
+ * a backwards-compatibility layer. See http://drupal.org/node/1915646.
  *
  * @see FieldInfo::prepareExtraFields()
  */