diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 65b662f0a..07f3423ba 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -9,6 +9,9 @@
  - fixed #9779: Gallery: js for search (datepicker?) included in album view
  - fixed #9783: payment methods are not added
  - fixed #9785: Delete All button not working in Account/Inbox [TEMPLATE]
+ - fixed #9803: Survey 2.0- Gradebook spelled wrong
+ - fixed #9801: Survey 2.0- Template spelled wrong
+ - fixed #9802: Survey Template field names to be consistent
 
 7.6.12
  - fixed: During postback on a recurring transaction, the routine could error out instead of catching an error.
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index d06cb4054..d7c325389 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -98,70 +98,80 @@ sub definition {
         maxResponsesPerUser => {
             fieldType    => 'integer',
             defaultValue => 1,
-            label        => 'Max user reponses',
+            label        => $i18n->get('Max user responses'),
+            hoverHelp    => $i18n->get('Max user responses help'),
         },
         overviewTemplateId => {
             tab          => 'display',
             fieldType    => 'template',
             defaultValue => 'PBtmpl0000000000000063',
-            label        => 'Overview template id',
             namespace    => 'Survey/Overview',
+            label        => $i18n->get('Survey Overview Template'),
+            hoverhelp    => $i18n->get('Survey Overview Template help'),
         },
         gradebookTemplateId => {
             tab          => 'display',
             fieldType    => 'template',
-            label        => 'Grabebook template id',
             defaultValue => 'PBtmpl0000000000000062',
             namespace    => 'Survey/Gradebook',
+            label        => $i18n->get('Gradebook Template'),
+            hoverhelp    => $i18n->get('Gradebook Template help'),
         },
         responseTemplateId => {
             tab          => 'display',
             fieldType    => 'template',
-            label        => 'Response template id',
             defaultValue => 'PBtmpl0000000000000064',
             namespace    => 'Survey/Response',
+            label        => $i18n->get('Response Template'),
+            label        => $i18n->get('Response Template help'),
         },
         surveyEditTemplateId => {
             tab          => 'display',
             fieldType    => 'template',
-            label        => 'Survey edit template id',
             defaultValue => 'GRUNFctldUgop-qRLuo_DA',
             namespace    => 'Survey/Edit',
+            label        => $i18n->get('Edit Survey Template'),
+            hoverhelp    => $i18n->get('Edit Survey Template help'),
         },
         surveyTakeTemplateId => {
             tab          => 'display',
             fieldType    => 'template',
-            label        => 'Take survey template id',
             defaultValue => 'd8jMMMRddSQ7twP4l1ZSIw',
             namespace    => 'Survey/Take',
+            label        => $i18n->get('Take Survey Template'),
+            hoverhelp    => $i18n->get('Take Survey Template help'),
         },
         surveyQuestionsId => {
             tab          => 'display',
             fieldType    => 'template',
-            label        => 'Questions template id',
             defaultValue => 'CxMpE_UPauZA3p8jdrOABw',
             namespace    => 'Survey/Take',
+            label        => 'Questions Template',
+            hoverhelp    => 'Questions Template help',
         },
         sectionEditTemplateId => {
             tab          => 'display',
             fieldType    => 'template',
-            label        => 'Section Edit Tempalte',
             defaultValue => '1oBRscNIcFOI-pETrCOspA',
             namespace    => 'Survey/Edit',
+            label        => 'Section Edit Template',
+            hoverhelp    => 'Section Edit Template help',
         },
         questionEditTemplateId => {
             tab          => 'display',
             fieldType    => 'template',
-            label        => 'Question Edit Tempalte',
             defaultValue => 'wAc4azJViVTpo-2NYOXWvg',
             namespace    => 'Survey/Edit',
+            label        => 'Question Edit Template',
+            hoverhelp    => 'Question Edit Template help',
         },
         answerEditTemplateId => {
             tab          => 'display',
             fieldType    => 'template',
-            label        => 'Answer Edit Tempalte',
             defaultValue => 'AjhlNO3wZvN5k4i4qioWcg',
             namespace    => 'Survey/Edit',
+            label        => 'Answer Edit Template',
+            hoverhelp    => 'Answer Edit Template help',
         },
     );
 
diff --git a/lib/WebGUI/i18n/English/Asset_Survey.pm b/lib/WebGUI/i18n/English/Asset_Survey.pm
index 007dd0529..067545465 100644
--- a/lib/WebGUI/i18n/English/Asset_Survey.pm
+++ b/lib/WebGUI/i18n/English/Asset_Survey.pm
@@ -490,6 +490,116 @@ our $I18N = {
         lastUpdated => 1233714385,
     },
 
+    'Max user responses' => {
+        message => q|Max user responses|,
+        context => q|The maximum number of times a user may take this survey.|,
+        lastUpdated => 0
+    },
+
+    'Max user responses help' => {
+        message => q|The maximum number of times a user may take this survey.|,
+        lastUpdated => 0
+    },
+
+    'Survey Overview Template' => {
+        message => q|Survey Overview Template|,
+        context => q|The template that provides an overview of the survey.|,
+        lastUpdated => 0
+    },
+
+    'Survey Overview Template help' => {
+        message => q|The template that provides an overview of the survey.|,
+        lastUpdated => 0
+    },
+
+    'Gradebook Template' => {
+        message => q|Gradebook Template|,
+        context => q|The template for displaying the gradebook.|,
+        lastUpdated => 0
+    },
+
+    'Gradebook Template help' => {
+        message => q|The template for displaying the gradebook.|,
+        lastUpdated => 0
+    },
+
+    'Response Template' => {
+        message => q|Response Template|,
+        context => q|The template for displaying responses to the survey.|,
+        lastUpdated => 0
+    },
+
+    'Response Template help' => {
+        message => q|The template for displaying responses to the survey.|,
+        lastUpdated => 0
+    },
+
+    'Edit Survey Template' => {
+        message => q|Edit Survey Template|,
+        context => q|The template for displaying the screen for editing the survey.|,
+        lastUpdated => 0
+    },
+
+    'Edit Survey Template help' => {
+        message => q|The template for displaying the screen for editing the survey.|,
+        lastUpdated => 0
+    },
+
+    'Take Survey Template' => {
+        message => q|Take Survey Template|,
+        context => q|The template for displaying the screen where a user takes the survey.|,
+        lastUpdated => 0
+    },
+
+    'Take Survey Template help' => {
+        message => q|The template for displaying the screen where a user takes the survey.|,
+        lastUpdated => 0
+    },
+
+    'Questions Template' => {
+        message => q|Questions Template|,
+        context => q|The template for rendering questions in the survey.|,
+        lastUpdated => 0
+    },
+
+    'Questions Template help' => {
+        message => q|The template for rendering questions in the survey.|,
+        lastUpdated => 0
+    },
+
+    'Section Edit Template' => {
+        message => q|Section Edit Template|,
+        context => q|The template for adding or editing sections.|,
+        lastUpdated => 0
+    },
+
+    'Section Edit Template help' => {
+        message => q|The template for adding or editing sections.|,
+        lastUpdated => 0
+    },
+
+    'Question Edit Template' => {
+        message => q|Question Edit Template|,
+        context => q|The template for adding or editing questions.|,
+        lastUpdated => 0
+    },
+
+    'Question Edit Template help' => {
+        message => q|The template for adding or editing questions.|,
+        lastUpdated => 0
+    },
+
+    'Answer Edit Template' => {
+        message => q|Answer Edit Template|,
+        context => q|The template for adding or editing answers.|,
+        lastUpdated => 0
+    },
+
+    'Answer Edit Template help' => {
+        message => q|The template for adding or editing answers.|,
+        lastUpdated => 0
+    },
+
     'percentage label' => {
         message => q|Percentage|,
         context => q|Label for the Percentage column on the gradebook screen.|,