diff --git a/lib/chef/knife/cluster_bootstrap.rb b/lib/chef/knife/cluster_bootstrap.rb
index 2347c46..6039555 100644
--- a/lib/chef/knife/cluster_bootstrap.rb
+++ b/lib/chef/knife/cluster_bootstrap.rb
@@ -23,7 +23,7 @@
 require 'json'
 require 'cluster_chef'
 
-module ClusterChef
+module Cluster
  
  class ClusterBootstrap < Chef::Knife
    banner "knife cluster bootstrap CLUSTER_NAME FACET_NAME SERVER_FQDN (options)"
diff --git a/lib/chef/knife/cluster_launch.rb b/lib/chef/knife/cluster_launch.rb
index 9daf852..bcf2ec9 100644
--- a/lib/chef/knife/cluster_launch.rb
+++ b/lib/chef/knife/cluster_launch.rb
@@ -21,7 +21,7 @@
 require 'json'
 require 'cluster_chef'
 
-module ClusterChef
+module Cluster
 
   class ClusterLaunch < Chef::Knife
 
diff --git a/lib/chef/knife/cluster_show.rb b/lib/chef/knife/cluster_show.rb
index 69a995b..957636b 100644
--- a/lib/chef/knife/cluster_show.rb
+++ b/lib/chef/knife/cluster_show.rb
@@ -20,7 +20,7 @@
 require 'json'
 require 'cluster_chef'
 
-module ClusterChef
+module Cluster
 
   class ClusterShow < Chef::Knife
 
@@ -63,7 +63,7 @@ def run
       # Launch server
       #
       servers = facet.list_servers.select{|s| s.state == "running" }
-      p Cluster.cluster_facets
+      p ClusterChef::Cluster.cluster_facets
       
     end
   end
diff --git a/lib/cluster.rb b/lib/cluster_chef.rb
similarity index 88%
rename from lib/cluster.rb
rename to lib/cluster_chef.rb
index 7fde27b..f4fd3c4 100644
--- a/lib/cluster.rb
+++ b/lib/cluster_chef.rb
@@ -1,7 +1,7 @@
-require 'cluster/dsl_object'
-require 'cluster/cloud'
-require 'cluster/security_group'
-require 'cluster/compute'
+require 'cluster_chef/dsl_object'
+require 'cluster_chef/cloud'
+require 'cluster_chef/security_group'
+require 'cluster_chef/compute'
 
 module Cluster
   Chef::Config[:clusters] ||= {}
diff --git a/lib/cluster/cloud.rb b/lib/cluster_chef/cloud.rb
similarity index 100%
rename from lib/cluster/cloud.rb
rename to lib/cluster_chef/cloud.rb
diff --git a/lib/cluster/compute.rb b/lib/cluster_chef/compute.rb
similarity index 100%
rename from lib/cluster/compute.rb
rename to lib/cluster_chef/compute.rb
diff --git a/lib/cluster/core_ext/class.rb b/lib/cluster_chef/core_ext/class.rb
similarity index 100%
rename from lib/cluster/core_ext/class.rb
rename to lib/cluster_chef/core_ext/class.rb
diff --git a/lib/cluster/dsl_object.rb b/lib/cluster_chef/dsl_object.rb
similarity index 100%
rename from lib/cluster/dsl_object.rb
rename to lib/cluster_chef/dsl_object.rb
diff --git a/lib/cluster/security_group.rb b/lib/cluster_chef/security_group.rb
similarity index 100%
rename from lib/cluster/security_group.rb
rename to lib/cluster_chef/security_group.rb