diff --git a/question/type/calculated/db/install.xml b/question/type/calculated/db/install.xml
index 2ff9edad0b4..a4eebafb15c 100644
--- a/question/type/calculated/db/install.xml
+++ b/question/type/calculated/db/install.xml
@@ -13,7 +13,7 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
-        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
+        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="question" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
       <INDEXES>
         <INDEX NAME="answer" UNIQUE="false" FIELDS="answer"/>
diff --git a/question/type/match/db/install.xml b/question/type/match/db/install.xml
index f02bbec0756..39eb05114d7 100644
--- a/question/type/match/db/install.xml
+++ b/question/type/match/db/install.xml
@@ -10,7 +10,7 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
-        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
+        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="question" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
     <TABLE NAME="question_match_sub" COMMENT="Defines the subquestions that make up a matching question" PREVIOUS="question_match">
@@ -23,7 +23,7 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
-        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
+        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="question" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>
diff --git a/question/type/multianswer/db/install.xml b/question/type/multianswer/db/install.xml
index 90f056f9949..2b1f27054d3 100644
--- a/question/type/multianswer/db/install.xml
+++ b/question/type/multianswer/db/install.xml
@@ -9,7 +9,7 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
-        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
+        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="question" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>
diff --git a/question/type/multichoice/db/install.xml b/question/type/multichoice/db/install.xml
index 8c327284672..0c3183a7184 100644
--- a/question/type/multichoice/db/install.xml
+++ b/question/type/multichoice/db/install.xml
@@ -19,7 +19,7 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
-        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
+        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="question" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>
diff --git a/question/type/numerical/db/install.xml b/question/type/numerical/db/install.xml
index 7c350d58934..81223fd3e62 100644
--- a/question/type/numerical/db/install.xml
+++ b/question/type/numerical/db/install.xml
@@ -10,7 +10,7 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
-        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
+        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="question" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
       <INDEXES>
         <INDEX NAME="answer" UNIQUE="false" FIELDS="answer"/>
diff --git a/question/type/randomsamatch/db/install.xml b/question/type/randomsamatch/db/install.xml
index b1f93e815b8..9500076eed6 100644
--- a/question/type/randomsamatch/db/install.xml
+++ b/question/type/randomsamatch/db/install.xml
@@ -9,7 +9,7 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
-        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
+        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="question" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>
diff --git a/question/type/shortanswer/db/install.xml b/question/type/shortanswer/db/install.xml
index 086e6f92440..f6e40303490 100644
--- a/question/type/shortanswer/db/install.xml
+++ b/question/type/shortanswer/db/install.xml
@@ -10,7 +10,7 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
-        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
+        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="question" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>
diff --git a/question/type/truefalse/db/install.xml b/question/type/truefalse/db/install.xml
index b31563e9625..8e259f13fe1 100644
--- a/question/type/truefalse/db/install.xml
+++ b/question/type/truefalse/db/install.xml
@@ -10,7 +10,7 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="question"/>
-        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="questions" REFFIELDS="id" PREVIOUS="primary"/>
+        <KEY NAME="question" TYPE="foreign" FIELDS="question" REFTABLE="question" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
     </TABLE>
   </TABLES>