diff --git a/PHPCI/Model/Base/BuildBase.php b/PHPCI/Model/Base/BuildBase.php
index 1a6d3549..a2b0c092 100644
--- a/PHPCI/Model/Base/BuildBase.php
+++ b/PHPCI/Model/Base/BuildBase.php
@@ -161,7 +161,7 @@ class BuildBase extends Model
     */
     public function getId()
     {
-        $rtn    = $this->_data['id'];
+        $rtn    = $this->data['id'];
 
         
         return $rtn;
@@ -174,7 +174,7 @@ class BuildBase extends Model
     */
     public function getProjectId()
     {
-        $rtn    = $this->_data['project_id'];
+        $rtn    = $this->data['project_id'];
 
         
         return $rtn;
@@ -187,7 +187,7 @@ class BuildBase extends Model
     */
     public function getCommitId()
     {
-        $rtn    = $this->_data['commit_id'];
+        $rtn    = $this->data['commit_id'];
 
         
         return $rtn;
@@ -200,7 +200,7 @@ class BuildBase extends Model
     */
     public function getStatus()
     {
-        $rtn    = $this->_data['status'];
+        $rtn    = $this->data['status'];
 
         
         return $rtn;
@@ -213,7 +213,7 @@ class BuildBase extends Model
     */
     public function getLog()
     {
-        $rtn    = $this->_data['log'];
+        $rtn    = $this->data['log'];
 
         
         return $rtn;
@@ -226,7 +226,7 @@ class BuildBase extends Model
     */
     public function getBranch()
     {
-        $rtn    = $this->_data['branch'];
+        $rtn    = $this->data['branch'];
 
         
         return $rtn;
@@ -239,7 +239,7 @@ class BuildBase extends Model
     */
     public function getCreated()
     {
-        $rtn    = $this->_data['created'];
+        $rtn    = $this->data['created'];
 
         
         if (!empty($rtn)) {
@@ -257,7 +257,7 @@ class BuildBase extends Model
     */
     public function getStarted()
     {
-        $rtn    = $this->_data['started'];
+        $rtn    = $this->data['started'];
 
         
         if (!empty($rtn)) {
@@ -275,7 +275,7 @@ class BuildBase extends Model
     */
     public function getFinished()
     {
-        $rtn    = $this->_data['finished'];
+        $rtn    = $this->data['finished'];
 
         
         if (!empty($rtn)) {
@@ -293,7 +293,7 @@ class BuildBase extends Model
     */
     public function getPlugins()
     {
-        $rtn    = $this->_data['plugins'];
+        $rtn    = $this->data['plugins'];
 
         
         return $rtn;
@@ -309,11 +309,11 @@ class BuildBase extends Model
     {
         $this->_validateNotNull('Id', $value);
         $this->_validateInt('Id', $value);
-        if ($this->_data['id'] === $value) {
+        if ($this->data['id'] === $value) {
             return;
         }
 
-        $this->_data['id'] = $value;
+        $this->data['id'] = $value;
 
         $this->_setModified('id');
     }
@@ -328,11 +328,11 @@ class BuildBase extends Model
     {
         $this->_validateNotNull('ProjectId', $value);
         $this->_validateInt('ProjectId', $value);
-        if ($this->_data['project_id'] === $value) {
+        if ($this->data['project_id'] === $value) {
             return;
         }
 
-        $this->_data['project_id'] = $value;
+        $this->data['project_id'] = $value;
 
         $this->_setModified('project_id');
     }
@@ -347,11 +347,11 @@ class BuildBase extends Model
     {
         $this->_validateNotNull('CommitId', $value);
         $this->_validateString('CommitId', $value);
-        if ($this->_data['commit_id'] === $value) {
+        if ($this->data['commit_id'] === $value) {
             return;
         }
 
-        $this->_data['commit_id'] = $value;
+        $this->data['commit_id'] = $value;
 
         $this->_setModified('commit_id');
     }
@@ -366,11 +366,11 @@ class BuildBase extends Model
     {
         $this->_validateNotNull('Status', $value);
         $this->_validateInt('Status', $value);
-        if ($this->_data['status'] === $value) {
+        if ($this->data['status'] === $value) {
             return;
         }
 
-        $this->_data['status'] = $value;
+        $this->data['status'] = $value;
 
         $this->_setModified('status');
     }
@@ -384,11 +384,11 @@ class BuildBase extends Model
     {
 
         $this->_validateString('Log', $value);
-        if ($this->_data['log'] === $value) {
+        if ($this->data['log'] === $value) {
             return;
         }
 
-        $this->_data['log'] = $value;
+        $this->data['log'] = $value;
 
         $this->_setModified('log');
     }
@@ -403,11 +403,11 @@ class BuildBase extends Model
     {
         $this->_validateNotNull('Branch', $value);
         $this->_validateString('Branch', $value);
-        if ($this->_data['branch'] === $value) {
+        if ($this->data['branch'] === $value) {
             return;
         }
 
-        $this->_data['branch'] = $value;
+        $this->data['branch'] = $value;
 
         $this->_setModified('branch');
     }
@@ -421,11 +421,11 @@ class BuildBase extends Model
     {
 
         $this->_validateDate('Created', $value);
-        if ($this->_data['created'] === $value) {
+        if ($this->data['created'] === $value) {
             return;
         }
 
-        $this->_data['created'] = $value;
+        $this->data['created'] = $value;
 
         $this->_setModified('created');
     }
@@ -439,11 +439,11 @@ class BuildBase extends Model
     {
 
         $this->_validateDate('Started', $value);
-        if ($this->_data['started'] === $value) {
+        if ($this->data['started'] === $value) {
             return;
         }
 
-        $this->_data['started'] = $value;
+        $this->data['started'] = $value;
 
         $this->_setModified('started');
     }
@@ -457,11 +457,11 @@ class BuildBase extends Model
     {
 
         $this->_validateDate('Finished', $value);
-        if ($this->_data['finished'] === $value) {
+        if ($this->data['finished'] === $value) {
             return;
         }
 
-        $this->_data['finished'] = $value;
+        $this->data['finished'] = $value;
 
         $this->_setModified('finished');
     }
@@ -475,11 +475,11 @@ class BuildBase extends Model
     {
 
         $this->_validateString('Plugins', $value);
-        if ($this->_data['plugins'] === $value) {
+        if ($this->data['plugins'] === $value) {
             return;
         }
 
-        $this->_data['plugins'] = $value;
+        $this->data['plugins'] = $value;
 
         $this->_setModified('plugins');
     }
diff --git a/PHPCI/Model/Base/ProjectBase.php b/PHPCI/Model/Base/ProjectBase.php
index 431d06fc..45481dd5 100644
--- a/PHPCI/Model/Base/ProjectBase.php
+++ b/PHPCI/Model/Base/ProjectBase.php
@@ -118,7 +118,7 @@ class ProjectBase extends Model
     */
     public function getId()
     {
-        $rtn    = $this->_data['id'];
+        $rtn    = $this->data['id'];
 
         
         return $rtn;
@@ -131,7 +131,7 @@ class ProjectBase extends Model
     */
     public function getTitle()
     {
-        $rtn    = $this->_data['title'];
+        $rtn    = $this->data['title'];
 
         
         return $rtn;
@@ -144,7 +144,7 @@ class ProjectBase extends Model
     */
     public function getReference()
     {
-        $rtn    = $this->_data['reference'];
+        $rtn    = $this->data['reference'];
 
         
         return $rtn;
@@ -157,7 +157,7 @@ class ProjectBase extends Model
     */
     public function getGitKey()
     {
-        $rtn    = $this->_data['git_key'];
+        $rtn    = $this->data['git_key'];
 
         
         return $rtn;
@@ -170,7 +170,7 @@ class ProjectBase extends Model
     */
     public function getType()
     {
-        $rtn    = $this->_data['type'];
+        $rtn    = $this->data['type'];
 
         
         return $rtn;
@@ -183,7 +183,7 @@ class ProjectBase extends Model
     */
     public function getToken()
     {
-        $rtn    = $this->_data['token'];
+        $rtn    = $this->data['token'];
 
         
         return $rtn;
@@ -199,11 +199,11 @@ class ProjectBase extends Model
     {
         $this->_validateNotNull('Id', $value);
         $this->_validateInt('Id', $value);
-        if ($this->_data['id'] === $value) {
+        if ($this->data['id'] === $value) {
             return;
         }
 
-        $this->_data['id'] = $value;
+        $this->data['id'] = $value;
 
         $this->_setModified('id');
     }
@@ -218,11 +218,11 @@ class ProjectBase extends Model
     {
         $this->_validateNotNull('Title', $value);
         $this->_validateString('Title', $value);
-        if ($this->_data['title'] === $value) {
+        if ($this->data['title'] === $value) {
             return;
         }
 
-        $this->_data['title'] = $value;
+        $this->data['title'] = $value;
 
         $this->_setModified('title');
     }
@@ -237,11 +237,11 @@ class ProjectBase extends Model
     {
         $this->_validateNotNull('Reference', $value);
         $this->_validateString('Reference', $value);
-        if ($this->_data['reference'] === $value) {
+        if ($this->data['reference'] === $value) {
             return;
         }
 
-        $this->_data['reference'] = $value;
+        $this->data['reference'] = $value;
 
         $this->_setModified('reference');
     }
@@ -256,11 +256,11 @@ class ProjectBase extends Model
     {
         $this->_validateNotNull('GitKey', $value);
         $this->_validateString('GitKey', $value);
-        if ($this->_data['git_key'] === $value) {
+        if ($this->data['git_key'] === $value) {
             return;
         }
 
-        $this->_data['git_key'] = $value;
+        $this->data['git_key'] = $value;
 
         $this->_setModified('git_key');
     }
@@ -275,11 +275,11 @@ class ProjectBase extends Model
     {
         $this->_validateNotNull('Type', $value);
         $this->_validateString('Type', $value);
-        if ($this->_data['type'] === $value) {
+        if ($this->data['type'] === $value) {
             return;
         }
 
-        $this->_data['type'] = $value;
+        $this->data['type'] = $value;
 
         $this->_setModified('type');
     }
@@ -293,11 +293,11 @@ class ProjectBase extends Model
     {
 
         $this->_validateString('Token', $value);
-        if ($this->_data['token'] === $value) {
+        if ($this->data['token'] === $value) {
             return;
         }
 
-        $this->_data['token'] = $value;
+        $this->data['token'] = $value;
 
         $this->_setModified('token');
     }
diff --git a/PHPCI/Model/Base/UserBase.php b/PHPCI/Model/Base/UserBase.php
index cf2ef88b..7ce2759c 100644
--- a/PHPCI/Model/Base/UserBase.php
+++ b/PHPCI/Model/Base/UserBase.php
@@ -111,7 +111,7 @@ class UserBase extends Model
     */
     public function getId()
     {
-        $rtn    = $this->_data['id'];
+        $rtn    = $this->data['id'];
 
         
         return $rtn;
@@ -124,7 +124,7 @@ class UserBase extends Model
     */
     public function getEmail()
     {
-        $rtn    = $this->_data['email'];
+        $rtn    = $this->data['email'];
 
         
         return $rtn;
@@ -137,7 +137,7 @@ class UserBase extends Model
     */
     public function getHash()
     {
-        $rtn    = $this->_data['hash'];
+        $rtn    = $this->data['hash'];
 
         
         return $rtn;
@@ -150,7 +150,7 @@ class UserBase extends Model
     */
     public function getIsAdmin()
     {
-        $rtn    = $this->_data['is_admin'];
+        $rtn    = $this->data['is_admin'];
 
         
         return $rtn;
@@ -163,7 +163,7 @@ class UserBase extends Model
     */
     public function getName()
     {
-        $rtn    = $this->_data['name'];
+        $rtn    = $this->data['name'];
 
         
         return $rtn;
@@ -179,11 +179,11 @@ class UserBase extends Model
     {
         $this->_validateNotNull('Id', $value);
         $this->_validateInt('Id', $value);
-        if ($this->_data['id'] === $value) {
+        if ($this->data['id'] === $value) {
             return;
         }
 
-        $this->_data['id'] = $value;
+        $this->data['id'] = $value;
 
         $this->_setModified('id');
     }
@@ -198,11 +198,11 @@ class UserBase extends Model
     {
         $this->_validateNotNull('Email', $value);
         $this->_validateString('Email', $value);
-        if ($this->_data['email'] === $value) {
+        if ($this->data['email'] === $value) {
             return;
         }
 
-        $this->_data['email'] = $value;
+        $this->data['email'] = $value;
 
         $this->_setModified('email');
     }
@@ -217,11 +217,11 @@ class UserBase extends Model
     {
         $this->_validateNotNull('Hash', $value);
         $this->_validateString('Hash', $value);
-        if ($this->_data['hash'] === $value) {
+        if ($this->data['hash'] === $value) {
             return;
         }
 
-        $this->_data['hash'] = $value;
+        $this->data['hash'] = $value;
 
         $this->_setModified('hash');
     }
@@ -236,11 +236,11 @@ class UserBase extends Model
     {
         $this->_validateNotNull('IsAdmin', $value);
         $this->_validateInt('IsAdmin', $value);
-        if ($this->_data['is_admin'] === $value) {
+        if ($this->data['is_admin'] === $value) {
             return;
         }
 
-        $this->_data['is_admin'] = $value;
+        $this->data['is_admin'] = $value;
 
         $this->_setModified('is_admin');
     }
@@ -255,11 +255,11 @@ class UserBase extends Model
     {
         $this->_validateNotNull('Name', $value);
         $this->_validateString('Name', $value);
-        if ($this->_data['name'] === $value) {
+        if ($this->data['name'] === $value) {
             return;
         }
 
-        $this->_data['name'] = $value;
+        $this->data['name'] = $value;
 
         $this->_setModified('name');
     }