diff --git a/bin/barbican-all b/bin/barbican-all
index e23763320..7a7490832 100755
--- a/bin/barbican-all
+++ b/bin/barbican-all
@@ -14,7 +14,7 @@ VENV_HOME=${VENV_HOME:-$PWD}
 VENV_PYTHON=$VENV_HOME/$VENV/lib/python2.7/site-packages
 
 PKG_DIR=/etc/$PKG
-CONF_FILE=$PKG_DIR/barbican-api.conf
+CONF_FILE=$PKG_DIR/barbican.conf
 POLICY_FILE=$PKG_DIR/policy.json
 SIGNING_DIR=$PKG_DIR/cache/
 OPTS='--daemonize /var/log/barbican/uwsgi.log'
@@ -25,15 +25,15 @@ then
   echo 'Running locally...'
 
   PKG_DIR=$PWD/etc/$PKG
-  CONF_FILE=./etc/$PKG/barbican-api.conf
+  CONF_FILE=./etc/$PKG/barbican.conf
   PYTHONPATH=$VENV_PYTHON:$PYTHONPATH
   OPTS='-H '$VENV_HOME/$VENV' --stats :9314'
 
   # Copy conf file to home directory so oslo.config can find it
-  LOCAL_CONF_FILE=~/barbican-api.conf
+  LOCAL_CONF_FILE=~/barbican.conf
   if [ ! -f $LOCAL_CONF_FILE ];
   then
-    cp ./etc/$PKG/barbican-api.conf ~
+    cp ./etc/$PKG/barbican.conf ~
   fi
 fi
 
diff --git a/bin/barbican.sh b/bin/barbican.sh
index c661890ee..f92a002d4 100755
--- a/bin/barbican.sh
+++ b/bin/barbican.sh
@@ -12,7 +12,7 @@ if [ ! -d $LOCAL_CONFIG_DIR ];
 then
   LOCAL_CONFIG_DIR=../etc/barbican
 fi
-LOCAL_CONFIG=$LOCAL_CONFIG_DIR/barbican-api.conf
+LOCAL_CONFIG=$LOCAL_CONFIG_DIR/barbican.conf
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 echo 'DIR: '$DIR
diff --git a/contrib/devstack/lib/barbican b/contrib/devstack/lib/barbican
index 164033d70..b037ae56b 100755
--- a/contrib/devstack/lib/barbican
+++ b/contrib/devstack/lib/barbican
@@ -32,7 +32,7 @@ set +o xtrace
 BARBICAN_DIR=$DEST/barbican
 BARBICANCLIENT_DIR=$DEST/python-barbicanclient
 BARBICAN_CONF_DIR=${BARBICAN_CONF_DIR:-/etc/barbican}
-BARBICAN_CONF=$BARBICAN_CONF_DIR/barbican-api.conf
+BARBICAN_CONF=$BARBICAN_CONF_DIR/barbican.conf
 BARBICAN_PASTE_CONF=$BARBICAN_CONF_DIR/barbican-api-paste.ini
 BARBICAN_API_LOG_DIR=$DEST/logs
 BARBICAN_AUTH_CACHE_DIR=${BARBICAN_AUTH_CACHE_DIR:-/var/cache/barbican}
@@ -89,7 +89,7 @@ function configure_barbican {
     sudo chown $USER $BARBICAN_CONF_DIR
 
     # Copy the barbican config files to the config dir
-    cp $BARBICAN_DIR/etc/barbican/barbican-api.conf $BARBICAN_CONF_DIR
+    cp $BARBICAN_DIR/etc/barbican/barbican.conf $BARBICAN_CONF_DIR
     cp $BARBICAN_DIR/etc/barbican/barbican-api-paste.ini $BARBICAN_CONF_DIR
     cp -R $BARBICAN_DIR/etc/barbican/vassals $BARBICAN_CONF_DIR
 
diff --git a/doc/source/contribute/database_migrations.rst b/doc/source/contribute/database_migrations.rst
index 9fbcc5d2d..272f4e866 100644
--- a/doc/source/contribute/database_migrations.rst
+++ b/doc/source/contribute/database_migrations.rst
@@ -178,7 +178,7 @@ application per the 'Via Application' section.
 Thereafter, it is suggested that only the ``barbican-db-manage.py`` script
 above be used to update the database schema per the 'Manually' section. Also,
 automatic database updates from the Barbican application should be disabled by
-adding/updating ``db_auto_create = False`` in the ``barbican-api.conf``
+adding/updating ``db_auto_create = False`` in the ``barbican.conf``
 configuration file.
 
 Via Application
@@ -196,7 +196,7 @@ version, or else it can update an existing database table space to the latest
 schema revision (called ``head`` in the docs).
 
 *To bypass this automatic behavior, add* ``db_auto_create = False`` *to the*
-``barbican-api.conf`` *file*.
+``barbican.conf`` *file*.
 
 Manually
 '''''''''
diff --git a/doc/source/setup/certificate.rst b/doc/source/setup/certificate.rst
index bfdb2dd33..21240c4d0 100644
--- a/doc/source/setup/certificate.rst
+++ b/doc/source/setup/certificate.rst
@@ -9,7 +9,7 @@ certificate plugin. This is not suitable for production environment, but it can
 be useful as a development tool.
 
 To do so, you simply need to set ``enabled_certificate_plugins`` in
-``barbican-api.conf``.
+``barbican.conf``.
 
 .. code-block:: text
 
diff --git a/doc/source/setup/troubleshooting.rst b/doc/source/setup/troubleshooting.rst
index c0151388f..55b333829 100644
--- a/doc/source/setup/troubleshooting.rst
+++ b/doc/source/setup/troubleshooting.rst
@@ -79,7 +79,7 @@ endpoint's host name (typically the load balancer's DNS name and port).
 How to avoid
 ^^^^^^^^^^^^^
 
-Change your ``barbican-api.conf`` file's ``host_href`` setting from
+Change your ``barbican.conf`` file's ``host_href`` setting from
 ``localhost:9311`` to the correct host name (myhostname.com in the example
 above).
 
@@ -159,7 +159,7 @@ The vassal (worker) processes are not able to access the datastore.
 How to avoid
 ^^^^^^^^^^^^
 
-Check the ``sql_connection`` in your ``barbican-api.conf`` file, to make sure
+Check the ``sql_connection`` in your ``barbican.conf`` file, to make sure
 that it references a valid reachable database.
 
 
diff --git a/etc/barbican/barbican-api.conf b/etc/barbican/barbican.conf
similarity index 100%
rename from etc/barbican/barbican-api.conf
rename to etc/barbican/barbican.conf
diff --git a/etc/init/barbican-api.conf b/etc/init/barbican.conf
similarity index 100%
rename from etc/init/barbican-api.conf
rename to etc/init/barbican.conf
diff --git a/rpmbuild/SPECS/barbican.spec b/rpmbuild/SPECS/barbican.spec
index e9e07bef1..0b4dede1d 100644
--- a/rpmbuild/SPECS/barbican.spec
+++ b/rpmbuild/SPECS/barbican.spec
@@ -41,7 +41,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/init
 mkdir -p $RPM_BUILD_ROOT/etc/barbican/vassals
 mkdir -p $RPM_BUILD_ROOT/var/l{ib,og}/barbican
 install -m 644 etc/barbican/policy.json $RPM_BUILD_ROOT/etc/barbican
-install -m 644 etc/init/barbican-api.conf $RPM_BUILD_ROOT/etc/init
+install -m 644 etc/init/barbican.conf $RPM_BUILD_ROOT/etc/init
 install -m 644 etc/init/barbican-worker.conf $RPM_BUILD_ROOT/etc/init
 install -m 644 etc/init/barbican-keystone-listener.conf $RPM_BUILD_ROOT/etc/init
 install bin/barbican-worker.py $RPM_BUILD_ROOT/usr/bin
@@ -88,7 +88,7 @@ Barbican Key Manager API daemon
 /etc/logrotate.d/barbican-api
 %attr(0755,root,root) /usr/bin/barbican.sh
 %attr(0755,root,root) /usr/bin/barbican-db-manage.py
-%config(noreplace) /etc/init/barbican-api.conf
+%config(noreplace) /etc/init/barbican.conf
 %config(noreplace) /etc/barbican/*
 
 %preun -n barbican-api