diff --git a/examples/sections_iterator_object/Sections_Iterator_Object.php b/examples/section_iterator_objects/SectionIteratorObject.php
similarity index 83%
rename from examples/sections_iterator_object/Sections_Iterator_Object.php
rename to examples/section_iterator_objects/SectionIteratorObject.php
index e517fe0..5a592ab 100644
--- a/examples/sections_iterator_object/Sections_Iterator_Object.php
+++ b/examples/section_iterator_objects/SectionIteratorObject.php
@@ -1,17 +1,16 @@
 <?php
 
-class Sections_Iterator_Object extends Mustache {
+class SectionIteratorObject extends Mustache {
 	public $start = "It worked the first time.";
 
 	public function middle() {
-		return new Iterator_Object;
+		return new IteratorObject();
 	}
 
 	public $final = "Then, surprisingly, it worked the final time.";
 }
 
-class Iterator_Object implements Iterator
-{
+class IteratorObject implements Iterator {
 	protected $_position = 0;
 
 	protected $_data = array(
diff --git a/examples/sections_iterator_object/sections.mustache b/examples/section_iterator_objects/section_iterator_object.mustache
similarity index 100%
rename from examples/sections_iterator_object/sections.mustache
rename to examples/section_iterator_objects/section_iterator_object.mustache
diff --git a/examples/sections_iterable_object/sections.txt b/examples/section_iterator_objects/section_iterator_object.txt
similarity index 100%
rename from examples/sections_iterable_object/sections.txt
rename to examples/section_iterator_objects/section_iterator_object.txt
diff --git a/examples/sections_noniterable_object/Sections_Noniterable_Object.php b/examples/section_magic_objects/SectionMagicObject.php
similarity index 67%
rename from examples/sections_noniterable_object/Sections_Noniterable_Object.php
rename to examples/section_magic_objects/SectionMagicObject.php
index 6232610..42e7285 100644
--- a/examples/sections_noniterable_object/Sections_Noniterable_Object.php
+++ b/examples/section_magic_objects/SectionMagicObject.php
@@ -1,29 +1,26 @@
 <?php
 
-class Sections_NonIterable_Object extends Mustache {
+class SectionMagicObject extends Mustache {
 	public $start = "It worked the first time.";
 
 	public function middle() {
-		return new Non_Iterable_Object;
+		return new MagicObject();
 	}
 
 	public $final = "Then, surprisingly, it worked the final time.";
 }
 
-class Non_Iterable_Object
-{
+class MagicObject {
 	protected $_data = array(
 		'foo' => 'And it worked the second time.',
 		'bar' => 'As well as the third.'
 	);
 
-	public function __get($key)
-	{
+	public function __get($key) {
 		return isset($this->_data[$key]) ? $this->_data[$key] : NULL;
 	}
 
-	public function __isset($key)
-	{
+	public function __isset($key) {
 		return isset($this->_data[$key]);
 	}
 }
\ No newline at end of file
diff --git a/examples/sections_iterable_object/sections.mustache b/examples/section_magic_objects/section_magic_object.mustache
similarity index 100%
rename from examples/sections_iterable_object/sections.mustache
rename to examples/section_magic_objects/section_magic_object.mustache
diff --git a/examples/sections_iterator_object/sections.txt b/examples/section_magic_objects/section_magic_object.txt
similarity index 100%
rename from examples/sections_iterator_object/sections.txt
rename to examples/section_magic_objects/section_magic_object.txt
diff --git a/examples/sections_iterable_object/Sections_Iterable_Object.php b/examples/section_objects/SectionObjects.php
similarity index 70%
rename from examples/sections_iterable_object/Sections_Iterable_Object.php
rename to examples/section_objects/SectionObjects.php
index ee2f661..41b7d84 100644
--- a/examples/sections_iterable_object/Sections_Iterable_Object.php
+++ b/examples/section_objects/SectionObjects.php
@@ -1,17 +1,16 @@
 <?php
 
-class Sections_Iterable_Object extends Mustache {
+class SectionObjects extends Mustache {
 	public $start = "It worked the first time.";
 
 	public function middle() {
-		return new Iterable_Object;
+		return new SectionObject;
 	}
 
 	public $final = "Then, surprisingly, it worked the final time.";
 }
 
-class Iterable_Object
-{
+class SectionObject {
 	public $foo = 'And it worked the second time.';
 	public $bar = 'As well as the third.';
 }
\ No newline at end of file
diff --git a/examples/sections_noniterable_object/sections.mustache b/examples/section_objects/section_objects.mustache
similarity index 100%
rename from examples/sections_noniterable_object/sections.mustache
rename to examples/section_objects/section_objects.mustache
diff --git a/examples/sections_noniterable_object/sections.txt b/examples/section_objects/section_objects.txt
similarity index 100%
rename from examples/sections_noniterable_object/sections.txt
rename to examples/section_objects/section_objects.txt