diff --git a/teeth_agent/configdrive.py b/teeth_agent/configdrive.py
index 9d9e6fe5d..805ade2b4 100644
--- a/teeth_agent/configdrive.py
+++ b/teeth_agent/configdrive.py
@@ -31,7 +31,7 @@ class ConfigDriveWriter(object):
     def add_file(self, filepath, contents):
         self.files[filepath] = contents
 
-    def write(self, location, prefix='teeth', version='latest'):
+    def write(self, location, prefix='openstack', version='latest'):
         metadata = {}
         for k, v in self.metadata.iteritems():
             metadata[k] = v
@@ -60,7 +60,7 @@ class ConfigDriveWriter(object):
             f.write(json_metadata)
 
 
-def write_configdrive(location, metadata, files, prefix='teeth',
+def write_configdrive(location, metadata, files, prefix='openstack',
                       version='latest'):
     """Generates and writes a valid configdrive to `location`.
     `files` are passed in as a dict {path: base64_contents}.
@@ -74,4 +74,4 @@ def write_configdrive(location, metadata, files, prefix='teeth',
         contents = base64.b64decode(b64_contents)
         writer.add_file(path, contents)
 
-    writer.write(location)
+    writer.write(location, prefix=prefix, version=version)
diff --git a/teeth_agent/tests/configdrive.py b/teeth_agent/tests/configdrive.py
index be6368988..bbc9182b7 100644
--- a/teeth_agent/tests/configdrive.py
+++ b/teeth_agent/tests/configdrive.py
@@ -75,7 +75,7 @@ class ConfigDriveWriterTestCase(unittest.TestCase):
             {'content_path': '/content/0001', 'path': '/etc/conf1'},
         ]
 
-        self.writer.write('/lol', prefix='teeth', version='latest')
+        self.writer.write('/lol', prefix='openstack', version='latest')
 
         # have to pull out the JSON passed to write and parse it
         # because arbitrary dictionary ordering, etc
@@ -91,7 +91,7 @@ class ConfigDriveWriterTestCase(unittest.TestCase):
             mock.call('/lol/content/0001', 'wb'),
             mock.call().write('contents1'),
             mock.call().__exit__(None, None, None),
-            mock.call('/lol/teeth/latest/meta_data.json', 'wb'),
+            mock.call('/lol/openstack/latest/meta_data.json', 'wb'),
             # already checked
             mock.call().write(mock.ANY),
             mock.call().__exit__(None, None, None),
@@ -117,7 +117,7 @@ class ConfigDriveWriterTestCase(unittest.TestCase):
         configdrive.write_configdrive('/lol',
                                       metadata,
                                       files,
-                                      prefix='teeth',
+                                      prefix='openstack',
                                       version='latest')
 
         # have to pull out the JSON passed to write and parse it
@@ -134,7 +134,7 @@ class ConfigDriveWriterTestCase(unittest.TestCase):
             mock.call('/lol/content/0001', 'wb'),
             mock.call().write('contents1'),
             mock.call().__exit__(None, None, None),
-            mock.call('/lol/teeth/latest/meta_data.json', 'wb'),
+            mock.call('/lol/openstack/latest/meta_data.json', 'wb'),
             # already checked
             mock.call().write(mock.ANY),
             mock.call().__exit__(None, None, None),