diff --git a/lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb b/lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb
index 5ff506b3..2a08cb4f 100644
--- a/lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb
+++ b/lib/puppet/provider/ceilometer_api_paste_ini/ini_setting.rb
@@ -16,7 +16,7 @@ Puppet::Type.type(:ceilometer_api_paste_ini).provide(
   end
 
   def self.file_path
-    '/etc/ceilometer/api-paste.ini'
+    '/etc/ceilometer/api_paste.ini'
   end
 
   # added for backwards compatibility with older versions of inifile
diff --git a/lib/puppet/type/ceilometer_api_paste_ini.rb b/lib/puppet/type/ceilometer_api_paste_ini.rb
index ad0ebf2e..3428b95c 100644
--- a/lib/puppet/type/ceilometer_api_paste_ini.rb
+++ b/lib/puppet/type/ceilometer_api_paste_ini.rb
@@ -3,7 +3,7 @@ Puppet::Type.newtype(:ceilometer_api_paste_ini) do
   ensurable
 
   newparam(:name, :namevar => true) do
-    desc 'Section/setting name to manage from /etc/ceilometer/api-paste.ini'
+    desc 'Section/setting name to manage from /etc/ceilometer/api_paste.ini'
     newvalues(/\S+\/\S+/)
   end
 
diff --git a/manifests/config.pp b/manifests/config.pp
index 6635d95f..2c0e9757 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -20,7 +20,7 @@
 #       value: barValue
 #
 # [*ceilometer_api_paste_ini*]
-#   (optional) Allow configuration of /etc/ceilometer/api-paste.ini options.
+#   (optional) Allow configuration of /etc/ceilometer/api_paste.ini options.
 #
 #   NOTE: The configuration MUST NOT be already handled by this module
 #   or Puppet catalog compilation will fail with duplicate resources.