diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index ef996af0c..73104f568 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -40,11 +40,11 @@ metering_topic                   metering                              the topic
 counter_source                   openstack                             The source name of emited counters
 control_exchange                 ceilometer                            AMQP exchange to connect to if using RabbitMQ or Qpid
 periodic_interval                600                                   seconds between running periodic tasks
-os-username                      ceilometer                            Username to use for openstack service access
-os-password                      admin                                 Password to use for openstack service access
-os-tenant-id                                                           Tenant ID to use for openstack service access
-os-tenant-name                   admin                                 Tenant name to use for openstack service access
-os-auth-url                      http://localhost:5000/v2.0            Auth URL to use for openstack service access
+os_username                      ceilometer                            Username to use for openstack service access
+os_password                      admin                                 Password to use for openstack service access
+os_tenant_id                                                           Tenant ID to use for openstack service access
+os_tenant_name                   admin                                 Tenant name to use for openstack service access
+os_auth_url                      http://localhost:5000/v2.0            Auth URL to use for openstack service access
 database_connection              mongodb://localhost:27017/ceilometer  Database connection string
 metering_api_port                8777                                  The port for the ceilometer API server
 disabled_central_pollsters                                             List of central pollsters to skip loading