diff --git a/rida.py b/rida.py
index 2fbc4fbc..892b9b8f 100755
--- a/rida.py
+++ b/rida.py
@@ -46,7 +46,7 @@ app.config.from_envvar("RIDA_SETTINGS", silent=True)
 
 # TODO: Load the config file from environment
 conf = config.from_file("rida.conf")
-db = database.Session()
+db = database.Database()
 
 @app.route("/rida/module-builds/", methods=["POST"])
 def submit_build():
diff --git a/rida/database.py b/rida/database.py
index d52a6150..c73f0358 100644
--- a/rida/database.py
+++ b/rida/database.py
@@ -31,7 +31,7 @@ from sqlalchemy.ext.declarative import declarative_base
 
 Base = declarative_base()
 
-class Session(object):
+class Database(object):
     """Class for handling database connections."""
 
     def __init__(self, rdburl=None):