diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 9f701c1e1..f07281da3 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -694,7 +694,7 @@ class ApiController extends Zend_Controller_Action
         $remoteAddr = $_SERVER['REMOTE_ADDR'];
         Logging::log("Registered Component: ".$component."@".$remoteAddr);
 
-        Application_Model_Component::Register($component, $remoteAddr);
+        Application_Model_ServiceRegister::Register($component, $remoteAddr);
     }
 }
 
diff --git a/airtime_mvc/application/models/Component.php b/airtime_mvc/application/models/ServiceRegister.php
similarity index 94%
rename from airtime_mvc/application/models/Component.php
rename to airtime_mvc/application/models/ServiceRegister.php
index 2771f79eb..47c647829 100644
--- a/airtime_mvc/application/models/Component.php
+++ b/airtime_mvc/application/models/ServiceRegister.php
@@ -1,5 +1,5 @@
 <?php
-class Application_Model_Component {
+class Application_Model_ServiceRegister {
 
     public static function Register($p_componentName, $p_ipAddress){
 
diff --git a/airtime_mvc/application/models/airtime/CcComponent.php b/airtime_mvc/application/models/airtime/CcComponent.php
deleted file mode 100644
index a8befbec6..000000000
--- a/airtime_mvc/application/models/airtime/CcComponent.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-
-
-/**
- * Skeleton subclass for representing a row from the 'cc_component' table.
- *
- * 
- *
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    propel.generator.airtime
- */
-class CcComponent extends BaseCcComponent {
-
-} // CcComponent
diff --git a/airtime_mvc/application/models/airtime/CcComponentPeer.php b/airtime_mvc/application/models/airtime/CcComponentPeer.php
deleted file mode 100644
index 6b628386e..000000000
--- a/airtime_mvc/application/models/airtime/CcComponentPeer.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-
-
-/**
- * Skeleton subclass for performing query and update operations on the 'cc_component' table.
- *
- * 
- *
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    propel.generator.airtime
- */
-class CcComponentPeer extends BaseCcComponentPeer {
-
-} // CcComponentPeer
diff --git a/airtime_mvc/application/models/airtime/CcComponentQuery.php b/airtime_mvc/application/models/airtime/CcComponentQuery.php
deleted file mode 100644
index 03584ffe6..000000000
--- a/airtime_mvc/application/models/airtime/CcComponentQuery.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-
-
-/**
- * Skeleton subclass for performing query and update operations on the 'cc_component' table.
- *
- * 
- *
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    propel.generator.airtime
- */
-class CcComponentQuery extends BaseCcComponentQuery {
-
-} // CcComponentQuery