diff --git a/CHANGELOG.md b/CHANGELOG.md
index 102a8d0..694f576 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+openstack-ops-database Cookbook CHANGELG
+===================================
+This file is used to list changes made in each version of the openstack-ops-database cookbook.
+
+## 8.1.0
+* Rename openstack-metering to openstack-telemetry
+
 ## 8.0.0
 * Havana support
 
diff --git a/metadata.rb b/metadata.rb
index 1287038..eea30f3 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -3,7 +3,7 @@ maintainer        'Opscode, Inc.'
 maintainer_email  'matt@opscode.com'
 license           'Apache 2.0'
 description       'Provides the shared database configuration for Chef for OpenStack.'
-version           '8.0.0'
+version           '8.1.0'
 
 recipe 'client', 'Installs client packages for the database used by the deployment.'
 recipe 'server', 'Installs and configures server packages for the database used by the deployment.'
diff --git a/recipes/openstack-db.rb b/recipes/openstack-db.rb
index 94dfcf3..b8639c4 100644
--- a/recipes/openstack-db.rb
+++ b/recipes/openstack-db.rb
@@ -47,8 +47,8 @@ db_create_with_user(
 )
 
 db_create_with_user(
-  'metering',
-  node['openstack']['db']['metering']['username'],
+  'telemetry',
+  node['openstack']['db']['telemetry']['username'],
   get_password('db', 'ceilometer')
 )
 
diff --git a/spec/openstack-db_spec.rb b/spec/openstack-db_spec.rb
index 59bae5a..548ea99 100644
--- a/spec/openstack-db_spec.rb
+++ b/spec/openstack-db_spec.rb
@@ -39,9 +39,9 @@ describe 'openstack-ops-database::openstack-db' do
     @chef_run.converge 'openstack-ops-database::openstack-db'
   end
 
-  it 'creates metering database and user' do
+  it 'creates telemetry database and user' do
     ::Chef::Recipe.any_instance.should_receive(:db_create_with_user)
-      .with 'metering', 'ceilometer', 'test-pass'
+      .with 'telemetry', 'ceilometer', 'test-pass'
 
     @chef_run.converge 'openstack-ops-database::openstack-db'
   end