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

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

60 files changed, 140 insertions, 140 deletions

diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php
index 30cf3d21a..48e65b4dd 100644
--- a/views/default/admin/components/plugin_settings.php
+++ b/views/default/admin/components/plugin_settings.php
@@ -20,7 +20,7 @@ if (elgg_view_exists("settings/$plugin_id/edit")) {
 	</div>
 	<div class="elgg-body">
 		<?php
-			$params = array('internalid' => "$plugin_id-settings");
+			$params = array('id' => "$plugin_id-settings");
 			echo elgg_view_form("plugins/settings/save", $params, $vars);
 		?>
 	</div>
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index 45c12a74f..1c42be14d 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -44,7 +44,7 @@ $token = generate_action_token($ts);
 $categories = array_merge(array('' => elgg_echo('admin:plugins:categories:all')), $categories);
 
 $category_dropdown = elgg_view('input/dropdown', array(
-	'internalname' => 'category',
+	'name' => 'category',
 	'options_values' => $categories,
 	'value' => $show_category
 ));
diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php
index 6bd028da6..93aa87782 100644
--- a/views/default/core/account/login_walled_garden.php
+++ b/views/default/core/account/login_walled_garden.php
@@ -4,7 +4,7 @@
 */
 
 $form_body = elgg_view('forms/login');
-$form_body .= elgg_view('input/hidden', array('internalname' => 'returntoreferer', 'value' => 'true'));
+$form_body .= elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true'));
 
 $login_url = elgg_get_site_url();
 if (elgg_get_config('https_login')) {
@@ -38,7 +38,7 @@ __HTML;
 	<?php
 	$lostpassword_form_body = "<div>" . elgg_echo('user:password:text') . "</div>";
 	$lostpassword_form_body .= "<div class='margin-none'><label>". elgg_echo('username') . " "
-		. elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea lostusername')) . "</label></div>";
+		. elgg_view('input/text', array('name' => 'username', 'class' => 'login-textarea lostusername')) . "</label></div>";
 	$lostpassword_form_body .= elgg_view('input/captcha');
 	$lostpassword_form_body .= "<div>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "<input class='elgg-button-action elgg-state-disabled cancel_request' type='reset' value='Cancel'></div>";
 	
diff --git a/views/default/core/friends/picker.php b/views/default/core/friends/picker.php
index 2d5976540..04a40d0d7 100644
--- a/views/default/core/friends/picker.php
+++ b/views/default/core/friends/picker.php
@@ -17,11 +17,11 @@ elgg_register_js($url, 'friendsPicker');
 
 $chararray = elgg_echo('friendspicker:chararray');
 
-// Initialise internalname
-if (!isset($vars['internalname'])) {
-	$internalname = "friend";
+// Initialise name
+if (!isset($vars['name'])) {
+	$name = "friend";
 } else {
-	$internalname = $vars['internalname'];
+	$name = $vars['name'];
 }
 
 // Are we highlighting default or all?
@@ -204,7 +204,7 @@ if (!isset($vars['replacement'])) {
 
 				<td>
 
-					<input type="checkbox" <?php echo $checked; ?> name="<?php echo $internalname; ?>[]" value="<?php echo $options[$label]; ?>" />
+					<input type="checkbox" <?php echo $checked; ?> name="<?php echo $name; ?>[]" value="<?php echo $options[$label]; ?>" />
 
 				</td>
 
diff --git a/views/default/core/river/controls.php b/views/default/core/river/controls.php
index 37bfba91b..6f2be623c 100644
--- a/views/default/core/river/controls.php
+++ b/views/default/core/river/controls.php
@@ -15,7 +15,7 @@ if (elgg_is_logged_in()) {
 			'href' => '#',
 			'text' => elgg_echo('generic_comments:text'),
 			'class' => 'elgg-toggle',
-			'internalid' => "elgg-toggler-{$object->getGUID()}",
+			'id' => "elgg-toggler-{$object->getGUID()}",
 		);
 		echo elgg_view('output/url', $params);
 
diff --git a/views/default/core/river/filter.php b/views/default/core/river/filter.php
index 74af9969b..aaa4beb89 100644
--- a/views/default/core/river/filter.php
+++ b/views/default/core/river/filter.php
@@ -24,7 +24,7 @@ if (!empty($registered_entities)) {
 }
 
 $params = array(
-	'internalid' => 'elgg-river-selector',
+	'id' => 'elgg-river-selector',
 	'options_values' => $options,
 );
 $selector = $vars['selector'];
diff --git a/views/default/core/river/footer.php b/views/default/core/river/footer.php
index ee9d5dc58..ff960cebe 100644
--- a/views/default/core/river/footer.php
+++ b/views/default/core/river/footer.php
@@ -49,5 +49,5 @@ if ($comments) {
 // inline comment form
 echo elgg_view_form('comments/inline', array(
 	'action' => 'action/comments/add',
-	'internalid' => "elgg-togglee-{$object->getGUID()}",
+	'id' => "elgg-togglee-{$object->getGUID()}",
 ), array('entity' => $object));
diff --git a/views/default/core/settings/account/default_access.php b/views/default/core/settings/account/default_access.php
index 67a0a4137..e33211460 100644
--- a/views/default/core/settings/account/default_access.php
+++ b/views/default/core/settings/account/default_access.php
@@ -22,7 +22,7 @@ if (elgg_get_config('allow_user_default_access')) {
 		<?php echo elgg_echo('default_access:label'); ?>:
 		<?php
 
-			echo elgg_view('input/access', array('internalname' => 'default_access', 'value' => $default_access));
+			echo elgg_view('input/access', array('name' => 'default_access', 'value' => $default_access));
 
 		?>
 		</p>
diff --git a/views/default/core/settings/account/email.php b/views/default/core/settings/account/email.php
index 3782d39a8..fda83e795 100644
--- a/views/default/core/settings/account/email.php
+++ b/views/default/core/settings/account/email.php
@@ -18,7 +18,7 @@ if ($user) {
 		<p>
 			<?php echo elgg_echo('email:address:label'); ?>:
 			<?php
-			echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email));
+			echo elgg_view('input/email',array('name' => 'email', 'value' => $user->email));
 			?>
 		</p>
 	</div>
diff --git a/views/default/core/settings/account/language.php b/views/default/core/settings/account/language.php
index a1e8d9886..3a992966f 100644
--- a/views/default/core/settings/account/language.php
+++ b/views/default/core/settings/account/language.php
@@ -19,7 +19,7 @@ if ($user) {
 			<?php echo elgg_echo('user:language:label'); ?>:
 			<?php
 			echo elgg_view("input/dropdown", array(
-				'internalname' => 'language',
+				'name' => 'language',
 				'value' => $user->language,
 				'options_values' => get_installed_translations()
 			));
diff --git a/views/default/core/settings/account/name.php b/views/default/core/settings/account/name.php
index 22f950925..69ffcecaf 100644
--- a/views/default/core/settings/account/name.php
+++ b/views/default/core/settings/account/name.php
@@ -11,5 +11,5 @@
 $user = elgg_get_page_owner_entity();
 
 // all hidden, but necessary for properly updating user details
-echo elgg_view('input/hidden', array('internalname' => 'name', 'value' => $user->name));
-echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid));
+echo elgg_view('input/hidden', array('name' => 'name', 'value' => $user->name));
+echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $user->guid));
diff --git a/views/default/core/settings/account/notifications.php b/views/default/core/settings/account/notifications.php
index decf000ea..ae5fe40bb 100644
--- a/views/default/core/settings/account/notifications.php
+++ b/views/default/core/settings/account/notifications.php
@@ -36,7 +36,7 @@ $notification_settings = get_user_notification_settings(elgg_get_page_owner_guid
 	}
 	
 	echo elgg_view('input/radio', array(
-		'internalname' => "method[$k]",
+		'name' => "method[$k]",
 		'value' => $val,
 		'options' => array(
 			elgg_echo('option:yes') => 'yes',
diff --git a/views/default/core/settings/account/password.php b/views/default/core/settings/account/password.php
index 06e59dfbb..a80f3df6b 100644
--- a/views/default/core/settings/account/password.php
+++ b/views/default/core/settings/account/password.php
@@ -22,7 +22,7 @@ if ($user) {
 		<p>
 		<?php echo elgg_echo('user:current_password:label'); ?>:
 		<?php
-			echo elgg_view('input/password', array('internalname' => 'current_password'));
+			echo elgg_view('input/password', array('name' => 'current_password'));
 		?>
 		</p>
 		<?php } ?>
@@ -30,13 +30,13 @@ if ($user) {
 		<p>
 		<?php echo elgg_echo('user:password:label'); ?>:
 		<?php
-			echo elgg_view('input/password', array('internalname' => 'password'));
+			echo elgg_view('input/password', array('name' => 'password'));
 		?>
 		</p>
 
 		<p>
 		<?php echo elgg_echo('user:password2:label'); ?>: <?php
-			echo elgg_view('input/password', array('internalname' => 'password2'));
+			echo elgg_view('input/password', array('name' => 'password2'));
 		?>
 		</p>
 	</div>
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
diff --git a/views/default/graphics/ajax_loader.php b/views/default/graphics/ajax_loader.php
index 2d2da30b7..77c1fbf4c 100644
--- a/views/default/graphics/ajax_loader.php
+++ b/views/default/graphics/ajax_loader.php
@@ -9,8 +9,8 @@
  * @uses $vars['hidden'] Begin hidden? (true)
  */
 
-if (isset($vars['internalid'])) {
-	$id = "id=\"{$vars['internalid']}\"";
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
 }
 
 $hidden = 'hidden';
diff --git a/views/default/input/access.php b/views/default/input/access.php
index 523c0aaf4..7fa2323bf 100644
--- a/views/default/input/access.php
+++ b/views/default/input/access.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['options_values']
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  */
 
 $defaults = array(
diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php
index 17c8ab8bd..c78fe4db0 100644
--- a/views/default/input/checkboxes.php
+++ b/views/default/input/checkboxes.php
@@ -6,7 +6,7 @@
  * @note This also includes a hidden input with the same name as the checkboxes
  * to make sure something is sent to the server.  The default value is 0.
  * If using JS, be specific to avoid selecting the hidden default value:
- * 	$('input[type=checkbox][name=internalname]')
+ * 	$('input[type=checkbox][name=name]')
  * 
  * @warning Passing integers as labels does not currently work due to a
  * deprecated hack that will be removed in Elgg 1.9. To use integer labels,
@@ -15,11 +15,11 @@
  * @package Elgg
  * @subpackage Core
  *
- * @uses string $vars['internalname'] The name of the input fields
+ * @uses string $vars['name'] The name of the input fields
  *                                    (Forced to an array by appending [])
  * @uses array  $vars['options']      An array of strings representing the
  *                                    label => option for the each checkbox field
- * @uses string $vars['internalid']   The id for each input field. Optional.
+ * @uses string $vars['id']   The id for each input field. Optional.
  *                                    (Only use this with a single value.)
  * @uses string $vars['default']      The default value to send if nothing is checked.
  *                                    Optional, defaults to 0. Set to FALSE for no default.
@@ -34,11 +34,11 @@ $additional_class = elgg_extract('class', $vars);
 $align = elgg_extract('align', $vars, 'vertical');
 $value = (isset($vars['value'])) ? $vars['value'] : NULL;
 $value_array = (is_array($value)) ? array_map('elgg_strtolower', $value) : array(elgg_strtolower($value));
-$internalname = (isset($vars['internalname'])) ? $vars['internalname'] : '';
+$name = (isset($vars['name'])) ? $vars['name'] : '';
 $options = (isset($vars['options']) && is_array($vars['options'])) ? $vars['options'] : array();
 $default = (isset($vars['default'])) ? $vars['default'] : 0;
 
-$id = (isset($vars['internalid'])) ? $vars['internalid'] : '';
+$id = (isset($vars['id'])) ? $vars['id'] : '';
 $disabled = (isset($vars['disabled'])) ? $vars['disabled'] : FALSE;
 $js = (isset($vars['js'])) ? $vars['js'] : '';
 
@@ -49,8 +49,8 @@ if ($additional_class) {
 
 if ($options && count($options) > 0) {
 	// include a default value so if nothing is checked 0 will be passed.
-	if ($internalname && $default !== FALSE) {
-		echo "<input type=\"hidden\" name=\"$internalname\" value=\"$default\" />";
+	if ($name && $default !== FALSE) {
+		echo "<input type=\"hidden\" name=\"$name\" value=\"$default\" />";
 	}
 
 	echo "<ul class=\"$class\">";
@@ -70,8 +70,8 @@ if ($options && count($options) > 0) {
 			'default' => false,
 		);
 
-		if ($internalname) {
-			$input_vars['name'] = "{$internalname}[]";
+		if ($name) {
+			$input_vars['name'] = "{$name}[]";
 		}
 		
 		$input = elgg_view('input/checkbox', $input_vars);
diff --git a/views/default/input/datepicker.php b/views/default/input/datepicker.php
index 0687f9e31..4af54096b 100644
--- a/views/default/input/datepicker.php
+++ b/views/default/input/datepicker.php
@@ -8,11 +8,11 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 
-$cal_name = sanitise_string($vars['internalname']);
+$cal_name = sanitise_string($vars['name']);
 
 if (isset($vars['class'])) {
 	$class = "{$vars['class']} popup_calendar";
@@ -28,7 +28,7 @@ if ($vars['value'] > 86400) {
 }
 
 ?>
-<input type="text" name="<?php echo $vars['internalname']; ?>" value="<?php echo $val; ?>" />
+<input type="text" name="<?php echo $vars['name']; ?>" value="<?php echo $val; ?>" />
 <?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 	$(document).ready(function() {
diff --git a/views/default/input/password.php b/views/default/input/password.php
index 335325c21..62c8fb53d 100644
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 
diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php
index 05018e1ed..7d59b3d0d 100644
--- a/views/default/input/plaintext.php
+++ b/views/default/input/plaintext.php
@@ -7,7 +7,7 @@
  * @subpackage Core
  *
  * @uses $vars['value'] The current value, if any
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['class']
  * @uses $vars['disabled']
  */
diff --git a/views/default/input/radio.php b/views/default/input/radio.php
index fbfc9c5a1..0ad28423f 100644
--- a/views/default/input/radio.php
+++ b/views/default/input/radio.php
@@ -11,7 +11,7 @@
  * @subpackage Core
  *
  * @uses $vars['value']        The current value, if any
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['options']      An array of strings representing the options for the
  *                             radio field as "label" => option
  * @uses $vars['class']        Additional class of the list. Optional.
diff --git a/views/default/input/securitytoken.php b/views/default/input/securitytoken.php
index 9a8cb1ebe..75410848a 100644
--- a/views/default/input/securitytoken.php
+++ b/views/default/input/securitytoken.php
@@ -11,5 +11,5 @@
 $ts = time();
 $token = generate_action_token($ts);
 
-echo elgg_view('input/hidden', array('internalname' => '__elgg_token', 'value' => $token));
-echo elgg_view('input/hidden', array('internalname' => '__elgg_ts', 'value' => $ts));
+echo elgg_view('input/hidden', array('name' => '__elgg_token', 'value' => $token));
+echo elgg_view('input/hidden', array('name' => '__elgg_ts', 'value' => $ts));
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index 980af2684..77a51f37c 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -6,7 +6,7 @@
  * @subpackage Core
  *
  * @uses $vars['value'] The current value, if any
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  *
  * pops up defaulted to lazy load friends lists in paginated alphabetical order.
diff --git a/views/default/layout/objects/widget/controls.php b/views/default/layout/objects/widget/controls.php
index be7a10083..09f5fc947 100644
--- a/views/default/layout/objects/widget/controls.php
+++ b/views/default/layout/objects/widget/controls.php
@@ -24,7 +24,7 @@ if ($widget->canEdit()) {
 		'href' => elgg_get_site_url() . "action/widgets/delete?guid=$widget->guid",
 		'is_action' => true,
 		'class' => 'elgg-widget-delete-button',
-		'internalid' => "elgg-widget-delete-button-$widget->guid"
+		'id' => "elgg-widget-delete-button-$widget->guid"
 	);
 	$delete_link = elgg_view('output/url', $params);
 
@@ -34,7 +34,7 @@ if ($widget->canEdit()) {
 			'title' => elgg_echo('widget:edit'),
 			'href' => "#",
 			'class' => 'elgg-widget-edit-button elgg-toggle',
-			'internalid' => "elgg-toggler-widget-$widget->guid"
+			'id' => "elgg-toggler-widget-$widget->guid"
 		);
 		$edit_link = elgg_view('output/url', $params);
 	}
diff --git a/views/default/layout/shells/widgets.php b/views/default/layout/shells/widgets.php
index e551f288f..8d122738e 100644
--- a/views/default/layout/shells/widgets.php
+++ b/views/default/layout/shells/widgets.php
@@ -50,4 +50,4 @@ for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
 
 elgg_pop_context();
 
-echo elgg_view('graphics/ajax_loader', array('internalid' => 'elgg-widget-loader'));
+echo elgg_view('graphics/ajax_loader', array('id' => 'elgg-widget-loader'));
diff --git a/views/default/layout/shells/widgets/add_panel.php b/views/default/layout/shells/widgets/add_panel.php
index e6b13d573..b440e323f 100644
--- a/views/default/layout/shells/widgets/add_panel.php
+++ b/views/default/layout/shells/widgets/add_panel.php
@@ -50,7 +50,7 @@ foreach ($widgets as $column_widgets) {
 	</ul>
 <?php
 	$params = array(
-		'internalname' => 'widget_context',
+		'name' => 'widget_context',
 		'value' => $context
 	);
 	echo elgg_view('input/hidden', $params);
diff --git a/views/default/navigation/tabs.php b/views/default/navigation/tabs.php
index 376464ee5..0108126ad 100644
--- a/views/default/navigation/tabs.php
+++ b/views/default/navigation/tabs.php
@@ -55,7 +55,7 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) {
 		}
 
 		if (isset($info['url_id'])) {
-			$options['internalid'] = $info['url_id'];
+			$options['id'] = $info['url_id'];
 		}
 
 		$link = elgg_view('output/url', $options);
diff --git a/views/default/widgets/content_stats/edit.php b/views/default/widgets/content_stats/edit.php
index d0746a534..f1a050df8 100644
--- a/views/default/widgets/content_stats/edit.php
+++ b/views/default/widgets/content_stats/edit.php
@@ -10,7 +10,7 @@ if (!isset($vars['entity']->num_display)) {
 }
 
 $params = array(
-	'internalname' => 'params[num_display]',
+	'name' => 'params[num_display]',
 	'value' => $vars['entity']->num_display,
 	'options' => array(5, 8, 10, 12, 15, 20),
 );
diff --git a/views/default/widgets/friends/edit.php b/views/default/widgets/friends/edit.php
index 025f5f98b..c7e6b06ff 100644
--- a/views/default/widgets/friends/edit.php
+++ b/views/default/widgets/friends/edit.php
@@ -10,7 +10,7 @@ if (!isset($vars['entity']->num_display)) {
 }
 
 $params = array(
-	'internalname' => 'params[num_display]',
+	'name' => 'params[num_display]',
 	'value' => $vars['entity']->num_display,
 	'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20, 30, 50, 100),
 );
@@ -30,7 +30,7 @@ if (!isset($vars['entity']->icon_size)) {
 }
 
 $params = array(
-	'internalname' => 'params[icon_size]',
+	'name' => 'params[icon_size]',
 	'value' => $vars['entity']->icon_size,
 	'options_values' => array(
 		'small' => elgg_echo('friends:small'),
diff --git a/views/default/widgets/new_users/edit.php b/views/default/widgets/new_users/edit.php
index e951264bf..ed07213cb 100644
--- a/views/default/widgets/new_users/edit.php
+++ b/views/default/widgets/new_users/edit.php
@@ -10,7 +10,7 @@ if (!isset($vars['entity']->num_display)) {
 }
 
 $params = array(
-	'internalname' => 'params[num_display]',
+	'name' => 'params[num_display]',
 	'value' => $vars['entity']->num_display,
 	'options' => array(5, 8, 10, 12, 15, 20),
 );
diff --git a/views/default/widgets/online_users/edit.php b/views/default/widgets/online_users/edit.php
index dfbe6ecd6..66f03a745 100644
--- a/views/default/widgets/online_users/edit.php
+++ b/views/default/widgets/online_users/edit.php
@@ -9,7 +9,7 @@ if (!isset($vars['entity']->num_display)) {
 }
 
 $params = array(
-	'internalname' => 'params[num_display]',
+	'name' => 'params[num_display]',
 	'value' => $vars['entity']->num_display,
 	'options' => array(5, 8, 10, 12, 15, 20),
 );
diff --git a/views/installation/input/access.php b/views/installation/input/access.php
index ab4064ef1..3fde7295f 100644
--- a/views/installation/input/access.php
+++ b/views/installation/input/access.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 
@@ -28,7 +28,7 @@ if (is_array($vars['options']) && sizeof($vars['options']) > 0) {
 
 	?>
 
-	<select name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['js'])) echo $vars['js']; ?> <?php if ((isset($vars['disabled'])) && ($vars['disabled'])) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
+	<select name="<?php echo $vars['name']; ?>" <?php if (isset($vars['js'])) echo $vars['js']; ?> <?php if ((isset($vars['disabled'])) && ($vars['disabled'])) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
 	<?php
 
 		foreach($vars['options'] as $key => $option) {
diff --git a/views/installation/input/button.php b/views/installation/input/button.php
index 81a5414c4..a69f7dbfa 100644
--- a/views/installation/input/button.php
+++ b/views/installation/input/button.php
@@ -9,7 +9,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['type'] Submit or reset, defaults to submit.
  * @uses $vars['src'] Src of an image
  *
@@ -39,11 +39,11 @@ switch ($type) {
 }
 
 $value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8');
-$name = $vars['internalname'];
+$name = $vars['name'];
 $src = $vars['src'];
 // blank src if trying to access an offsite image.
 if (strpos($src, elgg_get_site_url()) === false) {
 	$src = "";
 }
 ?>
-<input type="<?php echo $type; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\"";?> <?php echo $vars['js']; ?> value="<?php echo $value; ?>" src="<?php echo $src; ?>" class="<?php echo $class; ?>" />
\ No newline at end of file
+<input type="<?php echo $type; ?>" <?php if (isset($vars['id'])) echo "id=\"{$vars['id']}\"";?> <?php echo $vars['js']; ?> value="<?php echo $value; ?>" src="<?php echo $src; ?>" class="<?php echo $class; ?>" />
\ No newline at end of file
diff --git a/views/installation/input/checkboxes.php b/views/installation/input/checkboxes.php
index 04533f6f5..164509831 100644
--- a/views/installation/input/checkboxes.php
+++ b/views/installation/input/checkboxes.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['options'] An array of strings representing the options for the checkbox field
  *
  */
@@ -44,5 +44,5 @@ foreach($vars['options'] as $label => $option) {
 	if ($vars['disabled']) {
 		$disabled = ' disabled="yes" ';
 	}
-	echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['internalname']}[]\" {$selected} value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
+	echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['name']}[]\" {$selected} value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
 }
\ No newline at end of file
diff --git a/views/installation/input/dropdown.php b/views/installation/input/dropdown.php
index 11802a669..141ff65b0 100644
--- a/views/installation/input/dropdown.php
+++ b/views/installation/input/dropdown.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['options'] An array of strings representing the options for the dropdown field
  * @uses $vars['options_values'] An associative array of "value" => "option" where "value" is an internal name and "option" is
  * 								 the value displayed on the button. Replaces $vars['options'] when defined.
@@ -20,7 +20,7 @@ if (!$class) {
 	$class = "elgg-input-dropdown";
 }
 ?>
-<select name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
+<select name="<?php echo $vars['name']; ?>" <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
 <?php
 if ($vars['options_values']) {
 	foreach($vars['options_values'] as $value => $option) {
diff --git a/views/installation/input/form.php b/views/installation/input/form.php
index a4707f257..b131c9d10 100644
--- a/views/installation/input/form.php
+++ b/views/installation/input/form.php
@@ -14,13 +14,13 @@
  *
  */
 
-if (isset($vars['internalid'])) {
-	$id = $vars['internalid'];
+if (isset($vars['id'])) {
+	$id = $vars['id'];
 } else {
 	$id = '';
 }
-if (isset($vars['internalname'])) {
-	$name = $vars['internalname'];
+if (isset($vars['name'])) {
+	$name = $vars['name'];
 } else {
 	$name = '';
 }
diff --git a/views/installation/input/hidden.php b/views/installation/input/hidden.php
index 7a0798e48..c9800ebbb 100644
--- a/views/installation/input/hidden.php
+++ b/views/installation/input/hidden.php
@@ -9,8 +9,8 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 ?>
-<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" />
\ No newline at end of file
+<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" />
\ No newline at end of file
diff --git a/views/installation/input/longtext.php b/views/installation/input/longtext.php
index a909f55f2..820a51da4 100644
--- a/views/installation/input/longtext.php
+++ b/views/installation/input/longtext.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 
@@ -19,4 +19,4 @@ if (!$class) {
 
 ?>
 
-<textarea class="<?php echo $class; ?>" name="<?php echo $vars['internalname']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo $vars['value']; ?></textarea>
\ No newline at end of file
+<textarea class="<?php echo $class; ?>" name="<?php echo $vars['name']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo $vars['value']; ?></textarea>
\ No newline at end of file
diff --git a/views/installation/input/password.php b/views/installation/input/password.php
index 541728ee3..8ba79228d 100644
--- a/views/installation/input/password.php
+++ b/views/installation/input/password.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 
@@ -18,4 +18,4 @@ if (!$class) {
 }
 ?>
 
-<input type="password" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>" />
+<input type="password" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" <?php if (isset($vars['id'])) echo "id=\"{$vars['id']}\""; ?> value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>" />
diff --git a/views/installation/input/securitytoken.php b/views/installation/input/securitytoken.php
index 9a8cb1ebe..75410848a 100644
--- a/views/installation/input/securitytoken.php
+++ b/views/installation/input/securitytoken.php
@@ -11,5 +11,5 @@
 $ts = time();
 $token = generate_action_token($ts);
 
-echo elgg_view('input/hidden', array('internalname' => '__elgg_token', 'value' => $token));
-echo elgg_view('input/hidden', array('internalname' => '__elgg_ts', 'value' => $ts));
+echo elgg_view('input/hidden', array('name' => '__elgg_token', 'value' => $token));
+echo elgg_view('input/hidden', array('name' => '__elgg_ts', 'value' => $ts));
diff --git a/views/installation/input/text.php b/views/installation/input/text.php
index 73801dcf7..c59278b40 100644
--- a/views/installation/input/text.php
+++ b/views/installation/input/text.php
@@ -10,7 +10,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['disabled'] If true then control is read-only
  * @uses $vars['class'] Class override
  */
@@ -21,4 +21,4 @@ if (!$class) {
 }
 
 ?>
-<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class ?>"/>
\ No newline at end of file
+<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class ?>"/>
\ No newline at end of file
diff --git a/views/installation/install/forms/template.php b/views/installation/install/forms/template.php
index 897772dd4..5e44d928e 100644
--- a/views/installation/install/forms/template.php
+++ b/views/installation/install/forms/template.php
@@ -13,7 +13,7 @@ $form_body = '';
 foreach ($variables as $field => $params) {
 	$label = elgg_echo("install:$type:label:$field");
 	$help = elgg_echo("install:$type:help:$field");
-	$params['internalname'] = $field;
+	$params['name'] = $field;
 
 	$form_body .= '<p>';
 	$form_body .= "<label>$label</label>";