diff --git a/codegen/templates/aggregate_db_orm/class_paths/_main.tpl.php b/codegen/templates/aggregate_db_orm/class_paths/_main.tpl.php
index 3eb871d..0e6d276 100644
--- a/codegen/templates/aggregate_db_orm/class_paths/_main.tpl.php
+++ b/codegen/templates/aggregate_db_orm/class_paths/_main.tpl.php
@@ -1,6 +1,6 @@
 <?php
 	/** @var QSqlTable[] $objTableArray */
-	/** @var \QCubed\Codegen\DatabaseCodeGen $objCodeGen */
+	/** @var \QCubed\Codegen\DatabaseCodegen $objCodegen */
 	global $_TEMPLATE_SETTINGS;
 	$_TEMPLATE_SETTINGS = array(
 		'OverwriteFlag' => true,
diff --git a/codegen/templates/aggregate_db_orm/qqn/_main.tpl.php b/codegen/templates/aggregate_db_orm/qqn/_main.tpl.php
index f0d6e6d..9f551c7 100644
--- a/codegen/templates/aggregate_db_orm/qqn/_main.tpl.php
+++ b/codegen/templates/aggregate_db_orm/qqn/_main.tpl.php
@@ -1,6 +1,6 @@
 <?php
 	/** @var QSqlTable[] $objTableArray */
-	/** @var \QCubed\Codegen\DatabaseCodeGen $objCodeGen */
+	/** @var \QCubed\Codegen\DatabaseCodegen $objCodegen */
 	global $_TEMPLATE_SETTINGS;
 	$_TEMPLATE_SETTINGS = array(
 		'OverwriteFlag' => true,
diff --git a/codegen/templates/aggregate_db_type/class_paths/_main.tpl.php b/codegen/templates/aggregate_db_type/class_paths/_main.tpl.php
index 15060b6..5878a38 100644
--- a/codegen/templates/aggregate_db_type/class_paths/_main.tpl.php
+++ b/codegen/templates/aggregate_db_type/class_paths/_main.tpl.php
@@ -1,6 +1,6 @@
 <?php
 	/** @var QSqlTable[] $objTableArray */
-	/** @var \QCubed\Codegen\DatabaseCodeGen $objCodeGen */
+	/** @var \QCubed\Codegen\DatabaseCodegen $objCodegen */
 	global $_TEMPLATE_SETTINGS;
 	$_TEMPLATE_SETTINGS = array(
 		'OverwriteFlag' => true,
diff --git a/codegen/templates/db_orm/class_gen/_main.tpl.php b/codegen/templates/db_orm/class_gen/_main.tpl.php
index bbcc9a6..c66f196 100644
--- a/codegen/templates/db_orm/class_gen/_main.tpl.php
+++ b/codegen/templates/db_orm/class_gen/_main.tpl.php
@@ -1,6 +1,6 @@
 <?php
 	/** @var QSqlTable $objTable */
-	/** @var \QCubed\Codegen\DatabaseCodeGen $objCodeGen */
+	/** @var \QCubed\Codegen\DatabaseCodegen $objCodegen */
 	global $_TEMPLATE_SETTINGS;
 	$_TEMPLATE_SETTINGS = array(
 		'OverwriteFlag' => true,
diff --git a/codegen/templates/db_orm/class_gen/associated_object.tpl.php b/codegen/templates/db_orm/class_gen/associated_object.tpl.php
index 6adb3a8..da20d50 100644
--- a/codegen/templates/db_orm/class_gen/associated_object.tpl.php
+++ b/codegen/templates/db_orm/class_gen/associated_object.tpl.php
@@ -1,4 +1,4 @@
-<?php $objReverseReferenceTable = $objCodeGen->TableArray[strtolower($objReverseReference->Table)]; ?>
+<?php $objReverseReferenceTable = $objCodegen->TableArray[strtolower($objReverseReference->Table)]; ?>
 <?php $objReverseReferenceColumn = $objReverseReferenceTable->ColumnArray[strtolower($objReverseReference->Column)]; ?>
 
 
@@ -14,11 +14,11 @@
      */
     public function get<?= $objReverseReference->ObjectDescription ?>Array($objOptionalClauses = null)
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             return array();
 
         try {
-            return <?= $objReverseReference->VariableType ?>::LoadArrayBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodeGen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>, $objOptionalClauses);
+            return <?= $objReverseReference->VariableType ?>::LoadArrayBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodegen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>, $objOptionalClauses);
         } catch (Caller $objExc) {
             $objExc->incrementOffset();
             throw $objExc;
@@ -32,10 +32,10 @@ public function get<?= $objReverseReference->ObjectDescription ?>Array($objOptio
     */
     public function count<?= $objReverseReference->ObjectDescriptionPlural ?>()
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             return 0;
 
-        return <?= $objReverseReference->VariableType ?>::CountBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodeGen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>);
+        return <?= $objReverseReference->VariableType ?>::CountBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodegen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>);
     }
 
     /**
@@ -48,9 +48,9 @@ public function count<?= $objReverseReference->ObjectDescriptionPlural ?>()
     */
     public function associate<?= $objReverseReference->ObjectDescription ?>(<?= $objReverseReference->VariableType ?> $<?= $objReverseReference->VariableName ?>)
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Associate<?= $objReverseReference->ObjectDescription ?> on this unsaved <?= $objTable->ClassName ?>.');
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($' . $objReverseReference->VariableName . '->', '))', 'PropertyName', $objReverseReferenceTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($' . $objReverseReference->VariableName . '->', '))', 'PropertyName', $objReverseReferenceTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Associate<?= $objReverseReference->ObjectDescription ?> on this <?= $objTable->ClassName ?> with an unsaved <?= $objReverseReferenceTable->ClassName ?>.');
 
         // Get the Database Object for this Class
@@ -82,9 +82,9 @@ public function associate<?= $objReverseReference->ObjectDescription ?>(<?= $obj
     */
     public function unassociate<?= $objReverseReference->ObjectDescription ?>(<?= $objReverseReference->VariableType ?> $<?= $objReverseReference->VariableName ?>)
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Unassociate<?= $objReverseReference->ObjectDescription ?> on this unsaved <?= $objTable->ClassName ?>.');
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($' . $objReverseReference->VariableName . '->', '))', 'PropertyName', $objReverseReferenceTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($' . $objReverseReference->VariableName . '->', '))', 'PropertyName', $objReverseReferenceTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Unassociate<?= $objReverseReference->ObjectDescription ?> on this <?= $objTable->ClassName ?> with an unsaved <?= $objReverseReferenceTable->ClassName ?>.');
 
         // Get the Database Object for this Class
@@ -114,7 +114,7 @@ public function unassociate<?= $objReverseReference->ObjectDescription ?>(<?= $o
     */
     public function unassociateAll<?= $objReverseReference->ObjectDescriptionPlural ?>()
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Unassociate<?= $objReverseReference->ObjectDescription ?> on this unsaved <?= $objTable->ClassName ?>.');
 
         // Get the Database Object for this Class
@@ -141,9 +141,9 @@ public function unassociateAll<?= $objReverseReference->ObjectDescriptionPlural
     */
     public function deleteAssociated<?= $objReverseReference->ObjectDescription ?>(<?= $objReverseReference->VariableType ?> $<?= $objReverseReference->VariableName ?>)
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Unassociate<?= $objReverseReference->ObjectDescription ?> on this unsaved <?= $objTable->ClassName ?>.');
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($' . $objReverseReference->VariableName . '->', '))', 'PropertyName', $objReverseReferenceTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($' . $objReverseReference->VariableName . '->', '))', 'PropertyName', $objReverseReferenceTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Unassociate<?= $objReverseReference->ObjectDescription ?> on this <?= $objTable->ClassName ?> with an unsaved <?= $objReverseReferenceTable->ClassName ?>.');
 
         // Get the Database Object for this Class
@@ -171,7 +171,7 @@ public function deleteAssociated<?= $objReverseReference->ObjectDescription ?>(<
     */
     public function deleteAll<?= $objReverseReference->ObjectDescriptionPlural ?>()
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Unassociate<?= $objReverseReference->ObjectDescription ?> on this unsaved <?= $objTable->ClassName ?>.');
 
         // Get the Database Object for this Class
diff --git a/codegen/templates/db_orm/class_gen/associated_object_manytomany.tpl.php b/codegen/templates/db_orm/class_gen/associated_object_manytomany.tpl.php
index 18daf05..562ad76 100644
--- a/codegen/templates/db_orm/class_gen/associated_object_manytomany.tpl.php
+++ b/codegen/templates/db_orm/class_gen/associated_object_manytomany.tpl.php
@@ -1,4 +1,4 @@
-<?php $objManyToManyReferenceTable = $objCodeGen->TableArray[strtolower($objManyToManyReference->AssociatedTable)]; ?>
+<?php $objManyToManyReferenceTable = $objCodegen->TableArray[strtolower($objManyToManyReference->AssociatedTable)]; ?>
 
 
     // Related Many-to-Many Objects' Methods for <?= $objManyToManyReference->ObjectDescription ?>
@@ -12,7 +12,7 @@
      * @throws Caller
      */
     public function get<?= $objManyToManyReference->ObjectDescription ?>Array($objClauses = null) {
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             return array();
 
         try {
@@ -31,7 +31,7 @@ public function get<?= $objManyToManyReference->ObjectDescription ?>Array($objCl
      */
     public function get<?= $objManyToManyReference->ObjectDescription ?>Keys()
     {
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Get<?= $objManyToManyReference->ObjectDescription ?>Ids on this unsaved <?= $objTable->ClassName ?>.');
 
         // Get the Database Object for this Class
@@ -61,7 +61,7 @@ public function get<?= $objManyToManyReference->ObjectDescription ?>Keys()
     */
     public function count<?= $objManyToManyReference->ObjectDescriptionPlural ?>()
     {
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             return 0;
 
         return <?= $objManyToManyReference->VariableType ?>::CountBy<?= $objManyToManyReference->OppositeObjectDescription ?>($this-><?= $objTable->PrimaryKeyColumnArray[0]->VariableName ?>);
@@ -76,9 +76,9 @@ public function count<?= $objManyToManyReference->ObjectDescriptionPlural ?>()
     */
     public function is<?= $objManyToManyReference->ObjectDescription ?>Associated(<?= $objManyToManyReference->VariableType ?> $<?= $objManyToManyReference->VariableName ?>)
     {
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Is<?= $objManyToManyReference->ObjectDescription ?>Associated on this unsaved <?= $objTable->ClassName ?>.');
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($' . $objManyToManyReference->VariableName . '->', '))', 'PropertyName', $objManyToManyReferenceTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($' . $objManyToManyReference->VariableName . '->', '))', 'PropertyName', $objManyToManyReferenceTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Is<?= $objManyToManyReference->ObjectDescription ?>Associated on this <?= $objTable->ClassName ?> with an unsaved <?= $objManyToManyReferenceTable->ClassName ?>.');
 
         $intRowCount = <?= $objTable->ClassName ?>::queryCount(
@@ -100,7 +100,7 @@ public function is<?= $objManyToManyReference->ObjectDescription ?>Associated(<?
     */
     public function is<?= $objManyToManyReference->ObjectDescription ?>AssociatedByKey($key)
     {
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Is<?= $objManyToManyReference->ObjectDescription ?>AssociatedByKey on this unsaved <?= $objTable->ClassName ?>.');
 
         $intRowCount = <?= $objTable->ClassName ?>::queryCount(
@@ -121,9 +121,9 @@ public function is<?= $objManyToManyReference->ObjectDescription ?>AssociatedByK
      * @return void
     */
     public function associate<?= $objManyToManyReference->ObjectDescription ?>(<?= $objManyToManyReference->VariableType ?> $<?= $objManyToManyReference->VariableName ?>) {
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Associate<?= $objManyToManyReference->ObjectDescription ?> on this unsaved <?= $objTable->ClassName ?>.');
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($' . $objManyToManyReference->VariableName . '->', '))', 'PropertyName', $objManyToManyReferenceTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($' . $objManyToManyReference->VariableName . '->', '))', 'PropertyName', $objManyToManyReferenceTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Associate<?= $objManyToManyReference->ObjectDescription ?> on this <?= $objTable->ClassName ?> with an unsaved <?= $objManyToManyReferenceTable->ClassName ?>.');
 
         // Get the Database Object for this Class
@@ -154,7 +154,7 @@ public function associate<?= $objManyToManyReference->ObjectDescription ?>(<?= $
     */
     public function associate<?= $objManyToManyReference->ObjectDescription ?>ByKey($<?= $objManyToManyReference->OppositeVariableName ?>)
     {
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Associate<?= $objManyToManyReference->ObjectDescription ?> on this unsaved <?= $objTable->ClassName ?>.');
 
         // Get the Database Object for this Class
@@ -186,9 +186,9 @@ public function associate<?= $objManyToManyReference->ObjectDescription ?>ByKey(
     */
     public function unassociate<?= $objManyToManyReference->ObjectDescription ?>(<?= $objManyToManyReference->VariableType ?> $<?= $objManyToManyReference->VariableName ?>)
     {
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Unassociate<?= $objManyToManyReference->ObjectDescription ?> on this unsaved <?= $objTable->ClassName ?>.');
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($' . $objManyToManyReference->VariableName . '->', '))', 'PropertyName', $objManyToManyReferenceTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($' . $objManyToManyReference->VariableName . '->', '))', 'PropertyName', $objManyToManyReferenceTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Unassociate<?= $objManyToManyReference->ObjectDescription ?> on this <?= $objTable->ClassName ?> with an unsaved <?= $objManyToManyReferenceTable->ClassName ?>.');
 
         // Get the Database Object for this Class
@@ -216,7 +216,7 @@ public function unassociate<?= $objManyToManyReference->ObjectDescription ?>(<?=
     */
     public function unassociateAll<?= $objManyToManyReference->ObjectDescriptionPlural ?>()
     {
-        if (<?= $objCodeGen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->implodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call UnassociateAll<?= $objManyToManyReference->ObjectDescription ?>Array on this unsaved <?= $objTable->ClassName ?>.');
 
         // Get the Database Object for this Class
diff --git a/codegen/templates/db_orm/class_gen/associated_object_type_manytomany.tpl.php b/codegen/templates/db_orm/class_gen/associated_object_type_manytomany.tpl.php
index 29bacfa..8365fc5 100644
--- a/codegen/templates/db_orm/class_gen/associated_object_type_manytomany.tpl.php
+++ b/codegen/templates/db_orm/class_gen/associated_object_type_manytomany.tpl.php
@@ -1,6 +1,6 @@
 <?php
 // associated_object_type_manytomany.tpl
-$objManyToManyReferenceTable = $objCodeGen->TypeTableArray[strtolower($objManyToManyReference->AssociatedTable)];
+$objManyToManyReferenceTable = $objCodegen->TypeTableArray[strtolower($objManyToManyReference->AssociatedTable)];
 ?>   
     // Related Many-to-Many Object Methods for <?= $objManyToManyReference->ObjectDescription; ?>
 
@@ -13,7 +13,7 @@
      */
     public function get<?= $objManyToManyReference->ObjectDescription; ?>Array($objOptionalClauses = null)
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
             return array();
 
         if($objOptionalClauses)
@@ -43,7 +43,7 @@ public function get<?= $objManyToManyReference->ObjectDescription; ?>Array($objO
      */
     public function count<?= $objManyToManyReference->ObjectDescriptionPlural; ?>()
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
             return 0;
 
         // Get the Database Object for this Class
@@ -66,7 +66,7 @@ public function count<?= $objManyToManyReference->ObjectDescriptionPlural; ?>()
      */
     public function is<?= $objManyToManyReference->ObjectDescription; ?>Associated($intId)
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Is<?= $objManyToManyReference->ObjectDescription; ?>Associated on this unsaved <?= $objTable->ClassName; ?>.');
 
 
@@ -89,7 +89,7 @@ public function is<?= $objManyToManyReference->ObjectDescription; ?>Associated($
     public function associate<?= $objManyToManyReference->ObjectDescription; ?>($mixId)
     {
 
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Associate<?= $objManyToManyReference->ObjectDescription; ?> on this unsaved <?= $objTable->ClassName; ?>.');
 
 
@@ -121,7 +121,7 @@ public function associate<?= $objManyToManyReference->ObjectDescription; ?>($mix
      */
     public function unassociate<?= $objManyToManyReference->ObjectDescription; ?>($mixId)
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call Unassociate<?= $objManyToManyReference->ObjectDescription; ?> on this unsaved <?= $objTable->ClassName; ?>.');
 
         // Get the Database Object for this Class
@@ -149,7 +149,7 @@ public function unassociate<?= $objManyToManyReference->ObjectDescription; ?>($m
      */
     public function unassociateAll<?= $objManyToManyReference->ObjectDescriptionPlural; ?>()
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray); ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Unable to call UnassociateAll<?= $objManyToManyReference->ObjectDescription; ?>Array on this unsaved <?= $objTable->ClassName; ?>.');
 
         // Get the Database Object for this Class
diff --git a/codegen/templates/db_orm/class_gen/class_info.tpl.php b/codegen/templates/db_orm/class_gen/class_info.tpl.php
index ea07007..8d1a72f 100644
--- a/codegen/templates/db_orm/class_gen/class_info.tpl.php
+++ b/codegen/templates/db_orm/class_gen/class_info.tpl.php
@@ -30,7 +30,7 @@ public static function getDatabaseName()
      */
     public static function getDatabaseIndex()
     {
-        return <?= $objCodeGen->DatabaseIndex; ?>;
+        return <?= $objCodegen->DatabaseIndex; ?>;
     }
 
     /**
diff --git a/codegen/templates/db_orm/class_gen/class_initialize.tpl.php b/codegen/templates/db_orm/class_gen/class_initialize.tpl.php
index 6d89e56..067539f 100644
--- a/codegen/templates/db_orm/class_gen/class_initialize.tpl.php
+++ b/codegen/templates/db_orm/class_gen/class_initialize.tpl.php
@@ -1,5 +1,5 @@
 <?php
-	$blnAutoInitialize = $objCodeGen->AutoInitialize;
+	$blnAutoInitialize = $objCodegen->AutoInitialize;
 	if ($blnAutoInitialize) {
 ?>
 
diff --git a/codegen/templates/db_orm/class_gen/class_load_and_count_methods.tpl.php b/codegen/templates/db_orm/class_gen/class_load_and_count_methods.tpl.php
index e06b196..664f6a9 100644
--- a/codegen/templates/db_orm/class_gen/class_load_and_count_methods.tpl.php
+++ b/codegen/templates/db_orm/class_gen/class_load_and_count_methods.tpl.php
@@ -23,7 +23,7 @@ public static function getDatabase()
      * @return <?= $objTable->ClassName ?>
 
      */
-    public static function load(<?= $objCodeGen->ParameterListFromColumnArray($objTable->PrimaryKeyColumnArray); ?>, $objOptionalClauses = null)
+    public static function load(<?= $objCodegen->ParameterListFromColumnArray($objTable->PrimaryKeyColumnArray); ?>, $objOptionalClauses = null)
     {
         if (!$objOptionalClauses) {
 <?php if (count ($objTable->PrimaryKeyColumnArray) == 1) { ?>
diff --git a/codegen/templates/db_orm/class_gen/copy.tpl.php b/codegen/templates/db_orm/class_gen/copy.tpl.php
index 5a80b8d..669df73 100644
--- a/codegen/templates/db_orm/class_gen/copy.tpl.php
+++ b/codegen/templates/db_orm/class_gen/copy.tpl.php
@@ -44,7 +44,7 @@ public function copy()
    		// Many-to-many references
 <?php 	foreach ($objTable->ManyToManyReferenceArray as $objReference) { ?>
 <?php
-		$objAssociatedTable = $objCodeGen->GetTable($objReference->AssociatedTable);
+		$objAssociatedTable = $objCodegen->GetTable($objReference->AssociatedTable);
 		$varPrefix = (is_a($objAssociatedTable, \QCubed\Codegen\TypeTable::class) ? '_int' : '_obj');
 ?>
 		$objCopy-><?= $varPrefix . $objReference->ObjectDescription ?> = null;
diff --git a/codegen/templates/db_orm/class_gen/index_load_array.tpl.php b/codegen/templates/db_orm/class_gen/index_load_array.tpl.php
index 729fdd3..24c6b65 100644
--- a/codegen/templates/db_orm/class_gen/index_load_array.tpl.php
+++ b/codegen/templates/db_orm/class_gen/index_load_array.tpl.php
@@ -1,7 +1,7 @@
-<?php $objColumnArray = $objCodeGen->GetColumnArray($objTable, $objIndex->ColumnNameArray); ?>
+<?php $objColumnArray = $objCodegen->GetColumnArray($objTable, $objIndex->ColumnNameArray); ?>
     /**
      * Load an array of <?= $objTable->ClassName ?> objects,
-     * by <?= $objCodeGen->ImplodeObjectArray(', ', '', '', 'PropertyName', $objCodeGen->GetColumnArray($objTable, $objIndex->ColumnNameArray)) ?> Index(es)
+     * by <?= $objCodegen->ImplodeObjectArray(', ', '', '', 'PropertyName', $objCodegen->GetColumnArray($objTable, $objIndex->ColumnNameArray)) ?> Index(es)
 <?php foreach ($objColumnArray as $objColumn) { ?>
      * @param <?= $objColumn->VariableType ?> $<?= $objColumn->VariableName ?>
 
@@ -10,9 +10,9 @@
      * @throws Caller
      * @return <?= $objTable->ClassName ?>[]
     */
-    public static function loadArrayBy<?= $objCodeGen->ImplodeObjectArray('', '', '', 'PropertyName', $objColumnArray); ?>(<?= $objCodeGen->ParameterListFromColumnArray($objColumnArray); ?>, $objOptionalClauses = null)
+    public static function loadArrayBy<?= $objCodegen->ImplodeObjectArray('', '', '', 'PropertyName', $objColumnArray); ?>(<?= $objCodegen->ParameterListFromColumnArray($objColumnArray); ?>, $objOptionalClauses = null)
     {
-        // Call <?= $objTable->ClassName ?>::QueryArray to perform the LoadArrayBy<?= $objCodeGen->ImplodeObjectArray('', '', '', 'PropertyName', $objColumnArray); ?> query
+        // Call <?= $objTable->ClassName ?>::QueryArray to perform the LoadArrayBy<?= $objCodegen->ImplodeObjectArray('', '', '', 'PropertyName', $objColumnArray); ?> query
         try {
             return <?= $objTable->ClassName; ?>::QueryArray(
 <?php if (count($objColumnArray) > 1) { ?>
@@ -34,16 +34,16 @@ public static function loadArrayBy<?= $objCodeGen->ImplodeObjectArray('', '', ''
     /**
      * Count <?= $objTable->ClassNamePlural ?>
 
-     * by <?= $objCodeGen->ImplodeObjectArray(', ', '', '', 'PropertyName', $objCodeGen->GetColumnArray($objTable, $objIndex->ColumnNameArray)) ?> Index(es)
+     * by <?= $objCodegen->ImplodeObjectArray(', ', '', '', 'PropertyName', $objCodegen->GetColumnArray($objTable, $objIndex->ColumnNameArray)) ?> Index(es)
 <?php foreach ($objColumnArray as $objColumn) { ?>
      * @param <?= $objColumn->VariableType ?> $<?= $objColumn->VariableName ?>
 
 <?php } ?>
      * @return int
     */
-    public static function countBy<?= $objCodeGen->ImplodeObjectArray('', '', '', 'PropertyName', $objColumnArray); ?>(<?= $objCodeGen->ParameterListFromColumnArray($objColumnArray); ?>)
+    public static function countBy<?= $objCodegen->ImplodeObjectArray('', '', '', 'PropertyName', $objColumnArray); ?>(<?= $objCodegen->ParameterListFromColumnArray($objColumnArray); ?>)
     {
-        // Call <?= $objTable->ClassName ?>::QueryCount to perform the CountBy<?= $objCodeGen->ImplodeObjectArray('', '', '', 'PropertyName', $objColumnArray); ?> query
+        // Call <?= $objTable->ClassName ?>::QueryCount to perform the CountBy<?= $objCodegen->ImplodeObjectArray('', '', '', 'PropertyName', $objColumnArray); ?> query
         return <?= $objTable->ClassName ?>::QueryCount(
 <?php if (count($objColumnArray) > 1) { ?>
             QQ::AndCondition(
diff --git a/codegen/templates/db_orm/class_gen/index_load_single.tpl.php b/codegen/templates/db_orm/class_gen/index_load_single.tpl.php
index 34a4b8e..5c022bf 100644
--- a/codegen/templates/db_orm/class_gen/index_load_single.tpl.php
+++ b/codegen/templates/db_orm/class_gen/index_load_single.tpl.php
@@ -1,7 +1,7 @@
-<?php $objColumnArray = $objCodeGen->GetColumnArray($objTable, $objIndex->ColumnNameArray); ?>
+<?php $objColumnArray = $objCodegen->GetColumnArray($objTable, $objIndex->ColumnNameArray); ?>
     /**
      * Load a single <?= $objTable->ClassName ?> object,
-     * by <?= $objCodeGen->ImplodeObjectArray(', ', '', '', 'PropertyName', $objCodeGen->GetColumnArray($objTable, $objIndex->ColumnNameArray)) ?> Index(es)
+     * by <?= $objCodegen->ImplodeObjectArray(', ', '', '', 'PropertyName', $objCodegen->GetColumnArray($objTable, $objIndex->ColumnNameArray)) ?> Index(es)
 <?php foreach ($objColumnArray as $objColumn) { ?>
      * @param <?= $objColumn->VariableType ?> $<?= $objColumn->VariableName ?>
 
@@ -10,7 +10,7 @@
      * @return <?= $objTable->ClassName ?>
 
     */
-    public static function loadBy<?= $objCodeGen->ImplodeObjectArray('', '', '', 'PropertyName', $objColumnArray); ?>(<?= $objCodeGen->ParameterListFromColumnArray($objColumnArray); ?>, $objOptionalClauses = null)
+    public static function loadBy<?= $objCodegen->ImplodeObjectArray('', '', '', 'PropertyName', $objColumnArray); ?>(<?= $objCodegen->ParameterListFromColumnArray($objColumnArray); ?>, $objOptionalClauses = null)
     {
         return <?= $objTable->ClassName ?>::QuerySingle(
             QQ::AndCondition(
diff --git a/codegen/templates/db_orm/class_gen/instantiation_methods.tpl.php b/codegen/templates/db_orm/class_gen/instantiation_methods.tpl.php
index 3346c6e..bd080ad 100644
--- a/codegen/templates/db_orm/class_gen/instantiation_methods.tpl.php
+++ b/codegen/templates/db_orm/class_gen/instantiation_methods.tpl.php
@@ -2,7 +2,7 @@
 	// Preliminary calculations and helper routines here
 
 	$blnImmediateExpansions = $objTable->HasImmediateArrayExpansions();
-	$blnExtendedExpansions = $objTable->HasExtendedArrayExpansions($objCodeGen);
+	$blnExtendedExpansions = $objTable->HasExtendedArrayExpansions($objCodegen);
 
 	if (count($objTable->PrimaryKeyColumnArray) > 1 &&
 			$blnImmediateExpansions) {
@@ -90,7 +90,7 @@ public static function instantiateDbRow(
 <?php if ($objColumn->VariableType == \QCubed\Type::BOOLEAN) { ?>
                 $objToReturn-><?= $objColumn->VariableName ?> = $objDbRow->ResolveBooleanValue($mixVal);
 <?php } else { ?>
-<?php 	if ($s = $objCodeGen->getCastString($objColumn)) { ?>
+<?php 	if ($s = $objCodegen->getCastString($objColumn)) { ?>
                 if ($mixVal !== null) {
                     <?= $s ?>
 
@@ -151,7 +151,7 @@ public static function instantiateDbRow(
 <?php foreach ($objTable->ColumnArray as $objColumn) { ?>
 <?php if ($objColumn->Reference && !$objColumn->Reference->IsType) { ?>
         // Check for <?= $objColumn->Reference->PropertyName ?> Early Binding
-        $strAlias = $strAliasPrefix . '<?= $objColumn->Name ?>__<?= $objCodeGen->GetTable($objColumn->Reference->Table)->PrimaryKeyColumnArray[0]->Name ?>';
+        $strAlias = $strAliasPrefix . '<?= $objColumn->Name ?>__<?= $objCodegen->GetTable($objColumn->Reference->Table)->PrimaryKeyColumnArray[0]->Name ?>';
         $strAliasName = !empty($strColumnAliasArray[$strAlias]) ? $strColumnAliasArray[$strAlias] : $strAlias;
         if (isset ($strColumns[$strAliasName])) {
             $objExpansionNode = (empty($objExpansionAliasArray['<?= $objColumn->Name ?>']) ? null : $objExpansionAliasArray['<?= $objColumn->Name ?>']);
@@ -166,7 +166,7 @@ public static function instantiateDbRow(
 
 <?php foreach ($objTable->ReverseReferenceArray as $objReference) { ?><?php if ($objReference->Unique) { ?>
         // Check for <?= $objReference->ObjectDescription ?> Unique ReverseReference Binding
-        $strAlias = $strAliasPrefix . '<?= strtolower($objReference->ObjectDescription) ?>__<?= $objCodeGen->GetTable($objReference->Table)->PrimaryKeyColumnArray[0]->Name ?>';
+        $strAlias = $strAliasPrefix . '<?= strtolower($objReference->ObjectDescription) ?>__<?= $objCodegen->GetTable($objReference->Table)->PrimaryKeyColumnArray[0]->Name ?>';
         $strAliasName = !empty($strColumnAliasArray[$strAlias]) ? $strColumnAliasArray[$strAlias] : $strAlias;
         if (array_key_exists ($strAliasName, $strColumns)) {
             if (!is_null($strColumns[$strAliasName])) {
@@ -184,7 +184,7 @@ public static function instantiateDbRow(
 
 <?php foreach ($objTable->ManyToManyReferenceArray as $objReference) { ?>
 <?php 
-$objAssociatedTable = $objCodeGen->GetTable($objReference->AssociatedTable);
+$objAssociatedTable = $objCodegen->GetTable($objReference->AssociatedTable);
 if (is_a($objAssociatedTable, '\QCubed\Codegen\TypeTable') ) {
     $blnIsType = true;
     $varPrefix = '_int';
@@ -194,7 +194,7 @@ public static function instantiateDbRow(
 }
 ?>
         // Check for <?= $objReference->ObjectDescription ?> Virtual Binding
-        $strAlias = $strAliasPrefix . '<?= strtolower($objReference->ObjectDescription) ?>__<?= $objReference->OppositeColumn ?>__<?= $objCodeGen->GetTable($objReference->AssociatedTable)->PrimaryKeyColumnArray[0]->Name ?>';
+        $strAlias = $strAliasPrefix . '<?= strtolower($objReference->ObjectDescription) ?>__<?= $objReference->OppositeColumn ?>__<?= $objCodegen->GetTable($objReference->AssociatedTable)->PrimaryKeyColumnArray[0]->Name ?>';
         $strAliasName = !empty($strColumnAliasArray[$strAlias]) ? $strColumnAliasArray[$strAlias] : $strAlias;
         $objExpansionNode = (empty($objExpansionAliasArray['<?= strtolower($objReference->ObjectDescription) ?>']) ? null : $objExpansionAliasArray['<?= strtolower($objReference->ObjectDescription) ?>']);
         $blnExpanded = ($objExpansionNode && $objExpansionNode->ExpandAsArray);
@@ -225,7 +225,7 @@ public static function instantiateDbRow(
 
 <?php foreach ($objTable->ReverseReferenceArray as $objReference) { ?><?php if (!$objReference->Unique) { ?>
         // Check for <?= $objReference->ObjectDescription ?> Virtual Binding
-        $strAlias = $strAliasPrefix . '<?= strtolower($objReference->ObjectDescription) ?>__<?= $objCodeGen->GetTable($objReference->Table)->PrimaryKeyColumnArray[0]->Name ?>';
+        $strAlias = $strAliasPrefix . '<?= strtolower($objReference->ObjectDescription) ?>__<?= $objCodegen->GetTable($objReference->Table)->PrimaryKeyColumnArray[0]->Name ?>';
         $strAliasName = !empty($strColumnAliasArray[$strAlias]) ? $strColumnAliasArray[$strAlias] : $strAlias;
         $objExpansionNode = (empty($objExpansionAliasArray['<?= strtolower($objReference->ObjectDescription) ?>']) ? null : $objExpansionAliasArray['<?= strtolower($objReference->ObjectDescription) ?>']);
         $blnExpanded = ($objExpansionNode && $objExpansionNode->ExpandAsArray);
diff --git a/codegen/templates/db_orm/class_gen/json_methods.tpl.php b/codegen/templates/db_orm/class_gen/json_methods.tpl.php
index d1aa9da..0ae8781 100644
--- a/codegen/templates/db_orm/class_gen/json_methods.tpl.php
+++ b/codegen/templates/db_orm/class_gen/json_methods.tpl.php
@@ -91,7 +91,7 @@ public function jsonSerialize ()
 <?php } ?>
 <?php foreach ($objTable->ManyToManyReferenceArray as $objReference) { ?>
 <?php
-    $objAssociatedTable = $objCodeGen->GetTable($objReference->AssociatedTable);
+    $objAssociatedTable = $objCodegen->GetTable($objReference->AssociatedTable);
     $varPrefix = (is_a($objAssociatedTable, '\QCubed\Codegen\TypeTable') ? '_int' : '_obj');
 ?>
         if (isset($this-><?= $varPrefix . $objReference->ObjectDescription ?>)) {
diff --git a/codegen/templates/db_orm/class_gen/object_delete.tpl.php b/codegen/templates/db_orm/class_gen/object_delete.tpl.php
index 383dba8..a7abb07 100644
--- a/codegen/templates/db_orm/class_gen/object_delete.tpl.php
+++ b/codegen/templates/db_orm/class_gen/object_delete.tpl.php
@@ -6,7 +6,7 @@
      */
     public function delete()
     {
-        if (<?= $objCodeGen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
+        if (<?= $objCodegen->ImplodeObjectArray(' || ', '(is_null($this->', '))', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)
             throw new \QCubed\Database\Exception\UndefinedPrimaryKey('Cannot delete this <?= $objTable->ClassName ?> with an unset primary key.');
 
         // Get the Database Object for this Class
@@ -15,7 +15,7 @@ public function delete()
 <?php foreach ($objTable->ReverseReferenceArray as $objReverseReference) { ?>
 <?php if ($objReverseReference->Unique) { ?>
 <?php if (!$objReverseReference->NotNull) { ?>
-<?php $objReverseReferenceTable = $objCodeGen->TableArray[strtolower($objReverseReference->Table)]; ?>
+<?php $objReverseReferenceTable = $objCodegen->TableArray[strtolower($objReverseReference->Table)]; ?>
 <?php $objReverseReferenceColumn = $objReverseReferenceTable->ColumnArray[strtolower($objReverseReference->Column)]; ?>
 
 
@@ -23,12 +23,12 @@ public function delete()
 
         // Optional -- if you **KNOW** that you do not want to EVER run any level of business logic on the disassociation,
         // you *could* override Delete() so that this step can be a single hard coded query to optimize performance.
-        if ($objAssociated = <?= $objReverseReference->VariableType ?>::LoadBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodeGen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)) {
+        if ($objAssociated = <?= $objReverseReference->VariableType ?>::LoadBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodegen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)) {
             $objAssociated-><?= $objReverseReferenceColumn->PropertyName ?> = null;
             $objAssociated->Save();
         }
 <?php } ?><?php if ($objReverseReference->NotNull) { ?>
-<?php $objReverseReferenceTable = $objCodeGen->TableArray[strtolower($objReverseReference->Table)]; ?>
+<?php $objReverseReferenceTable = $objCodegen->TableArray[strtolower($objReverseReference->Table)]; ?>
 <?php $objReverseReferenceColumn = $objReverseReferenceTable->ColumnArray[strtolower($objReverseReference->Column)]; ?>
 
 
@@ -36,7 +36,7 @@ public function delete()
 
         // Optional -- if you **KNOW** that you do not want to EVER run any level of business logic on the disassociation,
         // you *could* override Delete() so that this step can be a single hard coded query to optimize performance.
-        if ($objAssociated = <?= $objReverseReference->VariableType ?>::LoadBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodeGen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)) {
+        if ($objAssociated = <?= $objReverseReference->VariableType ?>::LoadBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodegen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)) {
             $objAssociated->Delete();
         }
 <?php } ?>
diff --git a/codegen/templates/db_orm/class_gen/object_save.tpl.php b/codegen/templates/db_orm/class_gen/object_save.tpl.php
index ef15af8..765d00e 100644
--- a/codegen/templates/db_orm/class_gen/object_save.tpl.php
+++ b/codegen/templates/db_orm/class_gen/object_save.tpl.php
@@ -204,14 +204,14 @@ protected function update($blnForceUpdate = false)
 
 <?php foreach ($objTable->ReverseReferenceArray as $objReverseReference) { ?>
 <?php     if ($objReverseReference->Unique) { ?>
-<?php       $objReverseReferenceTable = $objCodeGen->TableArray[strtolower($objReverseReference->Table)]; ?>
+<?php       $objReverseReferenceTable = $objCodegen->TableArray[strtolower($objReverseReference->Table)]; ?>
 <?php       $objReverseReferenceColumn = $objReverseReferenceTable->ColumnArray[strtolower($objReverseReference->Column)]; ?>
 
 
         // Update the foreign key in the <?= $objReverseReference->ObjectDescription ?> object (if applicable)
         if ($this->blnDirty<?= $objReverseReference->ObjectPropertyName ?>) {
             // Unassociate the old one (if applicable)
-            if ($objAssociated = <?= $objReverseReference->VariableType ?>::LoadBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodeGen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)) {
+            if ($objAssociated = <?= $objReverseReference->VariableType ?>::LoadBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodegen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>)) {
                 // TODO: Select and update only the foreign key rather than the whole record
                 $objAssociated-><?= $objReverseReferenceColumn->PropertyName ?> = null;
                 $objAssociated->save();
diff --git a/codegen/templates/db_orm/class_gen/pk_support.tpl.php b/codegen/templates/db_orm/class_gen/pk_support.tpl.php
index d9b8a45..59f7f94 100644
--- a/codegen/templates/db_orm/class_gen/pk_support.tpl.php
+++ b/codegen/templates/db_orm/class_gen/pk_support.tpl.php
@@ -54,7 +54,7 @@ protected static function getRowPrimaryKey(\QCubed\Database\RowBase $objDbRow, $
         $strAliasName = !empty($strColumnAliasArray[$strAlias]) ? $strColumnAliasArray[$strAlias] : $strAlias;
         $strColumns = $objDbRow->GetColumnNameArray();
         $mixVal = (isset ($strColumns[$strAliasName]) ? $strColumns[$strAliasName] : null);
-        <?php if ($s = \QCubed\Codegen\DatabaseCodeGen::GetCastString($objTable->PrimaryKeyColumnArray[0]))	echo $s; ?>
+        <?php if ($s = \QCubed\Codegen\DatabaseCodegen::GetCastString($objTable->PrimaryKeyColumnArray[0]))	echo $s; ?>
 
         return $mixVal;
 <?php 	} else { ?>
@@ -64,7 +64,7 @@ protected static function getRowPrimaryKey(\QCubed\Database\RowBase $objDbRow, $
         $strAliasName = !empty($strColumnAliasArray[$strAlias]) ? $strColumnAliasArray[$strAlias] : $strAlias;
         $mixVal = (isset ($strColumns[$strAliasName]) ? $strColumns[$strAliasName] : null);
         if ($mixVal === null) return null;
-<?php 			if ($s = \QCubed\Codegen\DatabaseCodeGen::GetCastString($objPKColumn))	echo $s; ?>
+<?php 			if ($s = \QCubed\Codegen\DatabaseCodegen::GetCastString($objPKColumn))	echo $s; ?>
         $values[] = $mixVal;
 <?php 		} ?>
 
diff --git a/codegen/templates/db_orm/class_gen/property_comments.tpl.php b/codegen/templates/db_orm/class_gen/property_comments.tpl.php
index 224f8d5..5c43308 100644
--- a/codegen/templates/db_orm/class_gen/property_comments.tpl.php
+++ b/codegen/templates/db_orm/class_gen/property_comments.tpl.php
@@ -19,7 +19,7 @@
 <?php } ?>
 <?php foreach ($objTable->ManyToManyReferenceArray as $objReference) { ?>
 <?php 
-	$objAssociatedTable = $objCodeGen->GetTable($objReference->AssociatedTable);
+	$objAssociatedTable = $objCodegen->GetTable($objReference->AssociatedTable);
     $varPrefix = (is_a($objAssociatedTable, '\QCubed\Codegen\TypeTable') ? '_int' : '_obj');
     $varType = (is_a($objAssociatedTable, '\QCubed\Codegen\TypeTable') ? 'integer' : $objReference->VariableType);
 
diff --git a/codegen/templates/db_orm/class_gen/property_get.tpl.php b/codegen/templates/db_orm/class_gen/property_get.tpl.php
index dd88747..9424d43 100644
--- a/codegen/templates/db_orm/class_gen/property_get.tpl.php
+++ b/codegen/templates/db_orm/class_gen/property_get.tpl.php
@@ -18,7 +18,7 @@ public function __get($strName)
 
 <?php foreach ($objTable->ManyToManyReferenceArray as $objReference) { ?>
 <?php 
-	$objAssociatedTable = $objCodeGen->GetTable($objReference->AssociatedTable);
+	$objAssociatedTable = $objCodegen->GetTable($objReference->AssociatedTable);
 	$varPrefix = (is_a($objAssociatedTable, '\QCubed\Codegen\TypeTable') ? '_int' : '_obj');
 	$varType = (is_a($objAssociatedTable, '\QCubed\Codegen\TypeTable') ? 'integer' : $objReference->VariableType);
 ?>
diff --git a/codegen/templates/db_orm/class_gen/property_getters_setters.tpl.php b/codegen/templates/db_orm/class_gen/property_getters_setters.tpl.php
index cd91281..2dd3bde 100644
--- a/codegen/templates/db_orm/class_gen/property_getters_setters.tpl.php
+++ b/codegen/templates/db_orm/class_gen/property_getters_setters.tpl.php
@@ -119,12 +119,12 @@ public function set<?= $objColumn->Reference->PropertyName ?>($<?= $objColumn->R
             $<?= $objColumn->Reference->VariableName ?> = Type::Cast($<?= $objColumn->Reference->VariableName ?>, '<?= $objColumn->Reference->VariableType ?>');
 
             // Make sure its a SAVED <?= $objColumn->Reference->VariableType ?> object
-            if (is_null($<?= $objColumn->Reference->VariableName ?>-><?= $objCodeGen->TableArray[strtolower($objColumn->Reference->Table)]->ColumnArray[strtolower($objColumn->Reference->Column)]->PropertyName ?>)) {
+            if (is_null($<?= $objColumn->Reference->VariableName ?>-><?= $objCodegen->TableArray[strtolower($objColumn->Reference->Table)]->ColumnArray[strtolower($objColumn->Reference->Column)]->PropertyName ?>)) {
                 throw new Caller('Unable to set an unsaved <?= $objColumn->Reference->PropertyName ?> for this <?= $objTable->ClassName ?>');
             }
 
             // Update Local Member Variables
-            $this->set<?= $objColumn->PropertyName ?>($<?= $objColumn->Reference->VariableName ?>->get<?= $objCodeGen->TableArray[strtolower($objColumn->Reference->Table)]->ColumnArray[strtolower($objColumn->Reference->Column)]->PropertyName ?>());
+            $this->set<?= $objColumn->PropertyName ?>($<?= $objColumn->Reference->VariableName ?>->get<?= $objCodegen->TableArray[strtolower($objColumn->Reference->Table)]->ColumnArray[strtolower($objColumn->Reference->Column)]->PropertyName ?>());
             $this-><?= $objColumn->Reference->VariableName ?> = $<?= $objColumn->Reference->VariableName ?>;
         }
         return $this;
@@ -138,7 +138,7 @@ public function set<?= $objColumn->Reference->PropertyName ?>($<?= $objColumn->R
     // Unique reverse reference properties
 foreach ($objTable->ReverseReferenceArray as $objReverseReference) {
 	if ($objReverseReference->Unique) {
-		$objReverseReferenceTable = $objCodeGen->TableArray[strtolower($objReverseReference->Table)];
+		$objReverseReferenceTable = $objCodegen->TableArray[strtolower($objReverseReference->Table)];
 		$objReverseReferenceColumn = $objReverseReferenceTable->ColumnArray[strtolower($objReverseReference->Column)]; ?>
 
    /**
@@ -156,7 +156,7 @@ public function get<?= $objReverseReference->ObjectPropertyName ?>() {
             return null;
         }
         if (!$this-><?= $objReverseReference->ObjectMemberVariable ?>) {
-            $this-><?= $objReverseReference->ObjectMemberVariable ?> = <?= $objReverseReference->VariableType ?>::LoadBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodeGen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>);
+            $this-><?= $objReverseReference->ObjectMemberVariable ?> = <?= $objReverseReference->VariableType ?>::LoadBy<?= $objReverseReferenceColumn->PropertyName ?>(<?= $objCodegen->ImplodeObjectArray(', ', '$this->', '', 'VariableName', $objTable->PrimaryKeyColumnArray) ?>);
         }
         return $this-><?= $objReverseReference->ObjectMemberVariable ?>;
     }
@@ -180,7 +180,7 @@ public function set<?= $objReverseReference->ObjectPropertyName ?>($<?= $objReve
             $<?= $objReverseReference->ObjectMemberVariable ?> = \QCubed\Type::Cast($<?= $objReverseReference->ObjectMemberVariable ?>, '<?= $objReverseReference->VariableType ?>');
 
             // Are we setting <?= $objReverseReference->ObjectMemberVariable ?> to a DIFFERENT $<?= $objReverseReference->ObjectMemberVariable ?>?
-            if ((!$this-><?= $objReverseReference->ObjectPropertyName ?>) || ($this-><?= $objReverseReference->ObjectPropertyName ?>-><?= $objCodeGen->GetTable($objReverseReference->Table)->PrimaryKeyColumnArray[0]->PropertyName ?> != $<?= $objReverseReference->ObjectMemberVariable ?>-><?= $objCodeGen->GetTable($objReverseReference->Table)->PrimaryKeyColumnArray[0]->PropertyName ?>)) {
+            if ((!$this-><?= $objReverseReference->ObjectPropertyName ?>) || ($this-><?= $objReverseReference->ObjectPropertyName ?>-><?= $objCodegen->GetTable($objReverseReference->Table)->PrimaryKeyColumnArray[0]->PropertyName ?> != $<?= $objReverseReference->ObjectMemberVariable ?>-><?= $objCodegen->GetTable($objReverseReference->Table)->PrimaryKeyColumnArray[0]->PropertyName ?>)) {
                 // Yes -- therefore, set the "Dirty" flag to true
                 // to make sure we update the adjoined <?= $objReverseReference->VariableType ?> object the next time we call Save()
                 $this->blnDirty<?= $objReverseReference->ObjectPropertyName ?> = true;
diff --git a/codegen/templates/db_orm/class_gen/protected_member_variables.tpl.php b/codegen/templates/db_orm/class_gen/protected_member_variables.tpl.php
index a01010f..d337fad 100644
--- a/codegen/templates/db_orm/class_gen/protected_member_variables.tpl.php
+++ b/codegen/templates/db_orm/class_gen/protected_member_variables.tpl.php
@@ -14,7 +14,7 @@
      * @var <?= $objColumn->VariableType ?> <?= $objColumn->VariableName ?>
 
      */
-<?php if ($objCodeGen->PrivateColumnVars) { ?>
+<?php if ($objCodegen->PrivateColumnVars) { ?>
     private $<?= $objColumn->VariableName ?>;
 <?php } else { ?>
     protected $<?= $objColumn->VariableName ?>;
@@ -67,7 +67,7 @@
 <?php } ?>
 <?php foreach ($objTable->ManyToManyReferenceArray as $objReference) { ?>
 <?php 
-        $objAssociatedTable = $objCodeGen->GetTable($objReference->AssociatedTable);
+        $objAssociatedTable = $objCodegen->GetTable($objReference->AssociatedTable);
         if (is_a($objAssociatedTable, '\QCubed\Codegen\TypeTable')) {
 ?>
     /**
diff --git a/codegen/templates/db_orm/class_gen/qcubed_query_classes.tpl.php b/codegen/templates/db_orm/class_gen/qcubed_query_classes.tpl.php
index ae13050..f9ebec5 100644
--- a/codegen/templates/db_orm/class_gen/qcubed_query_classes.tpl.php
+++ b/codegen/templates/db_orm/class_gen/qcubed_query_classes.tpl.php
@@ -98,7 +98,7 @@ public function primaryKeyFields() {
     * @return AbstractDatabase
     */
     protected function database() {
-        return \QCubed\Database\Service::getDatabase(<?= $objCodeGen->DatabaseIndex; ?>);
+        return \QCubed\Database\Service::getDatabase(<?= $objCodegen->DatabaseIndex; ?>);
     }
 
 
diff --git a/codegen/templates/db_orm/class_subclass/_main.tpl.php b/codegen/templates/db_orm/class_subclass/_main.tpl.php
index d7175b9..b2a09fa 100644
--- a/codegen/templates/db_orm/class_subclass/_main.tpl.php
+++ b/codegen/templates/db_orm/class_subclass/_main.tpl.php
@@ -1,6 +1,6 @@
 <?php
 	/** @var QSqlTable $objTable */
-	/** @var \QCubed\Codegen\DatabaseCodeGen $objCodeGen */
+	/** @var \QCubed\Codegen\DatabaseCodegen $objCodegen */
 	global $_TEMPLATE_SETTINGS;
 	$_TEMPLATE_SETTINGS = array(
 		'OverwriteFlag' => false,
diff --git a/codegen/templates/db_orm/class_subclass/example_initialization.tpl.php b/codegen/templates/db_orm/class_subclass/example_initialization.tpl.php
index 3c87c04..bd087d3 100644
--- a/codegen/templates/db_orm/class_subclass/example_initialization.tpl.php
+++ b/codegen/templates/db_orm/class_subclass/example_initialization.tpl.php
@@ -1,5 +1,5 @@
 <?php
-$blnAutoInitialize = $objCodeGen->AutoInitialize;
+$blnAutoInitialize = $objCodegen->AutoInitialize;
 if (!$blnAutoInitialize) {
 ?>
 
diff --git a/codegen/templates/db_type/class_gen/_main.tpl.php b/codegen/templates/db_type/class_gen/_main.tpl.php
index fcfdfd7..c2398b8 100644
--- a/codegen/templates/db_type/class_gen/_main.tpl.php
+++ b/codegen/templates/db_type/class_gen/_main.tpl.php
@@ -1,6 +1,6 @@
 <?php
 	/** @var \QCubed\Codegen\TypeTable $objTypeTable */
-	/** @var \QCubed\Codegen\DatabaseCodeGen $objCodeGen */
+	/** @var \QCubed\Codegen\DatabaseCodegen $objCodegen */
 	global $_TEMPLATE_SETTINGS;
 	$_TEMPLATE_SETTINGS = array(
 		'OverwriteFlag' => true,
diff --git a/codegen/templates/db_type/class_subclass/_main.tpl.php b/codegen/templates/db_type/class_subclass/_main.tpl.php
index b7be326..e8f99d1 100644
--- a/codegen/templates/db_type/class_subclass/_main.tpl.php
+++ b/codegen/templates/db_type/class_subclass/_main.tpl.php
@@ -1,6 +1,6 @@
 <?php
 	/** @var \QCubed\Codegen\TypeTable $objTypeTable */
-	/** @var \QCubed\Codegen\DatabaseCodeGen $objCodeGen */
+	/** @var \QCubed\Codegen\DatabaseCodegen $objCodegen */
 	global $_TEMPLATE_SETTINGS;
 	$_TEMPLATE_SETTINGS = array(
 		'OverwriteFlag' => false,
diff --git a/install/project/codegen/templates/README.md b/install/project/codegen/templates/README.md
index ed3d01d..6f15bcd 100644
--- a/install/project/codegen/templates/README.md
+++ b/install/project/codegen/templates/README.md
@@ -9,7 +9,7 @@ If there are any template files in this directory in *addition* to the ones in
 `/includes/qcubed/_core/codegen/templates`, these additional template files will be
 processed as well.
 
-Feel free to add as you wish.  Just remember the naming structure for CodeGen
+Feel free to add as you wish.  Just remember the naming structure for Codegen
 template files:
 
 `/includes/qcubed/_core/codegen/templates/[TYPE]/[MODULE]/[FILE]`
diff --git a/install/project/includes/configuration/README.md b/install/project/includes/configuration/README.md
index 401c625..5a043a8 100644
--- a/install/project/includes/configuration/README.md
+++ b/install/project/includes/configuration/README.md
@@ -40,7 +40,7 @@ separate out your hand written code from the generated code, and continue to twe
 The codegen process starts at the QCubed start screen by clicking on the codegen link.
 PHP is executed to generate the files. Therefore, the target directories for codegen will need to be writable by the web server process.
 
-The codegen process works by instantiating a CodeGen object. This object then looks in the template directories and begins
+The codegen process works by instantiating a Codegen object. This object then looks in the template directories and begins
 to include the php files there that start with an underscore (_). These templates then include other files, which in turn
 may include other template files. This combination will eventually generate the forms, model connectors, and data table
 interface classes that you will base your application on.
diff --git a/install/project/includes/configuration/active/1database.cfg.php b/install/project/includes/configuration/active/1database.cfg.php
index f6fd436..39dbc29 100644
--- a/install/project/includes/configuration/active/1database.cfg.php
+++ b/install/project/includes/configuration/active/1database.cfg.php
@@ -23,7 +23,7 @@
  *		NOTE: Profiling should only be enabled when you are actively wanting to profile a
  *		specific PHP script or scripts.  Because of SIGNIFICANT performance degradation,
  *		it should otherwise always be OFF.
- * "ScriptPath": you can have CodeGen virtually add additional FKs, even though they are
+ * "ScriptPath": you can have Codegen virtually add additional FKs, even though they are
  * 		not defined as a DB constraint in the database, by using a script to define what
  * 		those constraints are.  The path of the script can be defined here. - default is blank or none
  * Note: any option not used or set to blank will result in using the default value for that option
diff --git a/install/project/includes/configuration/codegen_settings.xml b/install/project/includes/configuration/codegen_settings.xml
index 618f407..d591b41 100644
--- a/install/project/includes/configuration/codegen_settings.xml
+++ b/install/project/includes/configuration/codegen_settings.xml
@@ -2,10 +2,10 @@
 <codegen>
 <!--
 	This XML file defines the settings used when running the Code Generator.
-	When running CodeGen, you must specify a CodeGenSettings XML file like
+	When running Codegen, you must specify a CodegenSettings XML file like
 	this one to use.  Feel free to copy, modify, etc.
 -->
-	<!-- General CodeGen Settings -->
+	<!-- General Codegen Settings -->
 	<name application="My QCubed Application"/>
 	<templateEscape begin="&lt;%" end="%&gt;"/>
 
@@ -52,7 +52,7 @@
                     privateColumnVars="true"
             />
 
-            <!-- Specific Tables to Exclude or Include in the CodeGen process -->
+            <!-- Specific Tables to Exclude or Include in the Codegen process -->
 			<!--
 					* "include" is used to override any "exclude" patterns or lists
 					* "list" should be a  comma-separated list of table names
diff --git a/install/project/qcubed/Codegen/CodegenBase.php b/install/project/qcubed/Codegen/CodegenBase.php
index 5835ee3..f02d00b 100644
--- a/install/project/qcubed/Codegen/CodegenBase.php
+++ b/install/project/qcubed/Codegen/CodegenBase.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * QCodeGen
+ * QCodegen
  *
  * Overrides the Codegen\AbstractBase class.
  *
@@ -15,13 +15,13 @@
  *
  * Overrides the default codegen class. Override and implement any functions here to customize the code generation process.
  * @package Project
- * @was QCodeGen
+ * @was QCodegen
  */
 class CodegenBase extends \QCubed\Codegen\CodegenBase
 {
 
     /**
-     * Construct the CodeGen object.
+     * Construct the Codegen object.
      *
      * Gives you an opportunity to read your xml file and make codegen changes accordingly.
      */
@@ -44,7 +44,7 @@ public function getInstalledTemplatePaths()
     }
 
     /**
-     * QCodeGen::pluralize()
+     * QCodegen::pluralize()
      *
      * Example: Overriding the Pluralize method
      *
diff --git a/src/Codegen/CodegenBase.php b/src/Codegen/CodegenBase.php
index 0163c23..0de56c1 100644
--- a/src/Codegen/CodegenBase.php
+++ b/src/Codegen/CodegenBase.php
@@ -18,7 +18,7 @@
 use QCubed\Project\Codegen\CodegenBase as Codegen;
 use QCubed\Type;
 
-function qcubedHandleCodeGenParseError($__exc_errno, $__exc_errstr, $__exc_errfile, $__exc_errline)
+function qcubedHandleCodegenParseError($__exc_errno, $__exc_errstr, $__exc_errfile, $__exc_errline)
 {
     $strErrorString = str_replace("SimpleXMLElement::__construct() [<a href='function.SimpleXMLElement---construct'>function.SimpleXMLElement---construct</a>]: ",
         '', $__exc_errstr);
@@ -60,7 +60,7 @@ function trimOffEnd($off, $str)
 }
 
 /**
- * This is the CodeGen class which performs the code generation
+ * This is the Codegen class which performs the code generation
  * for both the Object-Relational Model (e.g. Data Objects) as well as
  * the draft Forms, which make up simple HTML/PHP scripts to perform
  * basic CRUD functionality on each object.
@@ -110,7 +110,7 @@ abstract class CodegenBase extends ObjectBase
      *
      * @var Codegen[] array of active/executed codegen objects
      */
-    public static $CodeGenArray;
+    public static $CodegenArray;
 
     /**
      * This is the array representation of the parsed SettingsXml
@@ -130,28 +130,28 @@ abstract class CodegenBase extends ObjectBase
     public static $SettingsFilePath;
 
     /**
-     * Application Name (from CodeGen Settings)
+     * Application Name (from Codegen Settings)
      *
      * @var string $ApplicationName
      */
     public static $ApplicationName;
 
     /**
-     * Preferred Render Method (from CodeGen Settings)
+     * Preferred Render Method (from Codegen Settings)
      *
      * @var string $PreferredRenderMethod
      */
     public static $PreferredRenderMethod;
 
     /**
-     * Create Method (from CodeGen Settings)
+     * Create Method (from Codegen Settings)
      *
      * @var string $CreateMethod
      */
     public static $CreateMethod;
 
     /**
-     * Default Button Class (from CodeGen Settings)
+     * Default Button Class (from Codegen Settings)
      *
      * @var string $DefaultButtonClass
      */
@@ -236,8 +236,8 @@ public static function getSettingsXml()
         $strToReturn .= sprintf('	<render preferredRenderMethod="%s"/>%s', Codegen::$PreferredRenderMethod,
             $strCrLf);
         $strToReturn .= sprintf('	<dataSources>%s', $strCrLf);
-        foreach (Codegen::$CodeGenArray as $objCodeGen) {
-            $strToReturn .= $strCrLf . $objCodeGen->getConfigXml();
+        foreach (Codegen::$CodegenArray as $objCodegen) {
+            $strToReturn .= $strCrLf . $objCodegen->getConfigXml();
         }
         $strToReturn .= sprintf('%s	</dataSources>%s', $strCrLf, $strCrLf);
         $strToReturn .= '</codegen>';
@@ -256,26 +256,26 @@ public static function run($strSettingsXmlFilePath)
             define('QCUBED_CODE_GENERATING', true);
         }
 
-        Codegen::$CodeGenArray = array();
+        Codegen::$CodegenArray = array();
         Codegen::$SettingsFilePath = $strSettingsXmlFilePath;
 
         if (!file_exists($strSettingsXmlFilePath)) {
-            Codegen::$RootErrors = 'FATAL ERROR: CodeGen Settings XML File (' . $strSettingsXmlFilePath . ') was not found.';
+            Codegen::$RootErrors = 'FATAL ERROR: Codegen Settings XML File (' . $strSettingsXmlFilePath . ') was not found.';
             return;
         }
 
         if (!is_file($strSettingsXmlFilePath)) {
-            Codegen::$RootErrors = 'FATAL ERROR: CodeGen Settings XML File (' . $strSettingsXmlFilePath . ') was not found.';
+            Codegen::$RootErrors = 'FATAL ERROR: Codegen Settings XML File (' . $strSettingsXmlFilePath . ') was not found.';
             return;
         }
 
         // Try Parsing the Xml Settings File
         try {
-            $errorHandler = new Error\Handler('\\QCubed\\Codegen\\QcubedHandleCodeGenParseError', E_ALL);
+            $errorHandler = new Error\Handler('\\QCubed\\Codegen\\QcubedHandleCodegenParseError', E_ALL);
             Codegen::$SettingsXml = new \SimpleXMLElement(file_get_contents($strSettingsXmlFilePath));
             $errorHandler->restore();
         } catch (\Exception $objExc) {
-            Codegen::$RootErrors .= 'FATAL ERROR: Unable to parse CodeGenSettings XML File: ' . $strSettingsXmlFilePath;
+            Codegen::$RootErrors .= 'FATAL ERROR: Unable to parse CodegenSettings XML File: ' . $strSettingsXmlFilePath;
             Codegen::$RootErrors .= "\r\n";
             Codegen::$RootErrors .= $objExc->getMessage();
             return;
@@ -291,7 +291,7 @@ public static function run($strSettingsXmlFilePath)
         Codegen::$DefaultButtonClass = Codegen::lookupSetting(Codegen::$SettingsXml, 'formgen', 'buttonClass');
 
         if (!Codegen::$DefaultButtonClass) {
-            Codegen::$RootErrors .= "CodeGen Settings XML Fatal Error: buttonClass was not defined\r\n";
+            Codegen::$RootErrors .= "Codegen Settings XML Fatal Error: buttonClass was not defined\r\n";
             return;
         }
 
@@ -300,13 +300,13 @@ public static function run($strSettingsXmlFilePath)
             foreach (Codegen::$SettingsXml->dataSources->children() as $objChildNode) {
                 switch (dom_import_simplexml($objChildNode)->nodeName) {
                     case 'database':
-                        Codegen::$CodeGenArray[] = new DatabaseCodeGen($objChildNode);
+                        Codegen::$CodegenArray[] = new DatabaseCodegen($objChildNode);
                         break;
                     case 'restService':
-                        Codegen::$CodeGenArray[] = new RestServiceCodeGen($objChildNode);
+                        Codegen::$CodegenArray[] = new RestServiceCodegen($objChildNode);
                         break;
                     default:
-                        Codegen::$RootErrors .= sprintf("Invalid Data Source Type in CodeGen Settings XML File (%s): %s\r\n",
+                        Codegen::$RootErrors .= sprintf("Invalid Data Source Type in Codegen Settings XML File (%s): %s\r\n",
                             $strSettingsXmlFilePath, dom_import_simplexml($objChildNode)->nodeName);
                         break;
                 }
@@ -365,21 +365,21 @@ static public function lookupSetting($objNode, $strTagName, $strAttributeName =
      */
     public static function generateAggregate()
     {
-        $objDbOrmCodeGen = array();
-        $objRestServiceCodeGen = array();
+        $objDbOrmCodegen = array();
+        $objRestServiceCodegen = array();
 
-        foreach (Codegen::$CodeGenArray as $objCodeGen) {
-            if ($objCodeGen instanceof DatabaseCodeGen) {
-                array_push($objDbOrmCodeGen, $objCodeGen);
+        foreach (Codegen::$CodegenArray as $objCodegen) {
+            if ($objCodegen instanceof DatabaseCodegen) {
+                array_push($objDbOrmCodegen, $objCodegen);
             }
-            if ($objCodeGen instanceof RestServiceCodeGen) {
-                array_push($objRestServiceCodeGen, $objCodeGen);
+            if ($objCodegen instanceof RestServiceCodegen) {
+                array_push($objRestServiceCodegen, $objCodegen);
             }
         }
 
         $strToReturn = array();
-        array_merge($strToReturn, DatabaseCodeGen::generateAggregateHelper($objDbOrmCodeGen));
-//			array_push($strToReturn, QRestServiceCodeGen::generateAggregateHelper($objRestServiceCodeGen));
+        array_merge($strToReturn, DatabaseCodegen::generateAggregateHelper($objDbOrmCodegen));
+//			array_push($strToReturn, QRestServiceCodegen::generateAggregateHelper($objRestServiceCodegen));
 
         return $strToReturn;
     }
@@ -623,8 +623,8 @@ protected function evaluatePHP($strFilename, $mixArgumentArray, &$templateSettin
         unset($_TEMPLATE_SETTINGS);
         $_TEMPLATE_SETTINGS = null;
 
-        // Of course, we also need to locally allow "objCodeGen"
-        $objCodeGen = $this;
+        // Of course, we also need to locally allow "objCodegen"
+        $objCodegen = $this;
 
         // Get Database Escape Identifiers
         $strEscapeIdentifierBegin = \QCubed\Database\Service::getDatabase($this->intDatabaseIndex)->EscapeIdentifierBegin;
@@ -911,7 +911,7 @@ public static function modelConnectorPropertyName(ColumnInterface $objColumn)
     public function modelConnectorVariableName(ColumnInterface $objColumn)
     {
         $strPropName = static::modelConnectorPropertyName($objColumn);
-        $objControlHelper = $this->getControlCodeGenerator($objColumn);
+        $objControlHelper = $this->getControlCodegenerator($objColumn);
         return $objControlHelper->varName($strPropName);
     }
 
@@ -1034,7 +1034,7 @@ public static function dataListItemName(SqlTable $objTable)
     public function dataListVarName(SqlTable $objTable)
     {
         $strPropName = self::dataListPropertyNamePlural($objTable);
-        $objControlHelper = $this->getDataListCodeGenerator($objTable);
+        $objControlHelper = $this->getDataListCodegenerator($objTable);
         return $objControlHelper->varName($strPropName);
     }
 
@@ -1058,25 +1058,25 @@ public static function dataListPropertyNamePlural(SqlTable $objTable)
      * @return \QCubed\Codegen\Generator\GeneratorBase helper object
      * @throws \Exception
      */
-    public function getControlCodeGenerator($objColumn)
+    public function getControlCodegenerator($objColumn)
     {
         $strControlClass = $this->modelConnectorControlClass($objColumn);
 
-        if (method_exists($strControlClass, 'getCodeGenerator')) {
-            return $strControlClass::getCodeGenerator();
+        if (method_exists($strControlClass, 'getCodegenerator')) {
+            return $strControlClass::getCodegenerator();
         } else {
-            throw new Caller("Class " . $strControlClass . " must implement getCodeGenerator()");
+            throw new Caller("Class " . $strControlClass . " must implement getCodegenerator()");
         }
     }
 
-    public function getDataListCodeGenerator($objTable)
+    public function getDataListCodegenerator($objTable)
     {
         $strControlClass = $this->dataListControlClass($objTable);
 
-        if (method_exists($strControlClass, 'getCodeGenerator')) {
-            return $strControlClass::getCodeGenerator();
+        if (method_exists($strControlClass, 'getCodegenerator')) {
+            return $strControlClass::getCodegenerator();
         } else {
-            throw new Caller("Class " . $strControlClass . " must implement getCodeGenerator()");
+            throw new Caller("Class " . $strControlClass . " must implement getCodegenerator()");
         }
     }
 
diff --git a/src/Codegen/DatabaseCodeGen.php b/src/Codegen/DatabaseCodeGen.php
index 25a5459..72e8c6c 100644
--- a/src/Codegen/DatabaseCodeGen.php
+++ b/src/Codegen/DatabaseCodeGen.php
@@ -17,11 +17,11 @@
 //require_once QCUBED_PROJECT_DIR . '/qcubed/codegen/CodegenBase.php';
 
 /**
- * Class DatabaseCodeGen
+ * Class DatabaseCodegen
  * @package QCubed\Codegen
- * @was QDatabaseCodeGen
+ * @was QDatabaseCodegen
  */
-class DatabaseCodeGen extends QCodegen
+class DatabaseCodegen extends QCodegen
 {
     public $objSettingsXml;    // Make public so templates can use it directly.
 
@@ -257,25 +257,25 @@ public function generateAll()
     }
 
     /**
-     * @param DatabaseCodeGen[] $objCodeGenArray
+     * @param DatabaseCodegen[] $objCodegenArray
      * @return array
      */
-    public static function generateAggregateHelper(array $objCodeGenArray)
+    public static function generateAggregateHelper(array $objCodegenArray)
     {
         $strToReturn = array();
 
-        if (count($objCodeGenArray)) {
+        if (count($objCodegenArray)) {
             // Standard ORM Tables
             $objTableArray = array();
-            foreach ($objCodeGenArray as $objCodeGen) {
-                $objCurrentTableArray = $objCodeGen->TableArray;
+            foreach ($objCodegenArray as $objCodegen) {
+                $objCurrentTableArray = $objCodegen->TableArray;
                 foreach ($objCurrentTableArray as $objTable) {
                     $objTableArray[$objTable->ClassName] = $objTable;
                 }
             }
 
             $mixArgumentArray = array('objTableArray' => $objTableArray);
-            if ($objCodeGenArray[0]->generateFiles('aggregate_db_orm', $mixArgumentArray)) {
+            if ($objCodegenArray[0]->generateFiles('aggregate_db_orm', $mixArgumentArray)) {
                 $strToReturn[] = 'Successfully generated Aggregate DB ORM file(s)';
             } else {
                 $strToReturn[] = 'FAILED to generate Aggregate DB ORM file(s)';
@@ -283,15 +283,15 @@ public static function generateAggregateHelper(array $objCodeGenArray)
 
             // Type Tables
             $objTableArray = array();
-            foreach ($objCodeGenArray as $objCodeGen) {
-                $objCurrentTableArray = $objCodeGen->TypeTableArray;
+            foreach ($objCodegenArray as $objCodegen) {
+                $objCurrentTableArray = $objCodegen->TypeTableArray;
                 foreach ($objCurrentTableArray as $objTable) {
                     $objTableArray[$objTable->ClassName] = $objTable;
                 }
             }
 
             $mixArgumentArray = array('objTableArray' => $objTableArray);
-            if ($objCodeGenArray[0]->generateFiles('aggregate_db_type', $mixArgumentArray)) {
+            if ($objCodegenArray[0]->generateFiles('aggregate_db_type', $mixArgumentArray)) {
                 $strToReturn[] = 'Successfully generated Aggregate DB Type file(s)';
             } else {
                 $strToReturn[] = 'FAILED to generate Aggregate DB Type file(s)';
@@ -360,7 +360,7 @@ public function __construct($objSettingsXml)
 
         // Check to make sure things that are required are there
         if (!$this->intDatabaseIndex) {
-            $this->strErrors .= "CodeGen Settings XML Fatal Error: databaseIndex was invalid or not set\r\n";
+            $this->strErrors .= "Codegen Settings XML Fatal Error: databaseIndex was invalid or not set\r\n";
         }
 
         // Aggregate RelationshipLinesQcubed and RelationshipLinesSql arrays
@@ -384,7 +384,7 @@ public function __construct($objSettingsXml)
 
         if ($this->strRelationshipsScriptPath) {
             if (!file_exists($this->strRelationshipsScriptPath)) {
-                $this->strErrors .= sprintf("CodeGen Settings XML Fatal Error: relationshipsScript filepath \"%s\" does not exist\r\n",
+                $this->strErrors .= sprintf("Codegen Settings XML Fatal Error: relationshipsScript filepath \"%s\" does not exist\r\n",
                     $this->strRelationshipsScriptPath);
             } else {
                 $strScript = strtolower(trim(file_get_contents($this->strRelationshipsScriptPath)));
@@ -454,7 +454,7 @@ public function __construct($objSettingsXml)
                         break;
 
                     default:
-                        $this->strErrors .= sprintf("CodeGen Settings XML Fatal Error: relationshipsScript format \"%s\" is invalid (must be either \"qcubed\" or \"sql\")\r\n",
+                        $this->strErrors .= sprintf("Codegen Settings XML Fatal Error: relationshipsScript format \"%s\" is invalid (must be either \"qcubed\" or \"sql\")\r\n",
                             $this->strRelationshipsScriptFormat);
                         break;
                 }
@@ -532,9 +532,9 @@ protected function analyzeDatabase()
                 }
 
                 // Check to see if this table name exists anywhere else yet, and warn if it is
-                foreach (static::$CodeGenArray as $objCodeGen) {
-                    if ($objCodeGen instanceof DatabaseCodeGen) {
-                        foreach ($objCodeGen->objTableArray as $objPossibleDuplicate) {
+                foreach (static::$CodegenArray as $objCodegen) {
+                    if ($objCodegen instanceof DatabaseCodegen) {
+                        foreach ($objCodegen->objTableArray as $objPossibleDuplicate) {
                             if (strtolower($objPossibleDuplicate->Name) == strtolower($strTableName)) {
                                 $this->strErrors .= 'Duplicate Table Name Used: ' . $strTableName . "\r\n";
                             }
@@ -867,8 +867,8 @@ protected function analyzeTypeTable(TypeTable $objTypeTable)
         $intRowWidth = count($objFieldArray);
         while ($objDbRow = $objResult->getNextRow()) {
             $strRowArray = $objDbRow->getColumnNameArray();
-            $id = $strRowArray[0];
-            $name = $strRowArray[1];
+            $id = $strRowArray['id'];
+            $name = $strRowArray['name'];
 
             $strNameArray[$id] = str_replace("'", "\\'", str_replace('\\', '\\\\', $name));
             $strTokenArray[$id] = $this->typeTokenFromTypeName($name);
@@ -1641,4 +1641,4 @@ public function __set($strName, $mixValue)
 function array_trim(&$strValue)
 {
     $strValue = trim($strValue);
-}
\ No newline at end of file
+}
diff --git a/src/Codegen/RestServiceCodeGen.php b/src/Codegen/RestServiceCodeGen.php
index 30a9197..47162dd 100644
--- a/src/Codegen/RestServiceCodeGen.php
+++ b/src/Codegen/RestServiceCodeGen.php
@@ -19,7 +19,7 @@
  *
  * @package Codegen
  */
-class RestServiceCodeGen extends QCodegen
+class RestServiceCodegen extends QCodegen
 {
     // REST Service-specific Attributes
     protected $strServiceUrl;
diff --git a/src/Codegen/SqlTable.php b/src/Codegen/SqlTable.php
index 129c5d9..eb75ea4 100644
--- a/src/Codegen/SqlTable.php
+++ b/src/Codegen/SqlTable.php
@@ -154,16 +154,16 @@ public function hasImmediateArrayExpansions() {
 		return $intCount > 0;
 	}
 
-	public function hasExtendedArrayExpansions(DatabaseCodeGen $objCodeGen, $objCheckedTableArray = array()) {
+	public function hasExtendedArrayExpansions(DatabaseCodegen $objCodegen, $objCheckedTableArray = array()) {
 		$objCheckedTableArray[] = $this;
 		foreach ($this->ColumnArray as $objColumn) {
 			if (($objReference = $objColumn->Reference) && !$objReference->IsType) {
-				if ($objTable2 = $objCodeGen->getTable($objReference->Table)) {
+				if ($objTable2 = $objCodegen->getTable($objReference->Table)) {
 					if ($objTable2->hasImmediateArrayExpansions()) {
 						return true;
 					}
 					if (!in_array($objTable2, $objCheckedTableArray) &&	// watch out for circular references
-							$objTable2->hasExtendedArrayExpansions($objCodeGen, $objCheckedTableArray)) {
+							$objTable2->hasExtendedArrayExpansions($objCodegen, $objCheckedTableArray)) {
 						return true;
 					}
 				}
diff --git a/src/Database/Mysqli5/MysqliResult.php b/src/Database/Mysqli5/MysqliResult.php
index 896a50a..167baf3 100644
--- a/src/Database/Mysqli5/MysqliResult.php
+++ b/src/Database/Mysqli5/MysqliResult.php
@@ -30,7 +30,12 @@ public function fetchArray()
     {
         return $this->objMySqliResult->fetch_array();
     }
-
+    
+    public function fetchAssoc()
+    {
+        return $this->objMySqliResult->fetch_assoc();
+    }
+    
     public function fetchFields()
     {
         $objArrayToReturn = array();
@@ -75,7 +80,7 @@ public function close()
 
     public function getNextRow()
     {
-        $strColumnArray = $this->fetchArray();
+        $strColumnArray = $this->fetchAssoc();
 
         if ($strColumnArray) {
             return new MysqliRow($strColumnArray);
diff --git a/test/travis/CodegenBase.php b/test/travis/CodegenBase.php
index ba538ac..f33b98f 100644
--- a/test/travis/CodegenBase.php
+++ b/test/travis/CodegenBase.php
@@ -3,7 +3,7 @@
 namespace QCubed\Project\Codegen;
 
 /**
- * CodeGen
+ * Codegen
  *
  * Overrides the Codegen\CodegenBase class.
  *
@@ -20,7 +20,7 @@ class CodegenBase extends \QCubed\Codegen\CodegenBase
 {
 
     /**
-     * Construct the CodeGen object.
+     * Construct the Codegen object.
      *
      * Gives you an opportunity to read your xml file and make codegen changes accordingly.
      */
@@ -34,7 +34,7 @@ public function __construct($objSettingsXml)
     }
 
     /**
-     * CodeGen::pluralize()
+     * Codegen::pluralize()
      *
      * Example: Overriding the Pluralize method
      *
diff --git a/test/travis/codegen_settings.xml b/test/travis/codegen_settings.xml
index c799906..c09578e 100644
--- a/test/travis/codegen_settings.xml
+++ b/test/travis/codegen_settings.xml
@@ -2,10 +2,10 @@
 <codegen>
 <!--
 	This XML file defines the settings used when running the Code Generator.
-	When running CodeGen, you must specify a CodeGenSettings XML file like
+	When running Codegen, you must specify a CodegenSettings XML file like
 	this one to use.  Feel free to copy, modify, etc.
 -->
-	<!-- General CodeGen Settings -->
+	<!-- General Codegen Settings -->
 	<name application="My QCubed Application"/>
 	<templateEscape begin="&lt;%" end="%&gt;"/>
 
@@ -40,7 +40,7 @@
             <!-- Whether to automatically initialize new objects with default values from database definition -->
             <createOptions autoInitialize="true" />
 
-			<!-- Specific Tables to Exclude or Include in the CodeGen process -->
+			<!-- Specific Tables to Exclude or Include in the Codegen process -->
 			<!--
 					* "include" is used to override any "exclude" patterns or lists
 					* "list" should be a  comma-separated list of table names
diff --git a/tools/README.md b/tools/README.md
index d606ec7..2c87da6 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -7,8 +7,8 @@ and plugins. You should not include this directory in your deployment.
 * `codegen.cli` - for Unix/Linux/Mac OS X command lines
 * `codegen.phpexe` - for Windows command line
 
-Both use the CodeGen and related QCubed codegen libraries to do the bulk
-  of the work. They simply instantiate a CodeGen object, execute various
+Both use the Codegen and related QCubed codegen libraries to do the bulk
+  of the work. They simply instantiate a Codegen object, execute various
   public methods on it to do the code generation, and create a text-based
   report of its activities, outputting it to STDOUT.
 
diff --git a/tools/cli_prepend.inc.php b/tools/cli_prepend.inc.php
index 0b5003a..a6cf23d 100644
--- a/tools/cli_prepend.inc.php
+++ b/tools/cli_prepend.inc.php
@@ -32,5 +32,5 @@
 	// Finally, turn off output buffering
 	ob_end_flush();
 
-// Include the CodeGen class library
+// Include the Codegen class library
 require(QCUBED_PROJECT_INCLUDES_DIR . '/codegen/Codegen.php');
diff --git a/tools/codegen.cli b/tools/codegen.cli
index e67af1d..cc58f79 100755
--- a/tools/codegen.cli
+++ b/tools/codegen.cli
@@ -2,7 +2,7 @@
 <?php
 	/**
 	 * This is a *nix/Mac-based PHP CLI (Command Line Interface) script
-	 * which is a wrapper around the CodeGen object.
+	 * which is a wrapper around the Codegen object.
 	 *
 	 * Remember: You may need to update the top line to have it point
 	 * to the php binary on your server.
diff --git a/tools/codegen.cli.php b/tools/codegen.cli.php
index d85623b..571277a 100644
--- a/tools/codegen.cli.php
+++ b/tools/codegen.cli.php
@@ -3,7 +3,7 @@
 use QCubed\Project\Codegen\CodegenBase as Codegen;
 
 /* This includes library file is used by the codegen.cli and codegen.phpexe scripts
- * to simply fire up and run the CodeGen object, itself.
+ * to simply fire up and run the Codegen object, itself.
  *
  * Depends on QCUBED_PROJECT_INCLUDES_DIR and QCUBED_CONFIG_DIR defines
  */
@@ -40,14 +40,14 @@ function PrintInstructions() {
 
 /////////////////////
 // Run Code Gen
-CodeGen::run($settingsFile);
+Codegen::run($settingsFile);
 /////////////////////
 
 
-if ($strErrors = CodeGen::$RootErrors) {
+if ($strErrors = Codegen::$RootErrors) {
 	printf("The following ROOT ERRORS were reported:\r\n%s\r\n\r\n", $strErrors);
 } else {
-	printf("CodeGen settings (as evaluted from %s):\r\n%s\r\n\r\n", $settingsFile, CodeGen::GetSettingsXml());
+	printf("Codegen settings (as evaluted from %s):\r\n%s\r\n\r\n", $settingsFile, Codegen::GetSettingsXml());
 }
 
 print ("Template files:\r\n");
@@ -55,15 +55,15 @@ function PrintInstructions() {
 echo implode("\r\n", $strFiles);
 
 
-foreach (CodeGen::$CodeGenArray as $objCodeGen) {
-	printf("%s\r\n---------------------------------------------------------------------\r\n", $objCodeGen->GetTitle());
-	printf("%s\r\n", $objCodeGen->GetReportLabel());
-	printf("%s\r\n", $objCodeGen->GenerateAll());
-	if ($strErrors = $objCodeGen->Errors)
+foreach (Codegen::$CodegenArray as $objCodegen) {
+	printf("%s\r\n---------------------------------------------------------------------\r\n", $objCodegen->GetTitle());
+	printf("%s\r\n", $objCodegen->GetReportLabel());
+	printf("%s\r\n", $objCodegen->GenerateAll());
+	if ($strErrors = $objCodegen->Errors)
 		printf("The following errors were reported:\r\n%s\r\n", $strErrors);
 	print("\r\n");
 }
 
-foreach (CodeGen::GenerateAggregate() as $strMessage) {
+foreach (Codegen::GenerateAggregate() as $strMessage) {
 	printf("%s\r\n\r\n", $strMessage);
 }
\ No newline at end of file
diff --git a/tools/codegen.php b/tools/codegen.php
index 1c7ee05..e9a521a 100644
--- a/tools/codegen.php
+++ b/tools/codegen.php
@@ -37,7 +37,7 @@
 
 
 /////////////////////////////////////////////////////
-// Run CodeGen, using the ./codegen_settings.xml file
+// Run Codegen, using the ./codegen_settings.xml file
 /////////////////////////////////////////////////////
 Codegen::run(QCUBED_CONFIG_DIR . '/codegen_settings.xml');
 
@@ -77,22 +77,22 @@ function displayMonospacedText($strText)
         <p><strong>The following root errors were reported:</strong></p>
         <pre><code><?php DisplayMonospacedText($strErrors); ?></code></pre>
     <?php } else { ?>
-        <p><strong>CodeGen Settings (as evaluated from <?php echo(Codegen::$SettingsFilePath); ?>):</strong></p>
+        <p><strong>Codegen Settings (as evaluated from <?php echo(Codegen::$SettingsFilePath); ?>):</strong></p>
         <pre><code><?php DisplayMonospacedText(Codegen::getSettingsXml()); ?></code></pre>
     <?php } ?>
 
-    <?php foreach (Codegen::$CodeGenArray as $objCodeGen) { ?>
-        <p><strong><?= QString::htmlEntities($objCodeGen->getTitle()); ?></strong></p>
-        <pre><code><p class="code_title"><?php QString::htmlEntities($objCodeGen->getReportLabel()); ?></p><?php
-                    DisplayMonospacedText($objCodeGen->generateAll());
+    <?php foreach (Codegen::$CodegenArray as $objCodegen) { ?>
+        <p><strong><?= QString::htmlEntities($objCodegen->getTitle()); ?></strong></p>
+        <pre><code><p class="code_title"><?php QString::htmlEntities($objCodegen->getReportLabel()); ?></p><?php
+                    DisplayMonospacedText($objCodegen->generateAll());
                 ?>
-                <?php if ($strErrors = $objCodeGen->Errors) { ?>
+                <?php if ($strErrors = $objCodegen->Errors) { ?>
                     <p class="code_title">The following errors were reported:</p>
-                    <?php DisplayMonospacedText($objCodeGen->Errors); ?>
+                    <?php DisplayMonospacedText($objCodegen->Errors); ?>
                 <?php } ?>
-                <?php if ($strWarnings = $objCodeGen->Warnings) { ?>
+                <?php if ($strWarnings = $objCodegen->Warnings) { ?>
                     <p class="code_title">The following warnings were reported:</p>
-<?php DisplayMonospacedText($objCodeGen->Warnings); ?>
+<?php DisplayMonospacedText($objCodegen->Warnings); ?>
 <?php } ?></code></pre>
     <?php } ?>
 
diff --git a/tools/codegen.phpexe b/tools/codegen.phpexe
index 374be0e..9a2ad23 100755
--- a/tools/codegen.phpexe
+++ b/tools/codegen.phpexe
@@ -1,7 +1,7 @@
 <?php
 	/**
 	 * This is a Windows-based PHP CLI (Command Line Interface) script
-	 * which is a wrapper around the CodeGen object.
+	 * which is a wrapper around the Codegen object.
 	 *
 	 * Remember: Windows CLI must be executed by the php.exe executable (usually
 	 * installed at c:\php\php.exe).
diff --git a/tools/orm.regex.php b/tools/orm.regex.php
index 99340da..0899c78 100644
--- a/tools/orm.regex.php
+++ b/tools/orm.regex.php
@@ -13,16 +13,16 @@
 $a["const"]["QCubed\\Codegen\\ControlCategoryType::SingleSelect"] = "QCubed\\Codegen\\ControlCategoryType::SINGLE_SELECT";
 $a["const"]["QCubed\\Codegen\\ControlCategoryType::MultiSelect"] = "QCubed\\Codegen\\ControlCategoryType::MULTI_SELECT";
 $a["const"]["QCubed\\Codegen\\ControlCategoryType::Table"] = "QCubed\\Codegen\\ControlCategoryType::TABLE";
-$a["class"]['QCodeGen'] = '\\QCubed\\Project\\Codegen\\CodegenBase';
+$a["class"]['QCodegen'] = '\\QCubed\\Project\\Codegen\\CodegenBase';
 $a["const"]["QCubed\\Project\\Codegen\\CodegenBase::PhpReservedWords"] = "QCubed\\Project\\Codegen\\CodegenBase::PHP_RESERVED_WORDS";
 $a["const"]["QCubed\\Project\\Codegen\\CodegenBase::DebugMode"] = "QCubed\\Project\\Codegen\\CodegenBase::DEBUG_MODE";
-$a["class"]['QDatabaseCodeGen'] = '\\QCubed\\Codegen\\DatabaseCodeGen';
-$a["const"]["QCubed\\Codegen\\DatabaseCodeGen::PhpReservedWords"] = "QCubed\\Codegen\\DatabaseCodeGen::PHP_RESERVED_WORDS";
-$a["const"]["QCubed\\Codegen\\DatabaseCodeGen::DebugMode"] = "QCubed\\Codegen\\DatabaseCodeGen::DEBUG_MODE";
+$a["class"]['QDatabaseCodegen'] = '\\QCubed\\Codegen\\DatabaseCodegen';
+$a["const"]["QCubed\\Codegen\\DatabaseCodegen::PhpReservedWords"] = "QCubed\\Codegen\\DatabaseCodegen::PHP_RESERVED_WORDS";
+$a["const"]["QCubed\\Codegen\\DatabaseCodegen::DebugMode"] = "QCubed\\Codegen\\DatabaseCodegen::DEBUG_MODE";
 $a["const"]["QCubed\\Codegen\\OptionFile::TableOptionsFieldName"] = "QCubed\\Codegen\\OptionFile::TABLE_OPTIONS_FIELD_NAME";
 $a["class"]['QReference'] = '\\QCubed\\Codegen\\Reference';
-$a["const"]["QCubed\\Codegen\\RestServiceCodeGen::PhpReservedWords"] = "QCubed\\Codegen\\RestServiceCodeGen::PHP_RESERVED_WORDS";
-$a["const"]["QCubed\\Codegen\\RestServiceCodeGen::DebugMode"] = "QCubed\\Codegen\\RestServiceCodeGen::DEBUG_MODE";
+$a["const"]["QCubed\\Codegen\\RestServiceCodegen::PhpReservedWords"] = "QCubed\\Codegen\\RestServiceCodegen::PHP_RESERVED_WORDS";
+$a["const"]["QCubed\\Codegen\\RestServiceCodegen::DebugMode"] = "QCubed\\Codegen\\RestServiceCodegen::DEBUG_MODE";
 $a["class"]['QDatabaseBase'] = '\\QCubed\\Database\\DatabaseBase';
 $a["const"]["QCubed\\Database\\DatabaseBase::Adapter"] = "QCubed\\Database\\DatabaseBase::ADAPTER";
 $a["class"]['QDatabaseException'] = '\\QCubed\\Database\\Exception\\ExceptionBase';