diff --git a/demos/accordion/custom_icons.html b/demos/accordion/custom-icons.html
similarity index 100%
rename from demos/accordion/custom_icons.html
rename to demos/accordion/custom-icons.html
diff --git a/demos/accordion/index.html b/demos/accordion/index.html
index ca0fd7eeda..309c75de00 100644
--- a/demos/accordion/index.html
+++ b/demos/accordion/index.html
@@ -12,7 +12,7 @@
 			<li><a href="fillspace.html">Fill space</a></li>
 			<li><a href="collapsible.html">Collapse content</a></li>
 			<li><a href="mouseover.html">Open on mouseover</a></li>
-			<li><a href="custom_icons.html">Customize icons</a></li>
+			<li><a href="custom-icons.html">Customize icons</a></li>
 			
 		</ul>
 	</div>
diff --git a/demos/datepicker/alt_field.html b/demos/datepicker/alt-field.html
similarity index 100%
rename from demos/datepicker/alt_field.html
rename to demos/datepicker/alt-field.html
diff --git a/demos/datepicker/date_formats.html b/demos/datepicker/date-formats.html
similarity index 100%
rename from demos/datepicker/date_formats.html
rename to demos/datepicker/date-formats.html
diff --git a/demos/datepicker/dropdown_month_year.html b/demos/datepicker/dropdown-month-year.html
similarity index 100%
rename from demos/datepicker/dropdown_month_year.html
rename to demos/datepicker/dropdown-month-year.html
diff --git a/demos/datepicker/icon_trigger.html b/demos/datepicker/icon-trigger.html
similarity index 100%
rename from demos/datepicker/icon_trigger.html
rename to demos/datepicker/icon-trigger.html
diff --git a/demos/datepicker/index.html b/demos/datepicker/index.html
index a1738de2ed..dfe22db65a 100644
--- a/demos/datepicker/index.html
+++ b/demos/datepicker/index.html
@@ -10,15 +10,15 @@
 	<h4>Examples</h4>
 	<ul>
 		<li class="demo-config-on"><a href="default.html">Default functionality</a></li>
-		<li><a href="date_formats.html">Format date</a></li>
-		<li><a href="min_max.html">Restrict date range</a></li>
+		<li><a href="date-formats.html">Format date</a></li>
+		<li><a href="min-max.html">Restrict date range</a></li>
 		<li><a href="localization.html">Localize calendar</a></li>
-		<li><a href="alt_field.html">Populate alternate field</a></li>
+		<li><a href="alt-field.html">Populate alternate field</a></li>
 		<li><a href="inline.html">Display inline</a></li>
 		<li><a href="buttonbar.html">Display button bar</a></li>
-		<li><a href="dropdown_month_year.html">Display month &amp; year menus</a></li>		
-		<li><a href="multiple_calendars.html">Display multiple months</a></li>		
-		<li><a href="icon_trigger.html">Icon trigger</a></li>
+		<li><a href="dropdown-month-year.html">Display month &amp; year menus</a></li>		
+		<li><a href="multiple-calendars.html">Display multiple months</a></li>		
+		<li><a href="icon-trigger.html">Icon trigger</a></li>
 	</ul>
 </div>
 
diff --git a/demos/datepicker/min_max.html b/demos/datepicker/min-max.html
similarity index 100%
rename from demos/datepicker/min_max.html
rename to demos/datepicker/min-max.html
diff --git a/demos/datepicker/multiple_calendars.html b/demos/datepicker/multiple-calendars.html
similarity index 100%
rename from demos/datepicker/multiple_calendars.html
rename to demos/datepicker/multiple-calendars.html
diff --git a/demos/dialog/index.html b/demos/dialog/index.html
index 28628a0854..bed31aba2b 100644
--- a/demos/dialog/index.html
+++ b/demos/dialog/index.html
@@ -11,9 +11,9 @@
 	<ul>
 		<li class="demo-config-on"><a href="default.html">Default functionality</a></li>
 		<li><a href="modal.html">Modal dialog</a></li>
-		<li><a href="modal_message.html">Modal message</a></li>
-		<li><a href="modal_confirmation.html">Modal confirmation</a></li>
-		<li><a href="modal_form.html">Modal form</a></li>
+		<li><a href="modal-message.html">Modal message</a></li>
+		<li><a href="modal-confirmation.html">Modal confirmation</a></li>
+		<li><a href="modal-form.html">Modal form</a></li>
 	</ul>
 </div>
 
diff --git a/demos/dialog/modal_confirmation.html b/demos/dialog/modal-confirmation.html
similarity index 100%
rename from demos/dialog/modal_confirmation.html
rename to demos/dialog/modal-confirmation.html
diff --git a/demos/dialog/modal_form.html b/demos/dialog/modal-form.html
similarity index 100%
rename from demos/dialog/modal_form.html
rename to demos/dialog/modal-form.html
diff --git a/demos/dialog/modal_message.html b/demos/dialog/modal-message.html
similarity index 100%
rename from demos/dialog/modal_message.html
rename to demos/dialog/modal-message.html
diff --git a/demos/droppable/index.html b/demos/droppable/index.html
index 85719e1be1..3ffa5651d3 100644
--- a/demos/droppable/index.html
+++ b/demos/droppable/index.html
@@ -14,7 +14,7 @@
 		<li><a href="propagation.html">Prevent propagation</a></li>
 		<li><a href="visual-feedback.html">Visual feedback</a></li>
 		<li><a href="revert.html">Revert draggable position</a></li>
-		<li><a href="photo_manager.html">Simple photo manager</a></li>
+		<li><a href="photo-manager.html">Simple photo manager</a></li>
 	</ul>
 </div>
 
diff --git a/demos/droppable/photo_manager.html b/demos/droppable/photo-manager.html
similarity index 100%
rename from demos/droppable/photo_manager.html
rename to demos/droppable/photo-manager.html
diff --git a/demos/slider/index.html b/demos/slider/index.html
index 2319efad63..19b9fea962 100644
--- a/demos/slider/index.html
+++ b/demos/slider/index.html
@@ -14,11 +14,11 @@
 		<li><a href="range.html">Range slider</a></li>
 		<li><a href="rangemin.html">Range with fixed minimum</a></li>
 		<li><a href="rangemax.html">Range with fixed maximum</a></li>
-		<li><a href="slider_vertical.html">Vertical slider</a></li>
-		<li><a href="range_vertical.html">Vertical range slider</a></li>
-		<li><a href="multiple_vertical.html">Multiple sliders</a></li>
+		<li><a href="slider-vertical.html">Vertical slider</a></li>
+		<li><a href="range-vertical.html">Vertical range slider</a></li>
+		<li><a href="multiple-vertical.html">Multiple sliders</a></li>
 		<li><a href="colorpicker.html">Simple colorpicker</a></li>
-		<li><a href="side_scroll.html">Simple scrollbar</a></li>
+		<li><a href="side-scroll.html">Simple scrollbar</a></li>
 	</ul>
 </div>
 
diff --git a/demos/slider/multiple_vertical.html b/demos/slider/multiple-vertical.html
similarity index 100%
rename from demos/slider/multiple_vertical.html
rename to demos/slider/multiple-vertical.html
diff --git a/demos/slider/range_vertical.html b/demos/slider/range-vertical.html
similarity index 100%
rename from demos/slider/range_vertical.html
rename to demos/slider/range-vertical.html
diff --git a/demos/slider/side_scroll.html b/demos/slider/side-scroll.html
similarity index 100%
rename from demos/slider/side_scroll.html
rename to demos/slider/side-scroll.html
diff --git a/demos/slider/slider_vertical.html b/demos/slider/slider-vertical.html
similarity index 100%
rename from demos/slider/slider_vertical.html
rename to demos/slider/slider-vertical.html