diff --git a/Vagrantfile b/Vagrantfile
index 39f72de..b56f5ea 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure('2') do |config|
-  config.vm.hostname = 'openstack-client'
+  config.vm.hostname = 'openstack_client'
   config.vm.box = 'ubuntu-12.04'
   config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_#{config.vm.box}_chef-provisionerless.box"
   config.omnibus.chef_version = 'latest'
@@ -13,7 +13,7 @@ Vagrant.configure('2') do |config|
     }
 
     chef.run_list = [
-      'recipe[openstack-client::default]'
+      'recipe[openstack_client::default]'
     ]
   end
 end
diff --git a/attributes/default.rb b/attributes/default.rb
index c53be4f..4db22e9 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1,6 +1,6 @@
 # Encoding: utf-8
 #
-# Cookbook Name:: openstack-client
+# Cookbook Name:: openstack_client
 # Attributes:: default
 #
 # Copyright 2014, Paul Czarkowski
@@ -8,5 +8,5 @@
 
 # Dependencies and versions
 
-default['openstack-client']['fog_version']      = '~> 1.23.0'
-default['openstack-client']['nokogiri_version'] = '~> 1.6.2.1'
+default['openstack_client']['fog_version']      = '~> 1.23.0'
+default['openstack_client']['nokogiri_version'] = '~> 1.6.2.1'
diff --git a/libraries/client.rb b/libraries/client.rb
index 0898a51..0912194 100644
--- a/libraries/client.rb
+++ b/libraries/client.rb
@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: openstack-client
+# Cookbook Name:: openstack_client
 # Library:: openstack
 # Author:: Paul Czarkowski
 #
@@ -24,7 +24,7 @@ module Openstack
       begin
         require 'fog'
       rescue LoadError
-        Chef::Log.error("Missing gem 'fog'. Use the default openstack-client recipe to install it first.")
+        Chef::Log.error("Missing gem 'fog'. Use the default openstack_client recipe to install it first.")
       end
     end
   end
diff --git a/libraries/nova.rb b/libraries/nova.rb
index c30b952..3323668 100644
--- a/libraries/nova.rb
+++ b/libraries/nova.rb
@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: openstack-client
+# Cookbook Name:: openstack_client
 # Library:: nova
 # Author:: JJ Asghar
 #
diff --git a/libraries/swift.rb b/libraries/swift.rb
index 8f21cd8..6d4a408 100644
--- a/libraries/swift.rb
+++ b/libraries/swift.rb
@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: openstack-client
+# Cookbook Name:: openstack_client
 # Library:: storage
 # Author:: Paul Czarkowski
 #
diff --git a/providers/nova_server.rb b/providers/nova_server.rb
index e337cef..ccefef9 100644
--- a/providers/nova_server.rb
+++ b/providers/nova_server.rb
@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: openstack-client
+# Cookbook Name:: openstack_client
 # Provider:: nova_server
 # Author:: JJ Asghar
 #
diff --git a/providers/swift_object.rb b/providers/swift_object.rb
index bfed9b5..718beb9 100644
--- a/providers/swift_object.rb
+++ b/providers/swift_object.rb
@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: openstack-client
+# Cookbook Name:: openstack_client
 # Provider:: swift
 # Author:: Paul Czarkowski
 #
diff --git a/recipes/_example_nova.rb b/recipes/_example_nova.rb
index cbf8969..adb81db 100644
--- a/recipes/_example_nova.rb
+++ b/recipes/_example_nova.rb
@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: openstack-client
+# Cookbook Name:: openstack_client
 # Provider:: _example_nova
 # Author:: JJ Asghar
 #
diff --git a/recipes/_example_swift.rb b/recipes/_example_swift.rb
index f523625..db2916b 100644
--- a/recipes/_example_swift.rb
+++ b/recipes/_example_swift.rb
@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: openstack-client
+# Cookbook Name:: openstack_client
 # Provider:: _example_swift
 # Author:: Paul Czarkowski
 #
diff --git a/recipes/default.rb b/recipes/default.rb
index db67ab4..72f935f 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -1,6 +1,6 @@
 # Encoding: utf-8
 #
-# Cookbook Name:: openstack-client
+# Cookbook Name:: openstack_client
 # Recipe:: default
 #
 # Copyright 2014, Paul Czarkowski
@@ -22,11 +22,11 @@ end
 include_recipe 'xml::ruby'
 
 chef_gem 'nokogiri' do
-  version node['openstack-client']['nokogiri_version']
+  version node['openstack_client']['nokogiri_version']
   action :upgrade
 end
 
 chef_gem 'fog' do
-  version node['openstack-client']['fog_version']
+  version node['openstack_client']['fog_version']
   action :upgrade
 end
diff --git a/resources/nova_server.rb b/resources/nova_server.rb
index dae908c..934c8b9 100644
--- a/resources/nova_server.rb
+++ b/resources/nova_server.rb
@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: openstack-client
+# Cookbook Name:: openstack_client
 # Resource:: nova_server
 # Author:: JJ Asghar
 #
diff --git a/resources/swift_object.rb b/resources/swift_object.rb
index 99cb463..c268ea1 100644
--- a/resources/swift_object.rb
+++ b/resources/swift_object.rb
@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: openstack-client
+# Cookbook Name:: openstack_client
 # Resource:: swift
 # Author:: Paul Czarkowski
 #
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index 6636cdc..5dc914a 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -2,7 +2,7 @@
 
 require_relative 'spec_helper'
 
-describe 'openstack-client::default' do
+describe 'openstack_client::default' do
   describe 'ubuntu' do
     let(:chef_run) { ChefSpec::Runner.new.converge(described_recipe) }