Change default value for the "auto_id_prefix" setting to "%".

Auto-generated IDs use the tag name as prefix.
Set auto_id_prefix_ to "id" if you want unchanged auto-IDs.

git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@8771 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

10 files changed, 204 insertions, 204 deletions

diff --git a/docutils/test/test_transforms/test_contents.py b/docutils/test/test_transforms/test_contents.py
index 1d5e66ce1..c9c2015e4 100755
--- a/docutils/test/test_transforms/test_contents.py
+++ b/docutils/test/test_transforms/test_contents.py
@@ -53,26 +53,26 @@ Paragraph 4.
         <bullet_list>
             <list_item>
                 <paragraph>
-                    <reference ids="id1" refid="title-1">
+                    <reference ids="toc-entry-1" refid="title-1">
                         Title 1
                 <bullet_list>
                     <list_item>
                         <paragraph>
-                            <reference ids="id2" refid="title-2">
+                            <reference ids="toc-entry-2" refid="title-2">
                                 Title
                                  2
                         <bullet_list>
                             <list_item>
                                 <paragraph>
-                                    <reference ids="id3" refid="title-3">
+                                    <reference ids="toc-entry-3" refid="title-3">
                                         Title
                                          3
                     <list_item>
                         <paragraph>
-                            <reference ids="id4" refid="title-4">
+                            <reference ids="toc-entry-4" refid="title-4">
                                 Title 4
     <section ids="title-1" names="title\\ 1">
-        <title refid="id1">
+        <title refid="toc-entry-1">
             Title 1
         <paragraph>
             Paragraph 1.
@@ -84,14 +84,14 @@ Paragraph 4.
             <paragraph>
                 Paragraph 2.
             <section ids="title-3" names="title\\ 3">
-                <title refid="id3">
+                <title refid="toc-entry-3">
                     <target ids="title" names="title">
                         Title
                      3
                 <paragraph>
                     Paragraph 3.
         <section ids="title-4" names="title\\ 4">
-            <title refid="id4">
+            <title refid="toc-entry-4">
                 Title 4
             <paragraph>
                 Paragraph 4.
@@ -115,20 +115,20 @@ Paragraph 2.
         <bullet_list>
             <list_item>
                 <paragraph>
-                    <reference ids="id1" refid="title-1">
+                    <reference ids="toc-entry-1" refid="title-1">
                         Title 1
                 <bullet_list>
                     <list_item>
                         <paragraph>
-                            <reference ids="id2" refid="title-2">
+                            <reference ids="toc-entry-2" refid="title-2">
                                 Title 2
     <section ids="title-1" names="title\\ 1">
-        <title refid="id1">
+        <title refid="toc-entry-1">
             Title 1
         <paragraph>
             Paragraph 1.
         <section ids="title-2" names="title\\ 2">
-            <title refid="id2">
+            <title refid="toc-entry-2">
                 Title 2
             <paragraph>
                 Paragraph 2.
@@ -154,19 +154,19 @@ Paragraph 2.
         <bullet_list>
             <list_item>
                 <paragraph>
-                    <reference ids="id1" refid="title-1">
+                    <reference ids="toc-entry-1" refid="title-1">
                         Title 1
             <list_item>
                 <paragraph>
-                    <reference ids="id2" refid="title-2">
+                    <reference ids="toc-entry-2" refid="title-2">
                         Title 2
     <section ids="title-1" names="title\\ 1">
-        <title refid="id1">
+        <title refid="toc-entry-1">
             Title 1
         <paragraph>
             Paragraph 1.
     <section ids="title-2" names="title\\ 2">
-        <title refid="id2">
+        <title refid="toc-entry-2">
             <image alt="Title 2" uri="title2.png">
         <paragraph>
             Paragraph 2.
@@ -201,24 +201,24 @@ Paragraph 4.
         <bullet_list>
             <list_item>
                 <paragraph>
-                    <reference ids="id1" refid="title-1">
+                    <reference ids="toc-entry-1" refid="title-1">
                         Title 1
                 <bullet_list>
                     <list_item>
                         <paragraph>
-                            <reference ids="id2" refid="title-2">
+                            <reference ids="toc-entry-2" refid="title-2">
                                 Title 2
                     <list_item>
                         <paragraph>
-                            <reference ids="id3" refid="title-4">
+                            <reference ids="toc-entry-3" refid="title-4">
                                 Title 4
     <section ids="title-1" names="title\\ 1">
-        <title refid="id1">
+        <title refid="toc-entry-1">
             Title 1
         <paragraph>
             Paragraph 1.
         <section ids="title-2" names="title\\ 2">
-            <title refid="id2">
+            <title refid="toc-entry-2">
                 Title 2
             <paragraph>
                 Paragraph 2.
@@ -228,7 +228,7 @@ Paragraph 4.
                 <paragraph>
                     Paragraph 3.
         <section ids="title-4" names="title\\ 4">
-            <title refid="id3">
+            <title refid="toc-entry-3">
                 Title 4
             <paragraph>
                 Paragraph 4.
@@ -263,31 +263,31 @@ Paragraph 4.
             <bullet_list>
                 <list_item>
                     <paragraph>
-                        <reference ids="id1" refid="title-2">
+                        <reference ids="toc-entry-1" refid="title-2">
                             Title 2
                     <bullet_list>
                         <list_item>
                             <paragraph>
-                                <reference ids="id2" refid="title-3">
+                                <reference ids="toc-entry-2" refid="title-3">
                                     Title 3
                 <list_item>
                     <paragraph>
-                        <reference ids="id3" refid="title-4">
+                        <reference ids="toc-entry-3" refid="title-4">
                             Title 4
         <paragraph>
             Paragraph 1.
         <section ids="title-2" names="title\\ 2">
-            <title refid="id1">
+            <title refid="toc-entry-1">
                 Title 2
             <paragraph>
                 Paragraph 2.
             <section ids="title-3" names="title\\ 3">
-                <title refid="id2">
+                <title refid="toc-entry-2">
                     Title 3
                 <paragraph>
                     Paragraph 3.
         <section ids="title-4" names="title\\ 4">
-            <title refid="id3">
+            <title refid="toc-entry-3">
                 Title 4
             <paragraph>
                 Paragraph 4.
@@ -308,12 +308,12 @@ Paragraph.
         <bullet_list>
             <list_item>
                 <paragraph>
-                    <reference ids="id1" refid="section">
+                    <reference ids="toc-entry-1" refid="section">
                         Section
     <paragraph>
         Test duplicate name "Contents".
     <section ids="section" names="section">
-        <title refid="id1">
+        <title refid="toc-entry-1">
             Section
         <paragraph>
             Paragraph.
@@ -334,7 +334,7 @@ Paragraph.
         <bullet_list>
             <list_item>
                 <paragraph>
-                    <reference ids="id1" refid="section">
+                    <reference ids="toc-entry-1" refid="section">
                         Section
     <section ids="section" names="section">
         <title refid="contents">
@@ -358,7 +358,7 @@ Paragraph.
         <bullet_list>
             <list_item>
                 <paragraph>
-                    <reference ids="id1" refid="section">
+                    <reference ids="toc-entry-1" refid="section">
                         Section
     <section ids="section" names="section">
         <title>
@@ -409,20 +409,20 @@ Paragraph 3.
                 <bullet_list>
                     <list_item>
                         <paragraph>
-                            <reference ids="id1" refid="title-2">
+                            <reference ids="toc-entry-1" refid="title-2">
                                 Title 2
                         <bullet_list>
                             <list_item>
                                 <paragraph>
-                                    <reference ids="id2" refid="title-3">
+                                    <reference ids="toc-entry-2" refid="title-3">
                                         Title 3
         <section ids="title-2" names="title\\ 2">
-            <title refid="id1">
+            <title refid="toc-entry-1">
                 Title 2
             <paragraph>
                 Paragraph 2.
             <section ids="title-3" names="title\\ 3">
-                <title refid="id2">
+                <title refid="toc-entry-2">
                     Title 3
                 <paragraph>
                     Paragraph 3.
diff --git a/docutils/test/test_transforms/test_footnotes.py b/docutils/test/test_transforms/test_footnotes.py
index a7104f541..f3bf94cea 100755
--- a/docutils/test/test_transforms/test_footnotes.py
+++ b/docutils/test/test_transforms/test_footnotes.py
@@ -33,9 +33,9 @@ totest['footnotes'] = ((Footnotes,), [
 """\
 <document source="test data">
     <paragraph>
-        <footnote_reference auto="1" ids="id1" refid="autolabel">
+        <footnote_reference auto="1" ids="footnote-reference-1" refid="autolabel">
             1
-    <footnote auto="1" backrefs="id1" ids="autolabel" names="autolabel">
+    <footnote auto="1" backrefs="footnote-reference-1" ids="autolabel" names="autolabel">
         <label>
             1
         <paragraph>
@@ -50,9 +50,9 @@ autonumber: [#]_
 <document source="test data">
     <paragraph>
         autonumber: \n\
-        <footnote_reference auto="1" ids="id1" refid="id2">
+        <footnote_reference auto="1" ids="footnote-reference-1" refid="footnote-1">
             1
-    <footnote auto="1" backrefs="id1" ids="id2" names="1">
+    <footnote auto="1" backrefs="footnote-reference-1" ids="footnote-1" names="1">
         <label>
             1
         <paragraph>
@@ -71,29 +71,29 @@ autonumber: [#]_
 """\
 <document source="test data">
     <paragraph>
-        <footnote_reference auto="1" ids="id1" refid="id3">
+        <footnote_reference auto="1" ids="footnote-reference-1" refid="footnote-1">
             1
          is the first auto-numbered footnote reference.
-        <footnote_reference auto="1" ids="id2" refid="id4">
+        <footnote_reference auto="1" ids="footnote-reference-2" refid="footnote-2">
             2
          is the second auto-numbered footnote reference.
-    <footnote auto="1" backrefs="id1" ids="id3" names="1">
+    <footnote auto="1" backrefs="footnote-reference-1" ids="footnote-1" names="1">
         <label>
             1
         <paragraph>
             Auto-numbered footnote 1.
-    <footnote auto="1" backrefs="id2" ids="id4" names="2">
+    <footnote auto="1" backrefs="footnote-reference-2" ids="footnote-2" names="2">
         <label>
             2
         <paragraph>
             Auto-numbered footnote 2.
-    <footnote auto="1" backrefs="id6" ids="id5" names="3">
+    <footnote auto="1" backrefs="footnote-reference-3" ids="footnote-3" names="3">
         <label>
             3
         <paragraph>
             Auto-numbered footnote 3.
     <paragraph>
-        <footnote_reference auto="1" ids="id6" refid="id5">
+        <footnote_reference auto="1" ids="footnote-reference-3" refid="footnote-3">
             3
          is the third auto-numbered footnote reference.
 """],
@@ -114,32 +114,32 @@ generated by the footnotes: first_, second_, third_.
 """\
 <document source="test data">
     <paragraph>
-        <footnote_reference auto="1" ids="id1" refid="third">
+        <footnote_reference auto="1" ids="footnote-reference-1" refid="third">
             3
          is a reference to the third auto-numbered footnote.
-    <footnote auto="1" backrefs="id3" ids="first" names="first">
+    <footnote auto="1" backrefs="footnote-reference-3" ids="first" names="first">
         <label>
             1
         <paragraph>
             First auto-numbered footnote.
-    <footnote auto="1" backrefs="id2" ids="second" names="second">
+    <footnote auto="1" backrefs="footnote-reference-2" ids="second" names="second">
         <label>
             2
         <paragraph>
             Second auto-numbered footnote.
-    <footnote auto="1" backrefs="id1 id4" ids="third" names="third">
+    <footnote auto="1" backrefs="footnote-reference-1 footnote-reference-4" ids="third" names="third">
         <label>
             3
         <paragraph>
             Third auto-numbered footnote.
     <paragraph>
-        <footnote_reference auto="1" ids="id2" refid="second">
+        <footnote_reference auto="1" ids="footnote-reference-2" refid="second">
             2
          is a reference to the second auto-numbered footnote.
-        <footnote_reference auto="1" ids="id3" refid="first">
+        <footnote_reference auto="1" ids="footnote-reference-3" refid="first">
             1
          is a reference to the first auto-numbered footnote.
-        <footnote_reference auto="1" ids="id4" refid="third">
+        <footnote_reference auto="1" ids="footnote-reference-4" refid="third">
             3
          is another reference to the third auto-numbered footnote.
     <paragraph>
@@ -174,39 +174,39 @@ Mixed anonymous and labelled auto-numbered footnotes:
     <paragraph>
         Mixed anonymous and labelled auto-numbered footnotes:
     <paragraph>
-        <footnote_reference auto="1" ids="id1" refid="four">
+        <footnote_reference auto="1" ids="footnote-reference-1" refid="four">
             4
          should be 4, \n\
-        <footnote_reference auto="1" ids="id2" refid="id7">
+        <footnote_reference auto="1" ids="footnote-reference-2" refid="footnote-1">
             1
          should be 1,
-        <footnote_reference auto="1" ids="id3" refid="id8">
+        <footnote_reference auto="1" ids="footnote-reference-3" refid="footnote-2">
             3
          should be 3, \n\
-        <problematic ids="id11 id4" refid="id10">
+        <problematic ids="problematic-1 footnote-reference-4" refid="system-message-1">
             [#]_
          is one too many,
-        <footnote_reference auto="1" ids="id5" refid="two">
+        <footnote_reference auto="1" ids="footnote-reference-5" refid="two">
             2
          should be 2, and \n\
-        <footnote_reference auto="1" ids="id6" refname="six">
+        <footnote_reference auto="1" ids="footnote-reference-6" refname="six">
          doesn't exist.
-    <footnote auto="1" backrefs="id2" ids="id7" names="1">
+    <footnote auto="1" backrefs="footnote-reference-2" ids="footnote-1" names="1">
         <label>
             1
         <paragraph>
             Auto-numbered footnote 1.
-    <footnote auto="1" backrefs="id5" ids="two" names="two">
+    <footnote auto="1" backrefs="footnote-reference-5" ids="two" names="two">
         <label>
             2
         <paragraph>
             Auto-numbered footnote 2.
-    <footnote auto="1" backrefs="id3" ids="id8" names="3">
+    <footnote auto="1" backrefs="footnote-reference-3" ids="footnote-2" names="3">
         <label>
             3
         <paragraph>
             Auto-numbered footnote 3.
-    <footnote auto="1" backrefs="id1" ids="four" names="four">
+    <footnote auto="1" backrefs="footnote-reference-1" ids="four" names="four">
         <label>
             4
         <paragraph>
@@ -216,15 +216,15 @@ Mixed anonymous and labelled auto-numbered footnotes:
             5
         <paragraph>
             Auto-numbered footnote 5.
-    <footnote auto="1" dupnames="five" ids="id9">
+    <footnote auto="1" dupnames="five" ids="five-1">
         <label>
             6
-        <system_message backrefs="id9" level="2" line="12" source="test data" type="WARNING">
+        <system_message backrefs="five-1" level="2" line="12" source="test data" type="WARNING">
             <paragraph>
                 Duplicate explicit target name: "five".
         <paragraph>
             Auto-numbered footnote 5 again (duplicate).
-    <system_message backrefs="id11" ids="id10" level="3" line="3" source="test data" type="ERROR">
+    <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="3" source="test data" type="ERROR">
         <paragraph>
             Too many autonumbered footnote references: only 2 corresponding footnotes available.
 """],
@@ -239,12 +239,12 @@ Mixed auto-numbered and manual footnotes:
 <document source="test data">
     <paragraph>
         Mixed auto-numbered and manual footnotes:
-    <footnote ids="id1" names="1">
+    <footnote ids="footnote-1" names="1">
         <label>
             1
         <paragraph>
             manually numbered
-    <footnote auto="1" ids="id2" names="2">
+    <footnote auto="1" ids="footnote-2" names="2">
         <label>
             2
         <paragraph>
@@ -269,20 +269,20 @@ An unlabeled autonumbered footnote referece: [#]_.
 <document source="test data">
     <paragraph>
         A labeled autonumbered footnote referece: \n\
-        <footnote_reference auto="1" ids="id1" refid="footnote">
+        <footnote_reference auto="1" ids="footnote-reference-1" refid="footnote">
             2
         .
     <paragraph>
         An unlabeled autonumbered footnote referece: \n\
-        <footnote_reference auto="1" ids="id2" refid="id3">
+        <footnote_reference auto="1" ids="footnote-reference-2" refid="footnote-1">
             1
         .
-    <footnote auto="1" backrefs="id2" ids="id3" names="1">
+    <footnote auto="1" backrefs="footnote-reference-2" ids="footnote-1" names="1">
         <label>
             1
         <paragraph>
             Unlabeled autonumbered footnote.
-    <footnote auto="1" backrefs="id1" ids="footnote" names="footnote">
+    <footnote auto="1" backrefs="footnote-reference-1" ids="footnote" names="footnote">
         <label>
             2
         <paragraph>
@@ -313,44 +313,44 @@ and labelled auto-numbered footnotes:
         Mixed manually-numbered, anonymous auto-numbered,
         and labelled auto-numbered footnotes:
     <paragraph>
-        <footnote_reference auto="1" ids="id1" refid="four">
+        <footnote_reference auto="1" ids="footnote-reference-1" refid="four">
             4
          should be 4, \n\
-        <footnote_reference auto="1" ids="id2" refid="id10">
+        <footnote_reference auto="1" ids="footnote-reference-2" refid="footnote-2">
             2
          should be 2,
-        <footnote_reference ids="id3" refid="id9">
+        <footnote_reference ids="footnote-reference-3" refid="footnote-1">
             1
          is 1, \n\
-        <footnote_reference ids="id4" refid="id11">
+        <footnote_reference ids="footnote-reference-4" refid="footnote-3">
             3
          is 3,
-        <footnote_reference auto="1" ids="id5" refid="id12">
+        <footnote_reference auto="1" ids="footnote-reference-5" refid="footnote-4">
             6
          should be 6, \n\
-        <problematic ids="id15 id6" refid="id14">
+        <problematic ids="problematic-1 footnote-reference-6" refid="system-message-1">
             [#]_
          is one too many,
-        <footnote_reference auto="1" ids="id7" refname="five">
+        <footnote_reference auto="1" ids="footnote-reference-7" refname="five">
          should be 5, and \n\
-        <footnote_reference auto="1" ids="id8" refname="eight">
+        <footnote_reference auto="1" ids="footnote-reference-8" refname="eight">
          doesn't exist.
-    <footnote backrefs="id3" ids="id9" names="1">
+    <footnote backrefs="footnote-reference-3" ids="footnote-1" names="1">
         <label>
             1
         <paragraph>
             Manually-numbered footnote 1.
-    <footnote auto="1" backrefs="id2" ids="id10" names="2">
+    <footnote auto="1" backrefs="footnote-reference-2" ids="footnote-2" names="2">
         <label>
             2
         <paragraph>
             Auto-numbered footnote 2.
-    <footnote auto="1" backrefs="id1" ids="four" names="four">
+    <footnote auto="1" backrefs="footnote-reference-1" ids="four" names="four">
         <label>
             4
         <paragraph>
             Auto-numbered footnote 4.
-    <footnote backrefs="id4" ids="id11" names="3">
+    <footnote backrefs="footnote-reference-4" ids="footnote-3" names="3">
         <label>
             3
         <paragraph>
@@ -360,20 +360,20 @@ and labelled auto-numbered footnotes:
             5
         <paragraph>
             Auto-numbered footnote 5.
-    <footnote auto="1" backrefs="id5" ids="id12" names="6">
+    <footnote auto="1" backrefs="footnote-reference-5" ids="footnote-4" names="6">
         <label>
             6
         <paragraph>
             Auto-numbered footnote 6.
-    <footnote auto="1" dupnames="five" ids="id13">
+    <footnote auto="1" dupnames="five" ids="five-1">
         <label>
             7
-        <system_message backrefs="id13" level="2" line="15" source="test data" type="WARNING">
+        <system_message backrefs="five-1" level="2" line="15" source="test data" type="WARNING">
             <paragraph>
                 Duplicate explicit target name: "five".
         <paragraph>
             Auto-numbered footnote 5 again (duplicate).
-    <system_message backrefs="id15" ids="id14" level="3" line="4" source="test data" type="ERROR">
+    <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="4" source="test data" type="ERROR">
         <paragraph>
             Too many autonumbered footnote references: only 2 corresponding footnotes available.
 """],
@@ -386,10 +386,10 @@ Referencing a footnote by symbol [*]_.
 <document source="test data">
     <paragraph>
         Referencing a footnote by symbol \n\
-        <footnote_reference auto="*" ids="id1" refid="id2">
+        <footnote_reference auto="*" ids="footnote-reference-1" refid="footnote-1">
             *
         .
-    <footnote auto="*" backrefs="id1" ids="id2">
+    <footnote auto="*" backrefs="footnote-reference-1" ids="footnote-1">
         <label>
             *
         <paragraph>
@@ -416,98 +416,98 @@ u"""\
 <document source="test data">
     <paragraph>
         A sequence of symbol footnote references:
-        <footnote_reference auto="*" ids="id1" refid="id13">
+        <footnote_reference auto="*" ids="footnote-reference-1" refid="footnote-1">
             *
          \n\
-        <footnote_reference auto="*" ids="id2" refid="id14">
+        <footnote_reference auto="*" ids="footnote-reference-2" refid="footnote-2">
             \u2020
          \n\
-        <footnote_reference auto="*" ids="id3" refid="id15">
+        <footnote_reference auto="*" ids="footnote-reference-3" refid="footnote-3">
             \u2021
          \n\
-        <footnote_reference auto="*" ids="id4" refid="id16">
+        <footnote_reference auto="*" ids="footnote-reference-4" refid="footnote-4">
             \u00A7
          \n\
-        <footnote_reference auto="*" ids="id5" refid="id17">
+        <footnote_reference auto="*" ids="footnote-reference-5" refid="footnote-5">
             \u00B6
          \n\
-        <footnote_reference auto="*" ids="id6" refid="id18">
+        <footnote_reference auto="*" ids="footnote-reference-6" refid="footnote-6">
             #
          \n\
-        <footnote_reference auto="*" ids="id7" refid="id19">
+        <footnote_reference auto="*" ids="footnote-reference-7" refid="footnote-7">
             \u2660
          \n\
-        <footnote_reference auto="*" ids="id8" refid="id20">
+        <footnote_reference auto="*" ids="footnote-reference-8" refid="footnote-8">
             \u2665
          \n\
-        <footnote_reference auto="*" ids="id9" refid="id21">
+        <footnote_reference auto="*" ids="footnote-reference-9" refid="footnote-9">
             \u2666
          \n\
-        <footnote_reference auto="*" ids="id10" refid="id22">
+        <footnote_reference auto="*" ids="footnote-reference-10" refid="footnote-10">
             \u2663
          \n\
-        <footnote_reference auto="*" ids="id11" refid="id23">
+        <footnote_reference auto="*" ids="footnote-reference-11" refid="footnote-11">
             **
          \n\
-        <footnote_reference auto="*" ids="id12" refid="id24">
+        <footnote_reference auto="*" ids="footnote-reference-12" refid="footnote-12">
             \u2020\u2020
         .
-    <footnote auto="*" backrefs="id1" ids="id13">
+    <footnote auto="*" backrefs="footnote-reference-1" ids="footnote-1">
         <label>
             *
         <paragraph>
             Auto-symbol footnote 1.
-    <footnote auto="*" backrefs="id2" ids="id14">
+    <footnote auto="*" backrefs="footnote-reference-2" ids="footnote-2">
         <label>
             \u2020
         <paragraph>
             Auto-symbol footnote 2.
-    <footnote auto="*" backrefs="id3" ids="id15">
+    <footnote auto="*" backrefs="footnote-reference-3" ids="footnote-3">
         <label>
             \u2021
         <paragraph>
             Auto-symbol footnote 3.
-    <footnote auto="*" backrefs="id4" ids="id16">
+    <footnote auto="*" backrefs="footnote-reference-4" ids="footnote-4">
         <label>
             \u00A7
         <paragraph>
             Auto-symbol footnote 4.
-    <footnote auto="*" backrefs="id5" ids="id17">
+    <footnote auto="*" backrefs="footnote-reference-5" ids="footnote-5">
         <label>
             \u00B6
         <paragraph>
             Auto-symbol footnote 5.
-    <footnote auto="*" backrefs="id6" ids="id18">
+    <footnote auto="*" backrefs="footnote-reference-6" ids="footnote-6">
         <label>
             #
         <paragraph>
             Auto-symbol footnote 6.
-    <footnote auto="*" backrefs="id7" ids="id19">
+    <footnote auto="*" backrefs="footnote-reference-7" ids="footnote-7">
         <label>
             \u2660
         <paragraph>
             Auto-symbol footnote 7.
-    <footnote auto="*" backrefs="id8" ids="id20">
+    <footnote auto="*" backrefs="footnote-reference-8" ids="footnote-8">
         <label>
             \u2665
         <paragraph>
             Auto-symbol footnote 8.
-    <footnote auto="*" backrefs="id9" ids="id21">
+    <footnote auto="*" backrefs="footnote-reference-9" ids="footnote-9">
         <label>
             \u2666
         <paragraph>
             Auto-symbol footnote 9.
-    <footnote auto="*" backrefs="id10" ids="id22">
+    <footnote auto="*" backrefs="footnote-reference-10" ids="footnote-10">
         <label>
             \u2663
         <paragraph>
             Auto-symbol footnote 10.
-    <footnote auto="*" backrefs="id11" ids="id23">
+    <footnote auto="*" backrefs="footnote-reference-11" ids="footnote-11">
         <label>
             **
         <paragraph>
             Auto-symbol footnote 11.
-    <footnote auto="*" backrefs="id12" ids="id24">
+    <footnote auto="*" backrefs="footnote-reference-12" ids="footnote-12">
         <label>
             \u2020\u2020
         <paragraph>
@@ -524,15 +524,15 @@ Duplicate manual footnote labels:
 <document source="test data">
     <paragraph>
         Duplicate manual footnote labels:
-    <footnote dupnames="1" ids="id1">
+    <footnote dupnames="1" ids="footnote-1">
         <label>
             1
         <paragraph>
             Footnote.
-    <footnote dupnames="1" ids="id2">
+    <footnote dupnames="1" ids="footnote-2">
         <label>
             1
-        <system_message backrefs="id2" level="2" line="5" source="test data" type="WARNING">
+        <system_message backrefs="footnote-2" level="2" line="5" source="test data" type="WARNING">
             <paragraph>
                 Duplicate explicit target name: "1".
         <paragraph>
diff --git a/docutils/test/test_transforms/test_hyperlinks.py b/docutils/test/test_transforms/test_hyperlinks.py
index cb388a77e..8ec258d16 100755
--- a/docutils/test/test_transforms/test_hyperlinks.py
+++ b/docutils/test/test_transforms/test_hyperlinks.py
@@ -141,13 +141,13 @@ circular_ indirect reference
 """\
 <document source="test data">
     <paragraph>
-        <problematic ids="id2" refid="id1">
+        <problematic ids="problematic-1" refid="system-message-1">
             circular_
          indirect reference
     <target ids="circular" names="circular" refid="circular">
-    <problematic ids="id3 indirect" names="indirect" refid="id1">
+    <problematic ids="problematic-2 indirect" names="indirect" refid="system-message-1">
         .. _indirect: circular_
-    <system_message backrefs="id2 id3" ids="id1" level="3" line="3" source="test data" type="ERROR">
+    <system_message backrefs="problematic-1 problematic-2" ids="system-message-1" level="3" line="3" source="test data" type="ERROR">
         <paragraph>
             Indirect hyperlink target "circular" (id="circular") refers to target "indirect", forming a circular reference.
 """],
@@ -173,25 +173,25 @@ Direct internal reference: Implicit_
             Implicit
         <paragraph>
             Duplicate implicit targets.
-    <section dupnames="implicit" ids="id1">
+    <section dupnames="implicit" ids="implicit-1">
         <title>
             Implicit
-        <system_message backrefs="id1" level="1" line="7" source="test data" type="INFO">
+        <system_message backrefs="implicit-1" level="1" line="7" source="test data" type="INFO">
             <paragraph>
                 Duplicate implicit target name: "implicit".
         <paragraph>
-            <problematic ids="id3" refid="id2">
+            <problematic ids="problematic-1" refid="system-message-1">
                 indirect_
              internal
         <target ids="indirect" names="indirect" refname="implicit">
         <paragraph>
             Direct internal reference: 
-            <problematic ids="id5" refid="id4">
+            <problematic ids="problematic-2" refid="system-message-2">
                 Implicit_
-    <system_message backrefs="id3" ids="id2" level="3" line="11" source="test data" type="ERROR">
+    <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="11" source="test data" type="ERROR">
         <paragraph>
             Indirect hyperlink target "indirect" (id="indirect") refers to target "implicit", which is a duplicate, and cannot be used as a unique reference.
-    <system_message backrefs="id5" ids="id4" level="3" line="13" source="test data" type="ERROR">
+    <system_message backrefs="problematic-2" ids="system-message-2" level="3" line="13" source="test data" type="ERROR">
         <paragraph>
             Duplicate target name, cannot be used as a unique reference: "implicit".
 """],
@@ -205,7 +205,7 @@ __ http://direct
     <paragraph>
         <reference anonymous="1" name="direct external" refuri="http://direct">
             direct external
-    <target anonymous="1" ids="id1" refuri="http://direct">
+    <target anonymous="1" ids="target-1" refuri="http://direct">
 """],
 ["""\
 `indirect external`__
@@ -218,7 +218,7 @@ __ xtarget_
     <paragraph>
         <reference anonymous="1" name="indirect external" refuri="http://indirect">
             indirect external
-    <target anonymous="1" ids="id1" refuri="http://indirect">
+    <target anonymous="1" ids="target-1" refuri="http://indirect">
     <target ids="xtarget" names="xtarget" refuri="http://indirect">
 """],
 ["""\
@@ -228,9 +228,9 @@ __
 """,
 """\
 <document source="test data">
-    <target anonymous="1" refid="id1">
-    <paragraph ids="id1">
-        <reference anonymous="1" name="direct internal" refid="id1">
+    <target anonymous="1" refid="target-1">
+    <paragraph ids="target-1">
+        <reference anonymous="1" name="direct internal" refid="target-1">
             direct internal
 """],
 ["""\
@@ -246,7 +246,7 @@ __ ztarget_
     <paragraph ids="ztarget" names="ztarget">
         <reference anonymous="1" name="indirect internal" refid="ztarget">
             indirect internal
-    <target anonymous="1" ids="id1" refid="ztarget">
+    <target anonymous="1" ids="target-1" refid="ztarget">
 """],
 ["""\
 .. _ztarget:
@@ -266,19 +266,19 @@ __ ztarget_
     <target dupnames="ztarget" refid="ztarget">
     <paragraph ids="ztarget">
         First
-    <system_message backrefs="id1" level="2" line="5" source="test data" type="WARNING">
+    <system_message backrefs="ztarget-1" level="2" line="5" source="test data" type="WARNING">
         <paragraph>
             Duplicate explicit target name: "ztarget".
-    <target dupnames="ztarget" refid="id1">
-    <paragraph ids="id1">
+    <target dupnames="ztarget" refid="ztarget-1">
+    <paragraph ids="ztarget-1">
         Second
     <paragraph>
-        <problematic ids="id4" refid="id3">
+        <problematic ids="problematic-1" refid="system-message-1">
             `indirect internal`__
-    <target anonymous="1" ids="id2" refname="ztarget">
-    <system_message backrefs="id4" ids="id3" level="3" line="11" source="test data" type="ERROR">
+    <target anonymous="1" ids="target-1" refname="ztarget">
+    <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="11" source="test data" type="ERROR">
         <paragraph>
-            Indirect hyperlink target (id="id2") refers to target "ztarget", which is a duplicate, and cannot be used as a unique reference.
+            Indirect hyperlink target (id="target-1") refers to target "ztarget", which is a duplicate, and cannot be used as a unique reference.
 """],
 ["""\
 The next anonymous hyperlink reference is parsed (and discarded) at
@@ -308,7 +308,7 @@ __ URL
     <paragraph>
         <reference anonymous="1" name="hyperlink" refuri="URL">
             hyperlink
-    <target anonymous="1" ids="id1" refuri="URL">
+    <target anonymous="1" ids="target-1" refuri="URL">
 """],
 ["""\
 An `embedded uri <http://direct>`_.
@@ -383,14 +383,14 @@ An `embedded alias <alias_>`_ with unknown reference.
 <document source="test data">
     <paragraph>
         An \n\
-        <problematic ids="id3" refid="id2">
+        <problematic ids="problematic-1" refid="system-message-2">
             `embedded alias <alias_>`_
         <target names="embedded\\ alias" refname="alias">
          with unknown reference.
-    <system_message ids="id1" level="3" line="1" source="test data" type="ERROR">
+    <system_message ids="system-message-1" level="3" line="1" source="test data" type="ERROR">
         <paragraph>
             Indirect hyperlink target "embedded alias"  refers to target "alias", which does not exist.
-    <system_message backrefs="id3" ids="id2" level="3" line="1" source="test data" type="ERROR">
+    <system_message backrefs="problematic-1" ids="system-message-2" level="3" line="1" source="test data" type="ERROR">
         <paragraph>
             Unknown target name: "alias".
     <system_message level="1" line="1" source="test data" type="INFO">
@@ -445,7 +445,7 @@ See `Element \\<a>`_, `Element <b\\>`_, and `Element <c>\\ `_.
 """\
 <document source="test data">
     <target ids="target" names="target">
-    <footnote ids="id1" names="1">
+    <footnote ids="footnote-1" names="1">
         <label>
             1
         <paragraph>
@@ -530,7 +530,7 @@ Anonymous__ and chained_ both refer to the same URI.
 """\
 <document source="test data">
     <target refid="chained">
-    <target anonymous="1" ids="id1 chained" names="chained" refuri="http://anonymous">
+    <target anonymous="1" ids="target-1 chained" names="chained" refuri="http://anonymous">
     <paragraph>
         <reference anonymous="1" name="Anonymous" refuri="http://anonymous">
             Anonymous
@@ -704,13 +704,13 @@ __
 """,
 """\
 <document source="test data">
-    <target anonymous="1" ids="id1" refuri="http://full">
-    <target anonymous="1" refid="id2">
-    <target anonymous="1" ids="id3 id2" refuri="http://simplified">
+    <target anonymous="1" ids="target-1" refuri="http://full">
+    <target anonymous="1" refid="target-2">
+    <target anonymous="1" ids="target-3 target-2" refuri="http://simplified">
     <target ids="external" names="external" refuri="http://indirect.external">
-    <target anonymous="1" ids="id4" refuri="http://indirect.external">
-    <target anonymous="1" refid="id5">
-    <paragraph ids="id5">
+    <target anonymous="1" ids="target-4" refuri="http://indirect.external">
+    <target anonymous="1" refid="target-5">
+    <paragraph ids="target-5">
         <reference anonymous="1" name="Full syntax anonymous external hyperlink reference" refuri="http://full">
             Full syntax anonymous external hyperlink reference
         ,
@@ -723,7 +723,7 @@ __
         <reference anonymous="1" name="indirect anonymous hyperlink reference" refuri="http://indirect.external">
             indirect anonymous hyperlink reference
         ,
-        <reference anonymous="1" name="internal anonymous hyperlink reference" refid="id5">
+        <reference anonymous="1" name="internal anonymous hyperlink reference" refid="target-5">
             internal anonymous hyperlink reference
         .
 """],
@@ -738,15 +738,15 @@ Duplicate external target_'s (different URIs):
 <document source="test data">
     <paragraph>
         Duplicate external \n\
-        <problematic ids="id3" refid="id2">
+        <problematic ids="problematic-1" refid="system-message-1">
             target_
         's (different URIs):
     <target dupnames="target" ids="target" refuri="first">
-    <system_message backrefs="id1" level="2" line="5" source="test data" type="WARNING">
+    <system_message backrefs="target-1" level="2" line="5" source="test data" type="WARNING">
         <paragraph>
             Duplicate explicit target name: "target".
-    <target dupnames="target" ids="id1" refuri="second">
-    <system_message backrefs="id3" ids="id2" level="3" line="1" source="test data" type="ERROR">
+    <target dupnames="target" ids="target-1" refuri="second">
+    <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="1" source="test data" type="ERROR">
         <paragraph>
             Duplicate target name, cannot be used as a unique reference: "target".
 """],
@@ -762,10 +762,10 @@ Duplicate external targets (different URIs) without reference:
     <paragraph>
         Duplicate external targets (different URIs) without reference:
     <target dupnames="target" ids="target" refuri="first">
-    <system_message backrefs="id1" level="2" line="5" source="test data" type="WARNING">
+    <system_message backrefs="target-1" level="2" line="5" source="test data" type="WARNING">
         <paragraph>
             Duplicate explicit target name: "target".
-    <target dupnames="target" ids="id1" refuri="second">
+    <target dupnames="target" ids="target-1" refuri="second">
 """],
 ["""\
 Several__ anonymous__ hyperlinks__, but not enough targets.
@@ -775,17 +775,17 @@ __ http://example.org
 """\
 <document source="test data">
     <paragraph>
-        <problematic ids="id3" refid="id2">
+        <problematic ids="problematic-1" refid="system-message-1">
             Several__
          \n\
-        <problematic ids="id4" refid="id2">
+        <problematic ids="problematic-2" refid="system-message-1">
             anonymous__
          \n\
-        <problematic ids="id5" refid="id2">
+        <problematic ids="problematic-3" refid="system-message-1">
             hyperlinks__
         , but not enough targets.
-    <target anonymous="1" ids="id1" refuri="http://example.org">
-    <system_message backrefs="id3 id4 id5" ids="id2" level="3" source="test data" type="ERROR">
+    <target anonymous="1" ids="target-1" refuri="http://example.org">
+    <system_message backrefs="problematic-1 problematic-2 problematic-3" ids="system-message-1" level="3" source="test data" type="ERROR">
         <paragraph>
             Anonymous hyperlink mismatch: 3 references but 1 targets.
             See "backrefs" attribute for IDs.
@@ -833,11 +833,11 @@ Testing an `indirect reference to the table of contents`_.
         <bullet_list>
             <list_item>
                 <paragraph>
-                    <reference ids="id1" refid="section">
+                    <reference ids="toc-entry-1" refid="section">
                         Section
     <target ids="indirect-reference-to-the-table-of-contents" names="indirect\\ reference\\ to\\ the\\ table\\ of\\ contents" refid="table-of-contents">
     <section ids="section" names="section">
-        <title refid="id1">
+        <title refid="toc-entry-1">
             Section
         <paragraph>
             Testing an 
@@ -896,10 +896,10 @@ Unknown reference_.
 <document source="test data">
     <paragraph>
         Unknown \n\
-        <problematic ids="id2" refid="id1">
+        <problematic ids="problematic-1" refid="system-message-1">
             reference_
         .
-    <system_message backrefs="id2" ids="id1" level="3" line="1" source="test data" type="ERROR">
+    <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="1" source="test data" type="ERROR">
         <paragraph>
             Unknown target name: "reference".
 """],
@@ -914,23 +914,23 @@ Duplicate manual footnote labels, with reference ([1]_):
 <document source="test data">
     <paragraph>
         Duplicate manual footnote labels, with reference (
-        <problematic ids="id1" refid="id4">
+        <problematic ids="footnote-reference-1" refid="system-message-1">
             [1]_
         ):
-    <footnote dupnames="1" ids="id2">
+    <footnote dupnames="1" ids="footnote-1">
         <label>
             1
         <paragraph>
             Footnote.
-    <footnote dupnames="1" ids="id3">
+    <footnote dupnames="1" ids="footnote-2">
         <label>
             1
-        <system_message backrefs="id3" level="2" line="5" source="test data" type="WARNING">
+        <system_message backrefs="footnote-2" level="2" line="5" source="test data" type="WARNING">
             <paragraph>
                 Duplicate explicit target name: "1".
         <paragraph>
             Footnote.
-    <system_message backrefs="id1" ids="id4" level="3" line="1" source="test data" type="ERROR">
+    <system_message backrefs="footnote-reference-1" ids="system-message-1" level="3" line="1" source="test data" type="ERROR">
         <paragraph>
             Duplicate target name, cannot be used as a unique reference: "1".
 """],
diff --git a/docutils/test/test_transforms/test_messages.py b/docutils/test/test_transforms/test_messages.py
index dcb540a0a..7a315bc05 100755
--- a/docutils/test/test_transforms/test_messages.py
+++ b/docutils/test/test_transforms/test_messages.py
@@ -38,7 +38,7 @@ document by the test framework.)
 <document source="test data">
     <paragraph>
         This \n\
-        <problematic ids="id2" refid="id1">
+        <problematic ids="problematic-1" refid="system-message-1">
             |unknown substitution|
          will generate a system message, thanks to
         the \n\
@@ -55,7 +55,7 @@ document by the test framework.)
     <section classes="system-messages">
         <title>
             Docutils System Messages
-        <system_message backrefs="id2" ids="id1" level="3" line="1" source="test data" type="ERROR">
+        <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="1" source="test data" type="ERROR">
             <paragraph>
                 Undefined substitution referenced: "unknown substitution".
 """],
diff --git a/docutils/test/test_transforms/test_peps.py b/docutils/test/test_transforms/test_peps.py
index 7f17ea69c..5057f83ca 100755
--- a/docutils/test/test_transforms/test_peps.py
+++ b/docutils/test/test_transforms/test_peps.py
@@ -48,14 +48,14 @@ A "References" section should be generated.
         <reference name="reference" refname="reference">
             reference
          \n\
-        <footnote_reference auto="1" ids="id3" refname="TARGET_NOTE: id2">
+        <footnote_reference auto="1" ids="footnote-reference-1" refname="TARGET_NOTE: footnote-1">
         .
         A "References" section should be generated.
     <target ids="reference" names="reference" refuri="http://www.example.org">
-    <section ids="id1">
+    <section ids="section-1">
         <title>
             References
-        <footnote auto="1" ids="id2" names="TARGET_NOTE:\\ id2">
+        <footnote auto="1" ids="footnote-1" names="TARGET_NOTE:\\ footnote-1">
             <paragraph>
                 <reference refuri="http://www.example.org">
                     http://www.example.org
diff --git a/docutils/test/test_transforms/test_sectnum.py b/docutils/test/test_transforms/test_sectnum.py
index 3f80b61f8..c2b3ac1bf 100755
--- a/docutils/test/test_transforms/test_sectnum.py
+++ b/docutils/test/test_transforms/test_sectnum.py
@@ -170,49 +170,49 @@ u"""\
         <bullet_list classes="auto-toc">
             <list_item>
                 <paragraph>
-                    <reference ids="id1" refid="title-1">
+                    <reference ids="toc-entry-1" refid="title-1">
                         <generated classes="sectnum">
                             1\u00a0\u00a0\u00a0
                         Title 1
                 <bullet_list classes="auto-toc">
                     <list_item>
                         <paragraph>
-                            <reference ids="id2" refid="title-2">
+                            <reference ids="toc-entry-2" refid="title-2">
                                 <generated classes="sectnum">
                                     1.1\u00a0\u00a0\u00a0
                                 Title 2
                         <bullet_list>
                             <list_item>
                                 <paragraph>
-                                    <reference ids="id3" refid="title-3">
+                                    <reference ids="toc-entry-3" refid="title-3">
                                         Title 3
                     <list_item>
                         <paragraph>
-                            <reference ids="id4" refid="title-4">
+                            <reference ids="toc-entry-4" refid="title-4">
                                 <generated classes="sectnum">
                                     1.2\u00a0\u00a0\u00a0
                                 Title 4
     <section ids="title-1" names="title\\ 1">
-        <title auto="1" refid="id1">
+        <title auto="1" refid="toc-entry-1">
             <generated classes="sectnum">
                 1\u00a0\u00a0\u00a0
             Title 1
         <paragraph>
             Paragraph 1.
         <section ids="title-2" names="title\\ 2">
-            <title auto="1" refid="id2">
+            <title auto="1" refid="toc-entry-2">
                 <generated classes="sectnum">
                     1.1\u00a0\u00a0\u00a0
                 Title 2
             <paragraph>
                 Paragraph 2.
             <section ids="title-3" names="title\\ 3">
-                <title refid="id3">
+                <title refid="toc-entry-3">
                     Title 3
                 <paragraph>
                     Paragraph 3.
         <section ids="title-4" names="title\\ 4">
-            <title auto="1" refid="id4">
+            <title auto="1" refid="toc-entry-4">
                 <generated classes="sectnum">
                     1.2\u00a0\u00a0\u00a0
                 Title 4
diff --git a/docutils/test/test_transforms/test_smartquotes.py b/docutils/test/test_transforms/test_smartquotes.py
index 1ed8880b5..5a8a3c175 100644
--- a/docutils/test/test_transforms/test_smartquotes.py
+++ b/docutils/test/test_transforms/test_smartquotes.py
@@ -335,7 +335,7 @@ u"""\
         .
     <paragraph>
         Test around inline elements:
-        <footnote_reference auto="*" ids="id1">
+        <footnote_reference auto="*" ids="footnote-reference-1">
     <paragraph>
         <emphasis>
             emphasized
@@ -355,7 +355,7 @@ u"""\
             O and \n\
             <math>
                 x^2
-        <footnote auto="*" ids="id2">
+        <footnote auto="*" ids="footnote-1">
             <paragraph>
                 and footnotes
 """],
diff --git a/docutils/test/test_transforms/test_substitution_expansion_length_limit.py b/docutils/test/test_transforms/test_substitution_expansion_length_limit.py
index 3023182a8..43c83a15a 100644
--- a/docutils/test/test_transforms/test_substitution_expansion_length_limit.py
+++ b/docutils/test/test_transforms/test_substitution_expansion_length_limit.py
@@ -56,10 +56,10 @@ The billion laughs attack for ReStructuredText:
     <paragraph>
         lol
          \n\
-        <problematic ids="id2" refid="id1">
+        <problematic ids="problematic-1" refid="system-message-1">
             |c|
          continuation text
-    <system_message backrefs="id2" ids="id1" level="3" line="9" source="test data" type="ERROR">
+    <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="9" source="test data" type="ERROR">
         <paragraph>
             Substitution definition "c" exceeds the line-length-limit.
 """.format(b, c)],
diff --git a/docutils/test/test_transforms/test_substitutions.py b/docutils/test/test_transforms/test_substitutions.py
index 1bb0634d2..abad8c311 100755
--- a/docutils/test/test_transforms/test_substitutions.py
+++ b/docutils/test/test_transforms/test_substitutions.py
@@ -46,10 +46,10 @@ Here's an |unknown| substitution.
 <document source="test data">
     <paragraph>
         Here's an \n\
-        <problematic ids="id2" refid="id1">
+        <problematic ids="problematic-1" refid="system-message-1">
             |unknown|
          substitution.
-    <system_message backrefs="id2" ids="id1" level="3" line="1" source="test data" type="ERROR">
+    <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="1" source="test data" type="ERROR">
         <paragraph>
             Undefined substitution referenced: "unknown".
 """],
@@ -205,28 +205,28 @@ Use |sub| and |indirect1| and |sub| again (and |sub| one more time).
             .. |sub| replace:: |indirect1|
     <paragraph>
         Use \n\
-        <problematic ids="id8" refid="id7">
+        <problematic ids="problematic-4" refid="system-message-4">
             |Sub|
          and \n\
-        <problematic ids="id2" refid="id1">
+        <problematic ids="problematic-1" refid="system-message-1">
             |indirect1|
          and \n\
-        <problematic ids="id4" refid="id3">
+        <problematic ids="problematic-2" refid="system-message-2">
             |sub|
          again (and \n\
-        <problematic ids="id6" refid="id5">
+        <problematic ids="problematic-3" refid="system-message-3">
             |sub|
          one more time).
-    <system_message backrefs="id2" ids="id1" level="3" line="5" source="test data" type="ERROR">
+    <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="5" source="test data" type="ERROR">
         <paragraph>
             Circular substitution definition referenced: "indirect1".
-    <system_message backrefs="id4" ids="id3" level="3" line="5" source="test data" type="ERROR">
+    <system_message backrefs="problematic-2" ids="system-message-2" level="3" line="5" source="test data" type="ERROR">
         <paragraph>
             Circular substitution definition referenced: "sub".
-    <system_message backrefs="id6" ids="id5" level="3" line="5" source="test data" type="ERROR">
+    <system_message backrefs="problematic-3" ids="system-message-3" level="3" line="5" source="test data" type="ERROR">
         <paragraph>
             Circular substitution definition referenced: "sub".
-    <system_message backrefs="id8" ids="id7" level="3" line="5" source="test data" type="ERROR">
+    <system_message backrefs="problematic-4" ids="system-message-4" level="3" line="5" source="test data" type="ERROR">
         <paragraph>
             Circular substitution definition referenced: "Sub".
 """],
@@ -347,9 +347,9 @@ Make sure this substitution definition is not registered: |target|
             .. |target| replace:: _`target`
     <paragraph>
         Make sure this substitution definition is not registered: \n\
-        <problematic ids="id2" refid="id1">
+        <problematic ids="problematic-1" refid="system-message-1">
             |target|
-    <system_message backrefs="id2" ids="id1" level="3" line="5" source="test data" type="ERROR">
+    <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="5" source="test data" type="ERROR">
         <paragraph>
             Undefined substitution referenced: "target".
 """],
diff --git a/docutils/test/test_transforms/test_target_notes.py b/docutils/test/test_transforms/test_target_notes.py
index cfd22a858..21d4d6b43 100755
--- a/docutils/test/test_transforms/test_target_notes.py
+++ b/docutils/test/test_transforms/test_target_notes.py
@@ -47,9 +47,9 @@ A reference to a target_.
         <reference name="target" refuri="http://example.org">
             target
          \n\
-        <footnote_reference auto="1" ids="id2" refid="id1">
+        <footnote_reference auto="1" ids="footnote-reference-1" refid="footnote-1">
         .
-    <footnote auto="1" ids="id1" names="TARGET_NOTE:\\ id1">
+    <footnote auto="1" ids="footnote-1" names="TARGET_NOTE:\\ footnote-1">
         <paragraph>
             <reference refuri="http://example.org">
                 http://example.org
@@ -70,9 +70,9 @@ A reference to a target_.
             target
         <inline classes="custom">
              \n\
-        <footnote_reference auto="1" classes="custom" ids="id2" refid="id1">
+        <footnote_reference auto="1" classes="custom" ids="footnote-reference-1" refid="footnote-1">
         .
-    <footnote auto="1" ids="id1" names="TARGET_NOTE:\\ id1">
+    <footnote auto="1" ids="footnote-1" names="TARGET_NOTE:\\ footnote-1">
         <paragraph>
             <reference refuri="http://example.org">
                 http://example.org