diff --git a/wp-content/themes/classic/style.css b/wp-content/themes/classic/style.css
index 04f612dcee..93dc883bc0 100644
--- a/wp-content/themes/classic/style.css
+++ b/wp-content/themes/classic/style.css
@@ -322,7 +322,7 @@ ul.post-meta span.post-meta-key {
 
 /* Captions & aligment */
 .aligncenter,
-dl.aligncenter {
+div.aligncenter {
 	display: block;
 	margin-left: auto;
 	margin-right: auto;
@@ -336,7 +336,7 @@ dl.aligncenter {
 	float: right;
 }
 
-.wp_caption {
+.wp-caption {
 	border: 1px solid #ddd;
 	text-align: center;
 	background-color: #f3f3f3;
@@ -348,13 +348,13 @@ dl.aligncenter {
 	border-radius: 3px;
 }
 
-.wp_caption img {
+.wp-caption img {
 	margin: 0;
 	padding: 0;
 	border: 0 none;
 }
 
-.wp_caption_dd {
+.wp-caption p.wp-caption-text {
 	font-size: 11px;
 	line-height: 17px;
 	padding: 0 4px 5px;
diff --git a/wp-content/themes/default/style.css b/wp-content/themes/default/style.css
index 7e42a2a92d..2be7218ccb 100644
--- a/wp-content/themes/default/style.css
+++ b/wp-content/themes/default/style.css
@@ -640,13 +640,13 @@ a img {
 
 /* Captions */
 .aligncenter,
-dl.aligncenter {
+div.aligncenter {
 	display: block;
 	margin-left: auto;
 	margin-right: auto;
 }
 
-.wp_caption {
+.wp-caption {
 	border: 1px solid #ddd;
 	text-align: center;
 	background-color: #f3f3f3;
@@ -658,13 +658,13 @@ dl.aligncenter {
 	border-radius: 3px;
 }
 
-.wp_caption img {
+.wp-caption img {
 	margin: 0;
 	padding: 0;
 	border: 0 none;
 }
 
-.wp_caption_dd {
+.wp-caption p.wp-caption-text {
 	font-size: 11px;
 	line-height: 17px;
 	padding: 0 4px 5px;
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 7be0e50b0e..b200b914ab 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -350,12 +350,12 @@ function wp_get_attachment_image($attachment_id, $size='thumbnail', $icon = fals
 	return $html;
 }
 
-add_shortcode('wp_caption', 'wp_caption_shortcode');
+add_shortcode('wp_caption', 'img_caption_shortcode');
 
-function wp_caption_shortcode($attr, $content = null) {
+function img_caption_shortcode($attr, $content = null) {
 	
 	// Allow plugins/themes to override the default caption template.
-	$output = apply_filters('wp_caption_shortcode', '', $attr, $content);
+	$output = apply_filters('img_caption_shortcode', '', $attr, $content);
 	if ( $output != '' )
 		return $output;
 
@@ -371,8 +371,8 @@ function wp_caption_shortcode($attr, $content = null) {
 	
 	if ( $id ) $id = 'id="' . $id . '" ';
 	
-	return '<dl ' . $id . 'class="wp_caption ' . $align . '" style="width: ' . (10 + (int) $width) . 'px">'
-	. '<dt class="wp_caption_dt">' . $content . '</dt><dd class="wp_caption_dd">' . $caption . '</dd></dl>';
+	return '<div ' . $id . 'class="wp-caption ' . $align . '" style="width: ' . (10 + (int) $width) . 'px">'
+	. $content . '<p class="wp-caption-text">' . $caption . '</p></div>';
 }
 
 add_shortcode('gallery', 'gallery_shortcode');