8 files changed, 18 insertions, 18 deletions
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
index f10d8b7ad..64d122877 100644
--- a/views/default/page_elements/content_header.php
+++ b/views/default/page_elements/content_header.php
@@ -58,7 +58,7 @@ $tabs = (isset($vars['tabs'])) ? $vars['tabs'] : $default_tabs;
 $tab_list = elgg_view('navigation/tabs', array('tabs' => $tabs));
 
 $title = elgg_echo($type);
-$title = '<div class="content_header_title">' . elgg_view_title($title) . '</div>';
+$title = '<div class="content-header-title">' . elgg_view_title($title) . '</div>';
 
 // must be logged in to see any action buttons
 if (isloggedin()) {
@@ -75,7 +75,7 @@ if (isloggedin()) {
 			$new_link = elgg_normalize_url((isset($vars['new_link'])) ? $vars['new_link'] : "pg/$type/$username/new");
 			$new_button = "<a href=\"{$new_link}\" class='action-button'>" . elgg_echo($type . ':new') . '</a>';
 		}
-		$new_button = "<div class='content_header_options'>$new_button</div>";
+		$new_button = "<div class='content-header-options'>$new_button</div>";
 	}
 
 	// also hide the tabs if in a group context (ie, listing groups) or
diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php
index 3d4a0f853..91a4b4976 100644
--- a/views/default/page_elements/content_header_member.php
+++ b/views/default/page_elements/content_header_member.php
@@ -19,6 +19,6 @@ $title = $name . "'s " . $type;
 ?>
 
 <div id="content_header" class="clearfix">
-	<?php echo '<div class="content_header_title">' . elgg_view_title($title) . '</div>'; ?>
+	<?php echo '<div class="content-header-title">' . elgg_view_title($title) . '</div>'; ?>
 </div>
 
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
index 93aac4d96..2f976c8ab 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page_elements/footer.php
@@ -9,11 +9,11 @@
  */
 
 ?>
-<div id="elgg_footer">
-	<div id="elgg_footer_contents" class="clearfix">
+<div id="elgg-footer">
+	<div id="elgg-footer-contents" class="clearfix">
 		<?php echo elgg_view('footer/links'); ?>
-		<a href="http://www.elgg.org" class="powered_by_elgg_badge">
-			<img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
+		<a href="http://www.elgg.org" class="powered-by-elgg-badge">
+			<img src="<?php echo elgg_get_site_url(); ?>_graphics/powered-by-elgg-badge_drk_bckgnd.gif" alt="Powered by Elgg" />
 		</a>
 	</div>
 </div>
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index f747b67a2..54a166b2d 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -5,14 +5,14 @@
  **/
 
 ?>
-<div id="elgg_header">
-	<div id="elgg_header_contents">
+<div id="elgg-header">
+	<div id="elgg-header-contents">
 		<?php
 			// link back to main site.
 			echo elgg_view('page_elements/header_logo', $vars);
 			
 			// drop-down login
-			echo elgg_view('account/login_dropdown');
+			echo elgg_view('account/login-dropdown');
 		
 			// insert site-wide navigation
 			echo elgg_view('navigation/site_nav');
diff --git a/views/default/page_elements/header_logo.php b/views/default/page_elements/header_logo.php
index 1e5e5269d..c782310f0 100644
--- a/views/default/page_elements/header_logo.php
+++ b/views/default/page_elements/header_logo.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * Elgg header logo
- * The logo to display in elgg_header.
+ * The logo to display in elgg-header.
  **/
 ?>
 
 <h1><a href="<?php echo elgg_get_site_url(); ?>">
-<span class='network_title'><?php echo $vars['config']->sitename; ?></span>
+<span class='network-title'><?php echo $vars['config']->sitename; ?></span>
 </a></h1>
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 9962e2962..66fc180dd 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -22,7 +22,7 @@ if (isset($autofeed) && $autofeed == true) {
 	$url = elgg_format_url($url);
 	$label = elgg_echo('feed:rss');
 	$contents .= <<<END
-	<div class="rss_link clearfix"><a href="{$url}" rel="nofollow" title="{$label}">{$label}</a></div>
+	<div class="rss-link clearfix"><a href="{$url}" rel="nofollow" title="{$label}">{$label}</a></div>
 END;
 }
 
diff --git a/views/default/page_elements/topbar.php b/views/default/page_elements/topbar.php
index 5f980603e..8c19c6409 100644
--- a/views/default/page_elements/topbar.php
+++ b/views/default/page_elements/topbar.php
@@ -6,18 +6,18 @@
 
 $user = get_loggedin_user();
 if (($user instanceof ElggUser) && ($user->guid > 0)) {
-	echo '<div id="elgg_topbar" class="clearfix">';
-	echo '<div id="elgg_topbar_contents">';
+	echo '<div id="elgg-topbar" class="clearfix">';
+	echo '<div id="elgg-topbar-contents">';
 	
 	// Elgg logo
 	echo '<a href="http://www.elgg.org">';
-	echo "<img class=\"site_logo\" src=\"".elgg_get_site_url()."_graphics/elgg_toolbar_logo.gif\" alt=\"Elgg logo\" />";
+	echo "<img class=\"site-logo\" src=\"".elgg_get_site_url()."_graphics/elgg_toolbar_logo.gif\" alt=\"Elgg logo\" />";
 	echo '</a>';
 	
 	// avatar
 	$user_link = $user->getURL();
 	$user_image = $user->getIcon('topbar');
-	echo "<a href=\"$user_link\"><img class=\"user_mini_avatar\" src=\"$user_image\" alt=\"User avatar\" /></a>";
+	echo "<a href=\"$user_link\"><img class=\"user-mini-avatar\" src=\"$user_image\" alt=\"User avatar\" /></a>";
 
 	// logout link
 	echo elgg_view('page_elements/topbar_logout', $vars);
diff --git a/views/default/page_elements/topbar_logout.php b/views/default/page_elements/topbar_logout.php
index 38a37bc22..2d2ecf67c 100644
--- a/views/default/page_elements/topbar_logout.php
+++ b/views/default/page_elements/topbar_logout.php
@@ -5,7 +5,7 @@
  * Called within the Elgg topbar view.
  */
 
-echo '<div class="log_out">';
+echo '<div class="log-out">';
 echo elgg_view('output/url', array(
 	'href' => "action/logout",
 	'text' => elgg_echo('logout'),