diff --git a/CHANGELOG b/CHANGELOG
index 7e2636bc0..3b1dc67af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.3.4
+ - FIX: Generator class renamed because it's a reserved name in PHP 5.5
+ - THX: thanks to @faustgertz for the heads up
+
 PL-v0.3.3
  - FIX: links created with {{ link.pattern }} now have the correct path
  - FIX: links within a pattern now properly update the history
diff --git a/builder/builder.php b/builder/builder.php
index b5bcabd41..44efda0aa 100644
--- a/builder/builder.php
+++ b/builder/builder.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder CLI - v0.3.3
+ * Pattern Lab Builder CLI - v0.3.4
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
@@ -36,7 +36,7 @@
 		// initiate the g (generate) switch
 		
 		// iterate over the source directory and generate the site
-		$g = new Generator();
+		$g = new Generatr();
 		$g->generate();
 		print "your site has been generated...\n";
 		
@@ -45,12 +45,12 @@
 		// initiate the w (watch) switch
 		
 		// iterate over the source directory and generate the site
-		$g = new Generator();
+		$g = new Generatr();
 		$g->generate();
 		print "your site has been generated...\n";
 		
 		// watch the source directory and regenerate any changed files
-		$w = new Watcher();
+		$w = new Watchr();
 		print "watching your site for changes...\n";
 		$w->watch();
 		
diff --git a/builder/lib/builder.lib.php b/builder/lib/builder.lib.php
index b3968947d..30a33010f 100644
--- a/builder/lib/builder.lib.php
+++ b/builder/lib/builder.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder Class - v0.3.3
+ * Pattern Lab Builder Class - v0.3.4
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
@@ -10,7 +10,7 @@
  *
  */
 
-class Builder {
+class Buildr {
 
 	// i was lazy when i started this project & kept (mainly) to two letter vars. sorry.
 	protected $mpl;               // mustache pattern loader instance
@@ -51,7 +51,7 @@ public function __construct() {
 			// if the variables are array-like make sure the properties are validated/trimmed/lowercased before saving
 			if (($key == "ie") || ($key == "id")) {
 				$values = explode(",",$value);
-				array_walk($values,'Builder::trim');
+				array_walk($values,'Buildr::trim');
 				$this->$key = $values;
 			} else {
 				$this->$key = $value;
@@ -127,7 +127,7 @@ protected function generateMainPages() {
 		$sd = $this->gatherPartials();
 		
 		// sort partials by patternLink
-		usort($sd['partials'], "Builder::sortPartials");
+		usort($sd['partials'], "Buildr::sortPartials");
 		
 		// render the "view all" pages
 		$this->generateViewAllPages();
diff --git a/builder/lib/generator.lib.php b/builder/lib/generator.lib.php
index b3874a74e..1772df645 100644
--- a/builder/lib/generator.lib.php
+++ b/builder/lib/generator.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Generator Class - v0.3.3
+ * Pattern Lab Generator Class - v0.3.4
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
@@ -11,7 +11,7 @@
  *
  */
 
-class Generator extends Builder {
+class Generatr extends Buildr {
 	
 	/**
 	* Use the Builder __construct to gather the config variables
diff --git a/builder/lib/watcher.lib.php b/builder/lib/watcher.lib.php
index 1040c5700..c48eaab89 100644
--- a/builder/lib/watcher.lib.php
+++ b/builder/lib/watcher.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Watcher Class - v0.3.3
+ * Pattern Lab Watcher Class - v0.3.4
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
@@ -14,7 +14,7 @@
  *
  */
 
-class Watcher extends Builder {
+class Watchr extends Buildr {
 	
 	/**
 	* Use the Builder __construct to gather the config variables