diff --git a/cyborg/accelerator/accelerator.py b/cyborg/accelerator/accelerator.py
index 1c818684..18cc4e90 100644
--- a/cyborg/accelerator/accelerator.py
+++ b/cyborg/accelerator/accelerator.py
@@ -20,7 +20,7 @@ Base = declarative_base()
 
 
 # A common internal acclerator object for internal use.
-class accelerator(Base):
+class Accelerator(Base):
     __tablename__ = 'accelerators'
     accelerator_id = Column(String, primary_key=True)
     device_type = Column(String)
diff --git a/cyborg/accelerator/drivers/generic_driver.py b/cyborg/accelerator/drivers/generic_driver.py
index 401e029d..2e13ecc2 100644
--- a/cyborg/accelerator/drivers/generic_driver.py
+++ b/cyborg/accelerator/drivers/generic_driver.py
@@ -44,7 +44,7 @@ class GenericDriver(generic.GENERICDRIVER):
     def do_setup(self, context):
         """Any initialization the generic driver does while starting."""
         super(GenericDriver, self).do_setup(context)
-        self.acc = accelerator.accelerator()
+        self.acc = accelerator.Accelerator()
 
     def create_accelerator(self, context):
         """Creates accelerator."""