diff --git a/wcsinst/wcsinstd/deploy.py b/wcsinst/wcsinstd/deploy.py
index ba13c68..fcf74c6 100644
--- a/wcsinst/wcsinstd/deploy.py
+++ b/wcsinst/wcsinstd/deploy.py
@@ -118,9 +118,12 @@ class DeployInstance(object):
 
     def make_sql_tables(self, wcs_cfg):
         params = []
-        for param in ('dbname', 'user', 'password', 'host', 'port'):
+        for param in ('database', 'user', 'password', 'host', 'port'):
             if wcs_cfg.get('postgresql').get(param):
-                params.append('--' + param)
+                if param == 'database':
+                    params.append('--dbname')
+                else:
+                    params.append('--' + param)
                 params.append(wcs_cfg.get('postgresql').get(param))
         os.system('%s convert-to-sql %s %s' % (app_settings.WCSCTL_SCRIPT, ' '.join(params), self.domain))