diff --git a/tests/static/button/default.html b/tests/static/button/default.html
index aa78b3466..a2c35a4ad 100644
--- a/tests/static/button/default.html
+++ b/tests/static/button/default.html
@@ -110,7 +110,7 @@
 	
 	<h2>Button Sets</h2>
 	
-	<div class="ui-button-set">
+	<div class="ui-buttonset">
 		<button class="ui-button ui-button-text-only ui-widget ui-state-default ui-corner-left"><span class="ui-button-text">Simple button</span></button>
 		<button class="ui-button ui-button-text-only ui-widget ui-state-default"><span class="ui-button-text">Simple button</span></button>
 		<button class="ui-button ui-button-text-only ui-widget ui-state-default ui-corner-right"><span class="ui-button-text">Simple button</span></button>
diff --git a/tests/unit/button/button_core.js b/tests/unit/button/button_core.js
index 4569737a4..5b30aa860 100644
--- a/tests/unit/button/button_core.js
+++ b/tests/unit/button/button_core.js
@@ -59,7 +59,7 @@ test("input type submit, don't create child elements", function() {
 
 test("buttonset", function() {
 	var set = $("#radio1").buttonset();
-	ok( set.is(".ui-button-set") );
+	ok( set.is(".ui-buttonset") );
 	same( set.children(".ui-button").length, 3 );
 	same( set.children("input:radio.ui-helper-hidden-accessible").length, 3 );
 	ok( set.children("label:eq(0)").is(".ui-button.ui-corner-left:not(.ui-corner-all)") );
diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css
index 33e1b4b39..47777a428 100644
--- a/themes/base/jquery.ui.button.css
+++ b/themes/base/jquery.ui.button.css
@@ -23,8 +23,8 @@ input.ui-button { padding: .4em 1em; }
 .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
 
 /*button sets*/
-.ui-button-set { margin-right: 7px; }
-.ui-button-set .ui-button { margin-left: 0; margin-right: -.3em; }
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
 
 /* workarounds */
 button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
index be0af7ecd..ff2c1ebb6 100644
--- a/ui/jquery.ui.button.js
+++ b/ui/jquery.ui.button.js
@@ -311,7 +311,7 @@ $.widget( "ui.button", {
 
 $.widget( "ui.buttonset", {
 	_create: function() {
-		this.element.addClass( "ui-button-set" );
+		this.element.addClass( "ui-buttonset" );
 		this._init();
 	},
 	
@@ -349,7 +349,7 @@ $.widget( "ui.buttonset", {
 	},
 
 	destroy: function() {
-		this.element.removeClass( "ui-button-set" );
+		this.element.removeClass( "ui-buttonset" );
 		this.buttons
 			.map(function() {
 				return $( this ).button( "widget" )[ 0 ];