diff --git a/lark b/lark
index c86b454..00f1f82 100755
--- a/lark
+++ b/lark
@@ -39,7 +39,7 @@ import uuid
 import xdg.BaseDirectory
 
 #import dat
-import metadatadb
+import metadata
 
 HASH_CHUNK_SIZE = 10485760 # 10mb
 SQLITE_FILENAME = 'metadata.db'
@@ -91,7 +91,7 @@ def _kwargs_parse(kwargs_list):
 action_object = sys.argv[1]
 action = sys.argv[2]
 
-metadatadb.configure(os.path.join(data_path, SQLITE_FILENAME))
+metadata.configure(os.path.join(data_path, SQLITE_FILENAME))
 
 # TODO: Use a real UI library. This mess is just intended for development.
 if action_object == 'platform':
@@ -100,24 +100,24 @@ if action_object == 'platform':
         platform_shortcode = sys.argv[3]
         platform_name = sys.argv[4]
 
-        platform_data = metadatadb.Platform(shortcode=platform_shortcode,
+        platform_data = metadata.Platform(shortcode=platform_shortcode,
                                             fullname=platform_name)
-        with metadatadb.get_db_session() as session:
+        with metadata.get_db_session() as session:
             session.add(platform_data)
 
     elif action == 'list':
         # TODO: Filter support is exclusively limited to SQLAlchemy's filter.ilike function. Figure
         # out a good way to include other filters.
         filters = _kwargs_parse(sys.argv[3:])
-        with metadatadb.get_db_session() as session:
-            print(metadatadb.search(session, metadatadb.Platform, **filters))
+        with metadata.get_db_session() as session:
+            print(metadata.search(session, metadata.Platform, **filters))
 
     elif action == 'remove':
         constraints = sys.argv[3:]
         filters = _kwargs_parse(sys.argv[3:])
 
-        with metadatadb.get_db_session() as session:
-            platforms = metadatadb.search(session, metadatadb.Platform, **filters)
+        with metadata.get_db_session() as session:
+            platforms = metadata.search(session, metadata.Platform, **filters)
             for platform in platforms:
                 print('Removing %s.' % platform.fullname)
                 session.delete(platform)
@@ -127,20 +127,20 @@ if action_object == 'platform':
         platform_shortcode = sys.argv[3]
         platform_name = sys.argv[4]
 
-        platform_data = metadatadb.Platform(shortcode=platform_shortcode,
+        platform_data = metadata.Platform(shortcode=platform_shortcode,
                                             fullname=platform_name)
 
-        with metadatadb.get_db_session() as session:
-            print(metadatadb.search(session, metadatadb.Platform))
+        with metadata.get_db_session() as session:
+            print(metadata.search(session, metadata.Platform))
 
 elif action_object == 'release-group':
     if action == 'add':
         properties = _kwargs_parse(sys.argv[3:])
-        release_group = metadatadb.ReleaseGroup(name=properties['name'])
+        release_group = metadata.ReleaseGroup(name=properties['name'])
 
-        with metadatadb.get_db_session() as session:
+        with metadata.get_db_session() as session:
             if properties['platform']:
-                platform = metadatadb.search(session, metadatadb.Platform,
+                platform = metadata.search(session, metadata.Platform,
                                              shortcode=properties['platform'])[0]
                 release_group.platform = platform
             session.add(release_group)
@@ -150,15 +150,15 @@ elif action_object == 'release-group':
         # out a good way to include other filters.
         print('Listing release groups.')
         filters = _kwargs_parse(sys.argv[3:])
-        with metadatadb.get_db_session() as session:
-            print(metadatadb.search(session, metadatadb.ReleaseGroup, **filters))
+        with metadata.get_db_session() as session:
+            print(metadata.search(session, metadata.ReleaseGroup, **filters))
 
     elif action == 'remove':
         constraints = sys.argv[3:]
         filters = _kwargs_parse(sys.argv[3:])
 
-        with metadatadb.get_db_session() as session:
-            release_groups = metadatadb.search(session, metadatadb.ReleaseGroup, **filters)
+        with metadata.get_db_session() as session:
+            release_groups = metadata.search(session, metadata.ReleaseGroup, **filters)
             for release_group in release_groups:
                 print('Removing %s.' % release_group.name)
                 session.delete(release_group)
@@ -166,12 +166,12 @@ elif action_object == 'release-group':
 elif action_object == 'image':
     if action == 'add':
         properties = _kwargs_parse(sys.argv[3:])
-        image = metadatadb.Image(filename=properties['filename'],
+        image = metadata.Image(filename=properties['filename'],
                                  sha1sum=properties['sha1sum'])
 
-        with metadatadb.get_db_session() as session:
+        with metadata.get_db_session() as session:
             if properties['release-group']:
-                release_group = metadatadb.search(session, metadatadb.ReleaseGroup,
+                release_group = metadata.search(session, metadata.ReleaseGroup,
                                                   name=properties['release-group'])[0]
                 image.release_group = release_group
             session.add(image)
@@ -181,15 +181,15 @@ elif action_object == 'image':
         # out a good way to include other filters.
         print('Listing release groups.')
         filters = _kwargs_parse(sys.argv[3:])
-        with metadatadb.get_db_session() as session:
-            print(metadatadb.search(session, metadatadb.Image, **filters))
+        with metadata.get_db_session() as session:
+            print(metadata.search(session, metadata.Image, **filters))
 
     elif action == 'remove':
         constraints = sys.argv[3:]
         filters = _kwargs_parse(sys.argv[3:])
 
-        with metadatadb.get_db_session() as session:
-            release_groups = metadatadb.search(session, metadatadb.Image, **filters)
+        with metadata.get_db_session() as session:
+            release_groups = metadata.search(session, metadata.Image, **filters)
             for image in release_groups:
                 print('Removing %s.' % image.name)
                 session.delete(image)
diff --git a/metadatadb.py b/metadata.py
similarity index 99%
rename from metadatadb.py
rename to metadata.py
index 304ef9d..52e514d 100644
--- a/metadatadb.py
+++ b/metadata.py
@@ -1,5 +1,5 @@
 '''
-metadatadb.py
+metadata.py
 
 Everything needed to interact with the metadata database; namely SQL ORM objects, a context
 generator for the actual database, and a handful of convenience functions.