4 files changed, 7 insertions, 6 deletions
diff --git a/core/helpers/album.php b/core/helpers/album.php
index 223a057d..5fd64442 100644
--- a/core/helpers/album.php
+++ b/core/helpers/album.php
@@ -64,7 +64,7 @@ class album_Core {
   }
 
   static function get_add_form($parent) {
-    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAddAlbumForm"));
+    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAdd_Album_Form"));
     $group = $form->group("add_album")->label(t("Add Album to %album_title", array("album_title" => $parent->title)));
     $group->input("name")->label(t("Name"));
     $group->input("title")->label(t("Title"));
@@ -76,7 +76,7 @@ class album_Core {
   }
 
   static function get_edit_form($parent) {
-    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
+    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEdit_Album_Form"));
     $form->hidden("_method")->value("put");
     $group = $form->group("edit_album")->label(t("Edit Album"));
     if ($parent->id != 1) {
diff --git a/core/helpers/core_block.php b/core/helpers/core_block.php
index af08c2c2..1645133c 100644
--- a/core/helpers/core_block.php
+++ b/core/helpers/core_block.php
@@ -83,7 +83,8 @@ class core_block_Core {
   }
 
   static function get_add_block_form() {
-    $form = new Forge("admin/dashboard/add_block", "", "post");
+    $form = new Forge("admin/dashboard/add_block", "", "post",
+                      array("id" => "gAdd_Dashboard_Block_Form"));
     $group = $form->group("add_block")->label(t("Add Block"));
     $group->dropdown("id")->label("Available Blocks")->options(block_manager::get_available());
     $group->submit("center")->value(t("Add to center"));
diff --git a/core/helpers/photo.php b/core/helpers/photo.php
index a2958aec..2b653481 100644
--- a/core/helpers/photo.php
+++ b/core/helpers/photo.php
@@ -96,7 +96,7 @@ class photo_Core {
   }
 
   static function get_add_form($parent) {
-    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAddPhotoForm"));
+    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gAdd_Photo_Form"));
     $group = $form->group("add_photo")->label(t("Add Photo to %album_title", array("album_title" =>$parent->title)));
     $group->input("name")->label(t("Name"));
     $group->input("title")->label(t("Title"));
@@ -109,7 +109,7 @@ class photo_Core {
   }
 
   static function get_edit_form($photo) {
-    $form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
+    $form = new Forge("photos/$photo->id", "", "post", array("id" => "gEdit_Photo_Form"));
     $form->hidden("_method")->value("put");
     $group = $form->group("edit_photo")->label(t("Edit Photo"));
     $group->input("name")->label(t("Name"))->value($photo->name);
diff --git a/core/helpers/theme.php b/core/helpers/theme.php
index a2766028..40acf195 100644
--- a/core/helpers/theme.php
+++ b/core/helpers/theme.php
@@ -39,7 +39,7 @@ class theme_Core {
   }
 
   static function get_edit_form_admin() {
-    $form = new Forge("admin/themedetails/save/", "", null, array("id" =>"gThemeDetailsForm"));
+    $form = new Forge("admin/themedetails/save/", "", null, array("id" =>"gTheme_Details_Form"));
     $group = $form->group("edit_theme");
     $group->input("page_size")->label(t("Items per page"))->id("gPageSize")->
       rules('required|valid_digit')->