Index: core/xwiki-core/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java
===================================================================
--- core/xwiki-core/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java	(revision 23274)
+++ core/xwiki-core/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java	(working copy)
@@ -304,6 +304,25 @@
             new HashSet<String>(linkedPages));
     }
 
+    public void testGetUniqueWikiLinkedPages() throws XWikiException
+    {
+        BaseObject theObj = this.document.getObject(CLASSNAME);
+        theObj.setStringValue("string", "[["+DOCSPACE+".Page1]]");
+        this.document.setContent("[["+DOCSPACE+".Page2]]");
+        this.document.setSyntaxId("xwiki/2.0");
+
+        String links = "";
+        for(XWikiLink link : this.document.getUniqueWikiLinkedPages(getContext())){
+            links += link.getLink();
+        }
+        assertEquals(links.indexOf(DOCSPACE+".Page1")!=-1, true);
+        assertEquals(links.indexOf(DOCSPACE+".Page2")!=-1, true);
+
+        //set our vars back to origional states
+        this.document.setSyntaxId("xwiki/1.0");
+        theObj.setStringValue("string","string");
+    }
+
     public void testGetUniqueWikiLinksFromObjects() throws XWikiException
     {
         BaseObject theObj = this.document.getObject(CLASSNAME);
Index: core/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- core/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	(revision 23274)
+++ core/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java	(working copy)
@@ -3063,6 +3063,7 @@
 
                 links.add(wikiLink);
             }
+            links.addAll(this.getUniqueWikiLinksFromObjects(context));
         }
 
         return links;
@@ -4219,6 +4220,7 @@
                 backlinkDocument.setContent((String) result.getModifiedContent());
             } else {
                 backlinkDocument.refactorDocumentLinks(oldDocName, newDocName, context);
+                backlinkDocument.refactorObjectLinks(oldDocName, newDocName, context);
             }
 
             context.getWiki().saveDocument(backlinkDocument,