diff --git a/Modulefile b/Modulefile
index daa99294..77759cfb 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,11 +1,11 @@
-name    'enovance-cloud'
-version '0.1.0'
-source  'https://github.com/enovance/puppet-cloud'
+name    'enovance-openstack-cloud'
+version '1.0.0'
+source  'https://github.com/enovance/puppet-openstack-cloud'
 author  'eNovance'
 license 'Apache License 2.0'
 summary 'eNovance Openstack Module'
 description 'Puppet module that pulls together all the individual components of Openstack, resulting is a complete and functional stack.'
-project_page 'https://github.com/enovance/puppet-cloud'
+project_page 'https://github.com/enovance/puppet-openstack-cloud'
 
 dependency 'puppetlabs/glance', '>= 3.0.0'
 dependency 'puppetlabs/horizon', '>= 3.0.0'
diff --git a/Puppetfile b/Puppetfile
index 4695eb94..9ea2e3ca 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -61,7 +61,7 @@ mod 'ceph',
   :ref => 'cc63bacaef2b1d8949777f58e23698e6bbf87f43'
 #FIXME
 mod 'cloud',
-  :git => 'git@github.com:enovance/puppet-cloud.git',
+  :git => 'git@github.com:enovance/puppet-openstack-cloud.git',
   #:ref => 'stable/havana'
   :ref => 'master'
 mod 'concat',
diff --git a/README.md b/README.md
index 5e6fc43a..e2cb1742 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-puppet-cloud
-============
+puppet-openstack-cloud
+======================
 
 #### Table of Contents
 
 1. [Overview - What is the cloud module?](#overview)
 2. [Module Description - What does the module do?](#module-description)
-3. [Setup - The basics of getting started with puppet-cloud](#setup)
+3. [Setup - The basics of getting started with puppet-openstack-cloud](#setup)
 4. [Implementation - An under-the-hood peek at what the module is doing](#implementation)
 5. [Limitations - OS compatibility, etc.](#limitations)
 6. [Getting Involved - How to go deaper](#involved)
@@ -75,7 +75,7 @@ The swift portions of this module needs Puppet's [exported resources](http://doc
 ### Installing latest unstable cloud module from source
 
     cd /etc/puppet/modules
-    git clone git@github.com:enovance/puppet-cloud.git cloud
+    git clone git@github.com:enovance/puppet-openstack-cloud.git cloud
     cd cloud
     gem install --no-ri --no-rdoc r10k
     # a debian package is available in jessie
@@ -86,7 +86,7 @@ The swift portions of this module needs Puppet's [exported resources](http://doc
 The things that follow can be handled by Puppet but are out of scope of this document and are not included in the cloud module.
 
 
-### Beginning with puppet-cloud
+### Beginning with puppet-openstack-cloud
 
 Utlization of this module can come in many forms.  It was designed to be capable of deploying all services to a single node or distributed across several.  This is not an exhaustive list, we recommend you consult and understand all the manifests included in this module and the [core openstack](http://docs.openstack.org) documentation.
 
@@ -116,13 +116,13 @@ The best way to get help with this set of modules is to email the group associat
 
 Issues should be opened here:
 
-  https://github.com/enovance/puppet-cloud/issues
+  https://github.com/enovance/puppet-openstack-cloud/issues
 
 
 Contributors
 ------------
 
-* https://github.com/enovance/puppet-cloud/graphs/contributors
+* https://github.com/enovance/puppet-openstack-cloud/graphs/contributors
 
 Release Notes
 -------------
diff --git a/examples/params.pp b/examples/params.pp
index 93659787..28f3173e 100644
--- a/examples/params.pp
+++ b/examples/params.pp
@@ -398,7 +398,7 @@ class os_params {
   $secret_key = 'secrete'
 
   # RabbitMQ
-  #FIXME: https://github.com/enovance/puppet-cloud/issues/14
+  #FIXME: https://github.com/enovance/puppet-openstack-cloud/issues/14
   $rabbit_names = $mgmt_names
   $rabbit_host = $mgmt_internal_ips[0]
   $rabbit_hosts = suffix($mgmt_internal_ips,':5672')
diff --git a/examples/site.pp b/examples/site.pp
index 47bd9733..a07fc250 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# This is an example of site.pp to deploy OpenStack using puppet-cloud.
+# This is an example of site.pp to deploy OpenStack using puppet-openstack-cloud.
 #
 # It follow our reference archiecture where we have:
 #   - 2 load-balancers
@@ -79,7 +79,7 @@ node controller1, controller2, controller3 inherits common {
   class {'cloud::object::controller': }
 
   # Ring build must be activated only on one mgmt
-  # please see https://github.com/enovance/puppet-cloud/issues/29
+  # please see https://github.com/enovance/puppet-openstack-cloud/issues/29
   if $::hostname == $os_params::mgmt_names[0] {
     class {'cloud::object::ringbuilder':
       rsyncd_ipaddress => $internal_netif_ip,
diff --git a/manifests/compute.pp b/manifests/compute.pp
index b5cd399c..5d410d92 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -136,7 +136,7 @@ class cloud::compute(
   # It's a hack to fit with our setup where we run MySQL/Galera
   # TODO(Gonéri)
   # We have to do this only on the primary node of the galera cluster to avoid race condition
-  # https://github.com/enovance/puppet-cloud/issues/156
+  # https://github.com/enovance/puppet-openstack-cloud/issues/156
   exec {'nova_db_sync':
     command => '/usr/bin/nova-manage db sync',
     unless  => "/usr/bin/mysql nova -h ${nova_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | /bin/grep Tables"
diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp
index 7428e118..7530b133 100644
--- a/manifests/database/sql.pp
+++ b/manifests/database/sql.pp
@@ -227,7 +227,7 @@ class cloud::database::sql (
 
     # TODO(Gonéri):
     # Here we should do the db_sync.
-    # https://github.com/enovance/puppet-cloud/issues/156
+    # https://github.com/enovance/puppet-openstack-cloud/issues/156
 
     Database_user<<| |>>
   } # if $::hostname == $galera_master
diff --git a/manifests/identity.pp b/manifests/identity.pp
index 526dd308..efde1256 100644
--- a/manifests/identity.pp
+++ b/manifests/identity.pp
@@ -558,7 +558,7 @@ class cloud::identity (
   # It's a hack to fit with our setup where we run MySQL/Galera
   # TODO(Gonéri)
   # We have to do this only on the primary node of the galera cluster to avoid race condition
-  # https://github.com/enovance/puppet-cloud/issues/156
+  # https://github.com/enovance/puppet-openstack-cloud/issues/156
   exec {'keystone_db_sync':
     command => '/usr/bin/keystone-manage db_sync',
     unless  => "/usr/bin/mysql keystone -h ${keystone_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | /bin/grep Tables"
diff --git a/manifests/image.pp b/manifests/image.pp
index 666e9193..3c59ce4a 100644
--- a/manifests/image.pp
+++ b/manifests/image.pp
@@ -138,7 +138,7 @@ class cloud::image(
   }
 
   # TODO(EmilienM) Disabled for now
-  # Follow-up: https://github.com/enovance/puppet-cloud/issues/160
+  # Follow-up: https://github.com/enovance/puppet-openstack-cloud/issues/160
   #
   # class { 'glance::notify::rabbitmq':
   #   rabbit_password => $rabbit_password,
@@ -168,7 +168,7 @@ class cloud::image(
   # It's a hack to fit with our setup where we run MySQL/Galera
   # TODO(Gonéri)
   # We have to do this only on the primary node of the galera cluster to avoid race condition
-  # https://github.com/enovance/puppet-cloud/issues/156
+  # https://github.com/enovance/puppet-openstack-cloud/issues/156
   exec {'glance_db_sync':
     command => '/usr/bin/glance-manage db_sync',
     unless  => "/usr/bin/mysql glance -h ${glance_db_host} -u ${encoded_glance_user} -p${encoded_glance_password} -e \"show tables\" | /bin/grep Tables"
diff --git a/manifests/init.pp b/manifests/init.pp
index cfefed40..d5857b13 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -23,7 +23,7 @@ class cloud(
 ) {
 
   if ! ($::osfamily in [ 'RedHat', 'Debian' ]) {
-    fail("OS family unsuppored yet (${::osfamily}), module puppet-cloud only support RedHat or Debian")
+    fail("OS family unsuppored yet (${::osfamily}), module puppet-openstack-cloud only support RedHat or Debian")
   }
 
 # motd
diff --git a/manifests/network.pp b/manifests/network.pp
index 3dea9c18..264bf2ad 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -117,7 +117,7 @@ class cloud::network(
   # TODO(EmilienM) Temporary, need to be fixed upstream.
   # There is an issue when using ML2 + OVS: neutron services don't read OVS
   # config file, only ML2. I need to patch puppet-neutron.
-  # Follow-up: https://github.com/enovance/puppet-cloud/issues/199
+  # Follow-up: https://github.com/enovance/puppet-openstack-cloud/issues/199
   neutron_plugin_ml2 {
     'agent/tunnel_types':     value => ['gre'];
     'agent/l2_population':    value => true;
diff --git a/manifests/orchestration.pp b/manifests/orchestration.pp
index 4e30f75b..f5b78dec 100644
--- a/manifests/orchestration.pp
+++ b/manifests/orchestration.pp
@@ -144,7 +144,7 @@ class cloud::orchestration(
   # It's a hack to fit with our setup where we run MySQL/Galera
   # TODO(Gonéri)
   # We have to do this only on the primary node of the galera cluster to avoid race condition
-  # https://github.com/enovance/puppet-cloud/issues/156
+  # https://github.com/enovance/puppet-openstack-cloud/issues/156
   exec {'heat_db_sync':
     command => '/usr/bin/heat-manage --config-file /etc/heat/heat.conf db_sync',
     unless  => "/usr/bin/mysql heat -h ${heat_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | /bin/grep Tables"
diff --git a/manifests/volume.pp b/manifests/volume.pp
index c8b693dd..78fb8ba0 100644
--- a/manifests/volume.pp
+++ b/manifests/volume.pp
@@ -109,7 +109,7 @@ class cloud::volume(
   # It's a hack to fit with our setup where we run MySQL/Galera
   # TODO(Gonéri)
   # We have to do this only on the primary node of the galera cluster to avoid race condition
-  # https://github.com/enovance/puppet-cloud/issues/156
+  # https://github.com/enovance/puppet-openstack-cloud/issues/156
   exec {'cinder_db_sync':
     command => '/usr/bin/cinder-manage db sync',
     unless  => "/usr/bin/mysql cinder -h ${cinder_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | /bin/grep Tables"
diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb
index 4bd0fdb0..0ebffb3f 100644
--- a/spec/classes/cloud_image_spec.rb
+++ b/spec/classes/cloud_image_spec.rb
@@ -83,7 +83,7 @@ describe 'cloud::image' do
     end
 
     # TODO(EmilienM) Disabled for now
-    # Follow-up https://github.com/enovance/puppet-cloud/issues/160
+    # Follow-up https://github.com/enovance/puppet-openstack-cloud/issues/160
     #
     # it 'configure glance notifications with rabbitmq backend' do
     #   should contain_class('glance::notify::rabbitmq').with(
diff --git a/spec/classes/cloud_init_spec.rb b/spec/classes/cloud_init_spec.rb
index cc2d9924..d8ee4dbd 100644
--- a/spec/classes/cloud_init_spec.rb
+++ b/spec/classes/cloud_init_spec.rb
@@ -95,7 +95,7 @@ describe 'cloud' do
       { :osfamily => 'Solaris' }
     end
 
-    it { should compile.and_raise_error(/module puppet-cloud only support/) }
+    it { should compile.and_raise_error(/module puppet-openstack-cloud only support/) }
 
   end
 end