Fixes #2921: converted internalname => name and internalid => id

git-svn-id: http://code.elgg.org/elgg/trunk@8249 36083f99-b078-4883-b0ff-0f9b5a30f544

19 files changed, 64 insertions, 64 deletions

diff --git a/views/default/forms/admin/menu/save.php b/views/default/forms/admin/menu/save.php
index 4025117f8..2cafaa89b 100644
--- a/views/default/forms/admin/menu/save.php
+++ b/views/default/forms/admin/menu/save.php
@@ -39,7 +39,7 @@ for ($i=0; $i<6; $i++) {
 
 	echo elgg_view('input/dropdown', array(
 		'options_values' => $dropdown_values,
-		'internalname' => 'featured_menu_names[]',
+		'name' => 'featured_menu_names[]',
 		'value' => $current_value
 	));
 }
@@ -67,12 +67,12 @@ echo '<ul class="elgg-simple-list">';
 if (is_array($custom_items)) {
 	foreach ($custom_items as $title => $url) {
 		$name_input = elgg_view('input/text', array(
-			'internalname' => 'custom_menu_titles[]',
+			'name' => 'custom_menu_titles[]',
 			'value' => $title
 		));
 
 		$url_input = elgg_view('input/text', array(
-			'internalname' => 'custom_menu_urls[]',
+			'name' => 'custom_menu_urls[]',
 			'value' => $url
 		));
 
@@ -82,11 +82,11 @@ if (is_array($custom_items)) {
 
 $new = elgg_echo('new');
 $name_input = elgg_view('input/text', array(
-	'internalname' => 'custom_menu_titles[]',
+	'name' => 'custom_menu_titles[]',
 ));
 
 $url_input = elgg_view('input/text', array(
-	'internalname' => 'custom_menu_urls[]',
+	'name' => 'custom_menu_urls[]',
 ));
 
 echo "<li class='custom_menuitem'>$name_str: $name_input $url_str: $url_input</li>
diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php
index af41002e9..d3ae5e250 100644
--- a/views/default/forms/admin/site/update_advanced.php
+++ b/views/default/forms/admin/site/update_advanced.php
@@ -12,32 +12,32 @@ foreach (array('wwwroot', 'path', 'dataroot', 'view') as $field) {
 		echo "<b>" . $warning . "</b><br />";
 	}
 	$value = elgg_get_config($field);
-	$form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));
+	$form_body .= elgg_view("input/text",array('name' => $field, 'value' => $value));
 	$form_body .= "</div>";
 }
 
 $form_body .= "<div>" . elgg_echo('admin:site:access:warning') . "<br />";
 $form_body .= elgg_echo('installation:sitepermissions');
 $form_body .= elgg_view('input/access', array(
-	'internalname' => 'default_access',
+	'name' => 'default_access',
 	'value' => elgg_get_config('default_access'),
 )) . "</div>";
 $form_body .= "<div>" . elgg_echo('installation:allow_user_default_access:description') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
 	'options' => array(elgg_echo('installation:allow_user_default_access:label')),
-	'internalname' => 'allow_user_default_access',
+	'name' => 'allow_user_default_access',
 	'value' => (elgg_get_config('allow_user_default_access') ? elgg_echo('installation:allow_user_default_access:label') : ""),
 )) . "</div>";
 $form_body .= "<div>" . elgg_echo('installation:simplecache:description') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
 	'options' => array(elgg_echo('installation:simplecache:label')),
-	'internalname' => 'simplecache_enabled',
+	'name' => 'simplecache_enabled',
 	'value' => (elgg_get_config('simplecache_enabled') ? elgg_echo('installation:simplecache:label') : ""),
 )) . "</div>";
 $form_body .= "<div>" . elgg_echo('installation:viewpathcache:description') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
 	'options' => array(elgg_echo('installation:viewpathcache:label')),
-	'internalname' => 'viewpath_cache_enabled',
+	'name' => 'viewpath_cache_enabled',
 	'value' => (elgg_get_config('viewpath_cache_enabled') ? elgg_echo('installation:viewpathcache:label') : ""),
 )) . "</div>";
 
@@ -45,7 +45,7 @@ $debug_options = array('0' => elgg_echo('installation:debug:none'), 'ERROR' => e
 $form_body .= "<div>" . elgg_echo('installation:debug');
 $form_body .= elgg_view('input/dropdown', array(
 	'options_values' => $debug_options,
-	'internalname' => 'debug',
+	'name' => 'debug',
 	'value' => elgg_get_config('debug'),
 ));
 $form_body .= '</div>';
@@ -53,7 +53,7 @@ $form_body .= '</div>';
 // control new user registration
 $options = array(
 	'options' => array(elgg_echo('installation:registration:label')),
-	'internalname' => 'allow_registration',
+	'name' => 'allow_registration',
 	'value' => elgg_get_config('allow_registration') ? elgg_echo('installation:registration:label') : '',
 );
 $form_body .= '<div>' . elgg_echo('installation:registration:description');
@@ -63,7 +63,7 @@ $form_body .= '<br />' .elgg_view('input/checkboxes', $options) . '</div>';
 $walled_garden = elgg_get_config(walled_garden);
 $options = array(
 	'options' => array(elgg_echo('installation:walled_garden:label')),
-	'internalname' => 'walled_garden',
+	'name' => 'walled_garden',
 	'value' => $walled_garden ? elgg_echo('installation:walled_garden:label') : '',
 );
 $form_body .= '<div>' . elgg_echo('installation:walled_garden:description');
@@ -72,7 +72,7 @@ $form_body .= '<br />' . elgg_view('input/checkboxes', $options) . '</div>';
 $form_body .= "<div>" . elgg_echo('installation:httpslogin') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
 	'options' => array(elgg_echo('installation:httpslogin:label')),
-	'internalname' => 'https_login',
+	'name' => 'https_login',
 	'value' => (elgg_get_config('https_login') ? elgg_echo('installation:httpslogin:label') : "")
 )) . "</div>";
 
@@ -84,12 +84,12 @@ if ($disable_api) {
 }
 $form_body .= elgg_view("input/checkboxes", array(
 	'options' => array(elgg_echo('installation:disableapi:label')),
-	'internalname' => 'api',
+	'name' => 'api',
 	'value' => $on,
 ));
 $form_body .= "</div>";
 
-$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
+$form_body .= elgg_view('input/hidden', array('name' => 'settings', 'value' => 'go'));
 
 $form_body .= '<div class="bta">';
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
diff --git a/views/default/forms/admin/site/update_basic.php b/views/default/forms/admin/site/update_basic.php
index e9e2e6c13..eb4218810 100644
--- a/views/default/forms/admin/site/update_basic.php
+++ b/views/default/forms/admin/site/update_basic.php
@@ -12,14 +12,14 @@ foreach (array('sitename','sitedescription', 'siteemail') as $field) {
 		echo "<b>" . $warning . "</b><br />";
 	}
 	$value = elgg_get_config($field);
-	$form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));
+	$form_body .= elgg_view("input/text",array('name' => $field, 'value' => $value));
 	$form_body .= "</div>";
 }
 
 $languages = get_installed_translations();
 $form_body .= "<div>" . elgg_echo('installation:language');
 $form_body .= elgg_view("input/dropdown", array(
-	'internalname' => 'language',
+	'name' => 'language',
 	'value' => elgg_get_config('language'),
 	'options_values' => $languages,
 )) . "</div>";
diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php
index 01ceb3fec..380a4bb6c 100644
--- a/views/default/forms/avatar/crop.php
+++ b/views/default/forms/avatar/crop.php
@@ -16,10 +16,10 @@ $master_image = $vars['entity']->getIcon('master');
 <?php
 $coords = array('x1', 'x2', 'y1', 'y2');
 foreach ($coords as $coord) {
-	echo elgg_view('input/hidden', array('internalname' => $coord, 'value' => $vars['entity']->$coord));
+	echo elgg_view('input/hidden', array('name' => $coord, 'value' => $vars['entity']->$coord));
 }
 
-echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $vars['entity']->guid));
+echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid));
 
 echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create')));
 
diff --git a/views/default/forms/avatar/upload.php b/views/default/forms/avatar/upload.php
index a89f5ee68..08db1f7e0 100644
--- a/views/default/forms/avatar/upload.php
+++ b/views/default/forms/avatar/upload.php
@@ -5,11 +5,11 @@
  * @uses $vars['entity']
  */
 
-echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $vars['entity']->guid));
+echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid));
 ?>
 <div>
 	<label><?php echo elgg_echo("avatar:upload"); ?></label><br />
-	<?php echo elgg_view("input/file",array('internalname' => 'avatar')); ?>
+	<?php echo elgg_view("input/file",array('name' => 'avatar')); ?>
 <br />
 	<?php echo elgg_view('input/submit', array('value' => elgg_echo('upload'))); ?>
 </div>
diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php
index b4f63b814..8a2b89f2d 100644
--- a/views/default/forms/comments/add.php
+++ b/views/default/forms/comments/add.php
@@ -11,12 +11,12 @@ if (isset($vars['entity']) && elgg_is_logged_in()) {
 ?>
 <div class="mbn">
 	<label><?php echo elgg_echo("generic_comments:text"); ?></label>
-	<?php echo elgg_view('input/longtext', array('internalname' => 'generic_comment')); ?>
+	<?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?>
 </div>
 <?php
 
 	echo elgg_view('input/hidden', array(
-		'internalname' => 'entity_guid',
+		'name' => 'entity_guid',
 		'value' => $vars['entity']->getGUID()
 	));
 	echo elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post")));
diff --git a/views/default/forms/comments/inline.php b/views/default/forms/comments/inline.php
index 9c44905be..14b8a086d 100644
--- a/views/default/forms/comments/inline.php
+++ b/views/default/forms/comments/inline.php
@@ -6,9 +6,9 @@
  */
 
 if (isset($vars['entity']) && elgg_is_logged_in()) {
-	echo elgg_view('input/text', array('internalname' => 'generic_comment'));
+	echo elgg_view('input/text', array('name' => 'generic_comment'));
 	echo elgg_view('input/hidden', array(
-		'internalname' => 'entity_guid',
+		'name' => 'entity_guid',
 		'value' => $vars['entity']->getGUID()
 	));
 	echo elgg_view('input/submit', array('value' => elgg_echo('comment')));
diff --git a/views/default/forms/friends/edit.php b/views/default/forms/friends/edit.php
index ac817f23a..e3bc28cfc 100644
--- a/views/default/forms/friends/edit.php
+++ b/views/default/forms/friends/edit.php
@@ -26,7 +26,7 @@ if (isset($vars['collection'])) {
 
 $form_body = "<div class='contentWrapper'><div><label>" . elgg_echo("friends:collectionname") . "<br />" .
 	elgg_view("input/text", array(
-		"internalname" => "collection_name",
+		"name" => "collection_name",
 		"value" => $title,
 	)) . "</label></div>";
 
@@ -43,13 +43,13 @@ if($vars['collection_members']){
 $form_body .= "</div>";
 
 $form_body .= "<div><label>" . elgg_echo("friends:addfriends") . "</label>".
-			elgg_view('core/friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "</div>";
+			elgg_view('core/friends/picker',array('entities' => $vars['friends'], 'name' => 'friends_collection', 'highlight' => $highlight)) . "</div>";
 
 $form_body .= "<div>";
 if (isset($vars['collection'])) {
-	$form_body .= elgg_view('input/hidden', array('internalname' => 'collection_id', 'value' => "{$vars['collection'][0]->id}"));
+	$form_body .= elgg_view('input/hidden', array('name' => 'collection_id', 'value' => "{$vars['collection'][0]->id}"));
 }
-$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+$form_body .= elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('save')));
 $form_body .= "</div></div>";
 
 echo elgg_view('input/form', array('body' => $form_body, 'action' => "action/$action"));
\ No newline at end of file
diff --git a/views/default/forms/login.php b/views/default/forms/login.php
index 44d134ba8..a4d9e57c6 100644
--- a/views/default/forms/login.php
+++ b/views/default/forms/login.php
@@ -9,11 +9,11 @@
 
 <div>
 	<label><?php echo elgg_echo('loginusername'); ?></label>
-	<?php echo elgg_view('input/text', array('internalname' => 'username')); ?>
+	<?php echo elgg_view('input/text', array('name' => 'username')); ?>
 </div>
 <div>
 	<label><?php echo elgg_echo('password'); ?></label>
-	<?php echo elgg_view('input/password', array('internalname' => 'password')); ?>
+	<?php echo elgg_view('input/password', array('name' => 'password')); ?>
 </div>
 
 <?php echo elgg_view('login/extend'); ?>
diff --git a/views/default/forms/members/name_search.php b/views/default/forms/members/name_search.php
index 265290fc9..23e6c066e 100644
--- a/views/default/forms/members/name_search.php
+++ b/views/default/forms/members/name_search.php
@@ -1,7 +1,7 @@
 <?php
 
 $params = array(
-	'internalname' => 'name',
+	'name' => 'name',
 );
 echo elgg_view('input/text', $params);
 
diff --git a/views/default/forms/members/tag_search.php b/views/default/forms/members/tag_search.php
index 1a281963d..7badf8cda 100644
--- a/views/default/forms/members/tag_search.php
+++ b/views/default/forms/members/tag_search.php
@@ -4,7 +4,7 @@
  */
 
 $params = array(
-	'internalname' => 'tag',
+	'name' => 'tag',
 );
 echo elgg_view('input/text', $params);
 
diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php
index 744133c79..3cb4a1472 100644
--- a/views/default/forms/plugins/settings/save.php
+++ b/views/default/forms/plugins/settings/save.php
@@ -20,7 +20,7 @@ if ($type != 'user') {
 echo elgg_view("{$type}settings/$plugin_id/edit", $vars);
 
 echo "<div>";
-echo elgg_view('input/hidden', array('internalname' => 'plugin_id', 'value' => $plugin_id));
-echo elgg_view('input/hidden', array('internalname' => 'user_guid', 'value' => $user_guid));
+echo elgg_view('input/hidden', array('name' => 'plugin_id', 'value' => $plugin_id));
+echo elgg_view('input/hidden', array('name' => 'user_guid', 'value' => $user_guid));
 echo elgg_view('input/submit', array('value' => elgg_echo('save'))); 
 echo "</div>";
diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php
index 4d2987a03..aaf9ac01e 100644
--- a/views/default/forms/profile/edit.php
+++ b/views/default/forms/profile/edit.php
@@ -9,7 +9,7 @@
 
 <div>
 	<label><?php echo elgg_echo('user:name:label'); ?></label>
-	<?php echo elgg_view('input/text', array('internalname' => 'name', 'value' => $vars['entity']->name)); ?>
+	<?php echo elgg_view('input/text', array('name' => 'name', 'value' => $vars['entity']->name)); ?>
 </div>
 <?php
 
@@ -44,12 +44,12 @@ if (is_array($profile_fields) && count($profile_fields) > 0) {
 	<label><?php echo elgg_echo("profile:{$shortname}") ?></label>
 	<?php
 		$params = array(
-			'internalname' => $shortname,
+			'name' => $shortname,
 			'value' => $value,
 		);
 		echo elgg_view("input/{$valtype}", $params);
 		$params = array(
-			'internalname' => "accesslevel[$shortname]",
+			'name' => "accesslevel[$shortname]",
 			'value' => $access_id,
 		);
 		echo elgg_view('input/access', $params);
@@ -61,7 +61,7 @@ if (is_array($profile_fields) && count($profile_fields) > 0) {
 ?>
 <div>
 <?php
-	echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $vars['entity']->guid));
+	echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid));
 	echo elgg_view('input/submit', array('value' => elgg_echo('save')));
 ?>
 </div>
diff --git a/views/default/forms/profile/fields/add.php b/views/default/forms/profile/fields/add.php
index de43b9ec9..c700cf7f5 100644
--- a/views/default/forms/profile/fields/add.php
+++ b/views/default/forms/profile/fields/add.php
@@ -8,8 +8,8 @@
 $label_text = elgg_echo('profile:label');
 $type_text = elgg_echo('profile:type');
 
-$label_control = elgg_view('input/text', array('internalname' => 'label'));
-$type_control = elgg_view('input/pulldown', array('internalname' => 'type', 'options_values' => array(
+$label_control = elgg_view('input/text', array('name' => 'label'));
+$type_control = elgg_view('input/pulldown', array('name' => 'type', 'options_values' => array(
 	'text' => elgg_echo('text'),
 	'longtext' => elgg_echo('longtext'),
 	'tags' => elgg_echo('tags'),
@@ -17,7 +17,7 @@ $type_control = elgg_view('input/pulldown', array('internalname' => 'type', 'opt
 	'email' => elgg_echo('email')
 )));
 
-$submit_control = elgg_view('input/submit', array('internalname' => elgg_echo('add'), 'value' => elgg_echo('add')));
+$submit_control = elgg_view('input/submit', array('name' => elgg_echo('add'), 'value' => elgg_echo('add')));
 
 $formbody = <<< END
 		<p>$label_text: $label_control
diff --git a/views/default/forms/register.php b/views/default/forms/register.php
index a7f34f777..8828e89e1 100644
--- a/views/default/forms/register.php
+++ b/views/default/forms/register.php
@@ -19,27 +19,27 @@ if (elgg_is_admin_logged_in() && isset($vars['show_admin'])) {
 <div class="mtm">
 	<label><?php echo elgg_echo('name'); ?></label>
 	<br />
-	<?php echo elgg_view('input/text', array('internalname' => 'name', 'value' => $name)); ?>
+	<?php echo elgg_view('input/text', array('name' => 'name', 'value' => $name)); ?>
 </div>
 <div>
 	<label><?php echo elgg_echo('email'); ?></label>
 	<br />
-	<?php echo elgg_view('input/text', array('internalname' => 'email', 'value' => $email)); ?>
+	<?php echo elgg_view('input/text', array('name' => 'email', 'value' => $email)); ?>
 </div>
 <div>
 	<label><?php echo elgg_echo('username'); ?></label>
 	<br />
-	<?php echo elgg_view('input/text', array('internalname' => 'username', 'value' => $username)); ?>
+	<?php echo elgg_view('input/text', array('name' => 'username', 'value' => $username)); ?>
 </div>
 <div>
 	<label><?php echo elgg_echo('password'); ?></label>
 	<br />
-	<?php echo elgg_view('input/password', array('internalname' => 'password')); ?>
+	<?php echo elgg_view('input/password', array('name' => 'password')); ?>
 </div>
 <div>
 	<label><?php echo elgg_echo('passwordagain'); ?></label>
 	<br />
-	<?php echo elgg_view('input/password', array('internalname' => 'password2')); ?>
+	<?php echo elgg_view('input/password', array('name' => 'password2')); ?>
 </div>
 
 <?php
@@ -50,12 +50,12 @@ echo elgg_view('register/extend');
 echo elgg_view('input/captcha');
 
 if ($admin_option) {
-	echo elgg_view('input/checkboxes', array('internalname' => "admin", 'options' => array(elgg_echo('admin_option'))));
+	echo elgg_view('input/checkboxes', array('name' => "admin", 'options' => array(elgg_echo('admin_option'))));
 }
 
-echo elgg_view('input/hidden', array('internalname' => 'friend_guid', 'value' => $vars['friend_guid']));
-echo elgg_view('input/hidden', array('internalname' => 'invitecode', 'value' => $vars['invitecode']));
-echo elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register')));
+echo elgg_view('input/hidden', array('name' => 'friend_guid', 'value' => $vars['friend_guid']));
+echo elgg_view('input/hidden', array('name' => 'invitecode', 'value' => $vars['invitecode']));
+echo elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('register')));
 ?>
 <?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
diff --git a/views/default/forms/user/passwordreset.php b/views/default/forms/user/passwordreset.php
index d553bdc14..7b13f120c 100644
--- a/views/default/forms/user/passwordreset.php
+++ b/views/default/forms/user/passwordreset.php
@@ -5,12 +5,12 @@ $user = $vars['user'];
 echo elgg_echo('user:resetpassword:reset_password_confirm') . "<br />";
 
 echo elgg_view('input/hidden', array(
-	'internalname' => 'u',
+	'name' => 'u',
 	'value' => $user->guid
 ));
 
 echo elgg_view('input/hidden', array(
-	'internalname' => 'c',
+	'name' => 'c',
 	'value' => $code
 ));
 
diff --git a/views/default/forms/user/requestnewpassword.php b/views/default/forms/user/requestnewpassword.php
index 8a83da709..f2f276417 100644
--- a/views/default/forms/user/requestnewpassword.php
+++ b/views/default/forms/user/requestnewpassword.php
@@ -12,7 +12,7 @@
 </div>
 <div>
 	<label><?php echo elgg_echo('username'); ?></label>
-	<?php echo elgg_view('input/text', array('internalname' => 'username')); ?>
+	<?php echo elgg_view('input/text', array('name' => 'username')); ?>
 </div>
 <?php echo elgg_view('input/captcha'); ?>
 <div>
diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php
index 9926bb437..1119d180f 100644
--- a/views/default/forms/useradd.php
+++ b/views/default/forms/useradd.php
@@ -13,19 +13,19 @@ if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) {
 	$admin_option = true;
 }
 
-$form_body  = "<div><label>" . elgg_echo('name') . "</label><br />" . elgg_view('input/text' , array('internalname' => 'name')) . "</div>";
-$form_body .= "<div><label>" . elgg_echo('username') . "</label><br />" . elgg_view('input/text' , array('internalname' => 'username')) . "</div>";
-$form_body .= "<div><label>" . elgg_echo('email') . "</label><br />" . elgg_view('input/text' , array('internalname' => 'email')) . "</div>";
-$form_body .= "<div><label>" . elgg_echo('password') . "</label><br />" . elgg_view('input/password' , array('internalname' => 'password')) . "</div>";
-$form_body .= "<div><label>" . elgg_echo('passwordagain') . "</label><br />" . elgg_view('input/password' , array('internalname' => 'password2')) . "</div>";
+$form_body  = "<div><label>" . elgg_echo('name') . "</label><br />" . elgg_view('input/text' , array('name' => 'name')) . "</div>";
+$form_body .= "<div><label>" . elgg_echo('username') . "</label><br />" . elgg_view('input/text' , array('name' => 'username')) . "</div>";
+$form_body .= "<div><label>" . elgg_echo('email') . "</label><br />" . elgg_view('input/text' , array('name' => 'email')) . "</div>";
+$form_body .= "<div><label>" . elgg_echo('password') . "</label><br />" . elgg_view('input/password' , array('name' => 'password')) . "</div>";
+$form_body .= "<div><label>" . elgg_echo('passwordagain') . "</label><br />" . elgg_view('input/password' , array('name' => 'password2')) . "</div>";
 $form_body .= "<div>";
 
 if ($admin_option) {
-	$form_body .= elgg_view('input/checkboxes', array('internalname' => "admin", 'options' => array(elgg_echo('admin_option'))));
+	$form_body .= elgg_view('input/checkboxes', array('name' => "admin", 'options' => array(elgg_echo('admin_option'))));
 	$form_body .= '</div><div>';
 }
 
-$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</div>";
+$form_body .= elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('register'))) . "</div>";
 ?>
 
 <div class="elgg-module elgg-module-inline">
diff --git a/views/default/forms/widgets/save.php b/views/default/forms/widgets/save.php
index b8d6017f5..d16318cd1 100644
--- a/views/default/forms/widgets/save.php
+++ b/views/default/forms/widgets/save.php
@@ -15,7 +15,7 @@ $custom_form_section = elgg_view($edit_view, array('entity' => $widget));
 $access = '';
 if ($show_access) {
 	$access = elgg_view('input/access', array(
-		'internalname' => 'params[access_id]',
+		'name' => 'params[access_id]',
 		'value' => $widget->access_id,
 	));
 }
@@ -24,7 +24,7 @@ if (!$custom_form_section && !$access) {
 	return true;
 }
 
-$hidden = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $widget->guid));
+$hidden = elgg_view('input/hidden', array('name' => 'guid', 'value' => $widget->guid));
 $submit = elgg_view('input/submit', array('value' => elgg_echo('save')));
 
 $body = <<<___END