diff --git a/Generator/AdminSettingsForm.php b/Generator/AdminSettingsForm.php
index <HASH>..<HASH> 100644
--- a/Generator/AdminSettingsForm.php
+++ b/Generator/AdminSettingsForm.php
@@ -52,4 +52,14 @@ class AdminSettingsForm extends Form {
     return $functions;
   }
 
+  /**
+   * The name of the form.
+   *
+   * This allows subclasses to change this easily.
+   */
+  protected function getFormName() {
+    $base_component_name = $this->base_component->getComponentSystemName();
+    return "{$base_component_name}_settings_form";
+  }
+
 }
diff --git a/Generator/Form.php b/Generator/Form.php
index <HASH>..<HASH> 100644
--- a/Generator/Form.php
+++ b/Generator/Form.php
@@ -67,10 +67,22 @@ class Form extends BaseGenerator {
   }
 
   /**
+   * The name of the form.
+   *
+   * This allows subclasses to change this easily.
+   *
+   * @return
+   *  The machine name of the form, i.e., the name of the form builder function.
+   */
+  protected function getFormName() {
+    return $this->name;
+  }
+
+  /**
    * Called by ModuleCodeFile to collect functions from its child components.
    */
   public function componentFunctions() {
-    $form_builder   = $this->name;
+    $form_builder   = $this->getFormName();
     $form_validate  = $form_builder . '_validate';
     $form_submit    = $form_builder . '_submit';
Fixed AdminSettingsForm component using the wrong form builder name.