diff --git a/Modulefile b/Modulefile
index e6dd1b9d..3facd302 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,9 +1,9 @@
-name    'puppetlabs-manila'
+name    'netapp-puppet-manila'  #NTAP: right name?
 version '4.0.0'
 source  'https://github.com/stackforge/puppet-manila'
-author  'Puppet Labs'
+author  'NetApp'
 license 'Apache License 2.0'
-summary 'Puppet Labs Manila Module'
+summary 'NetApp Manila Module'
 description  'Puppet module to install and configure the Openstack Manila block storage service'
 project_page 'https://launchpad.net/puppet-manila'
 
diff --git a/README.md b/README.md
index 3bbce5f6..f1317506 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-manila
+manila  #NTAP: this needs to be completely replaced
 =======
 
 4.0.0 - 2014.1.0 - Icehouse
diff --git a/examples/manila_volume_with_pacemaker.pp b/examples/manila_volume_with_pacemaker.pp
deleted file mode 100644
index 197473ba..00000000
--- a/examples/manila_volume_with_pacemaker.pp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Example: managing manila controller services with pacemaker
-#
-# By setting enabled to false, these services will not be started at boot.  By setting
-# manage_service to false, puppet will not kill these services on every run.  This
-# allows the Pacemaker resource manager to dynamically determine on which node each
-# service should run.
-#
-# The puppet commands below would ideally be applied to at least three nodes.
-#
-# Note that manila-api is associated with the virtual IP address as
-# it is called from external services.  The remaining services connect to the
-# database and/or message broker independently.
-#
-# Example pacemaker resource configuration commands (configured once per cluster):
-#
-# sudo pcs resource create manila_vip ocf:heartbeat:IPaddr2 params ip=192.0.2.3 \
-#   cidr_netmask=24 op monitor interval=10s
-#
-# sudo pcs resource create manila_api_service lsb:openstack-manila-api
-# sudo pcs resource create manila_scheduler_service lsb:openstack-manila-scheduler
-#
-# sudo pcs constraint colocation add manila_api_service with manila_vip
-
-class { 'manila':
-  database_connection  => 'mysql://manila:secret_block_password@openstack-controller.example.com/manila',
-}
-
-class { 'manila::api':
-  keystone_password => 'CINDER_PW',
-  keystone_user     => 'manila',
-  enabled           => false,
-  manage_service    => false,
-}
-
-class { 'manila::scheduler':
-  scheduler_driver => 'manila.scheduler.simple.SimpleScheduler',
-  enabled          => false,
-  manage_service   => false,
-}
-
diff --git a/lib/puppet/provider/cinder_api_paste_ini/ini_setting.rb b/lib/puppet/provider/manila_api_paste_ini/ini_setting.rb
similarity index 100%
rename from lib/puppet/provider/cinder_api_paste_ini/ini_setting.rb
rename to lib/puppet/provider/manila_api_paste_ini/ini_setting.rb
diff --git a/lib/puppet/provider/cinder_config/ini_setting.rb b/lib/puppet/provider/manila_config/ini_setting.rb
similarity index 100%
rename from lib/puppet/provider/cinder_config/ini_setting.rb
rename to lib/puppet/provider/manila_config/ini_setting.rb
diff --git a/manifests/backends.pp b/manifests/backends.pp
index 0114d26a..ac51f75b 100644
--- a/manifests/backends.pp
+++ b/manifests/backends.pp
@@ -9,7 +9,7 @@
 #     This should contain names used in ceph::backend::* resources.
 #     Example: ['volume1', 'volume2', 'sata3']
 #
-# Author: Andrew Woodward <awoodward@mirantis.com>
+# Author: Andrew Woodward <awoodward@mirantis.com> #NTAP: leaving author intact?
 class manila::backends (
   $enabled_backends    = undef,
   # DEPRECATED