diff --git a/manifests/api.pp b/manifests/api.pp
index cc67d6f9..b188db77 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -70,7 +70,7 @@
 #   If the value is 'httpd', this means ceilometer-api will be a web
 #   service, and you must use another class to configure that
 #   web service. For example, use class { 'ceilometer::wsgi::apache'...}
-#   to make keystone be a web app using apache mod_wsgi.
+#   to make ceilometer-api be a web app using apache mod_wsgi.
 #   Defaults to '$::ceilometer::params::api_service_name'
 #
 class ceilometer::api (
@@ -138,7 +138,7 @@ class ceilometer::api (
     }
     Class['ceilometer::db'] -> Service[$service_name]
   } else {
-    fail('Invalid service_name. Either keystone/openstack-ceilometer-api for running as a standalone service, or httpd for being run by a httpd server')
+    fail('Invalid service_name. Either ceilometer/openstack-ceilometer-api for running as a standalone service, or httpd for being run by a httpd server')
   }
 
   ceilometer_config {
diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 8ddba112..ad0a3a5b 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -18,8 +18,7 @@
 # Class to serve Ceilometer API with apache mod_wsgi in place of ceilometer-api service.
 #
 # Serving Ceilometer API from apache is the recommended way to go for production
-# systems as the current keystone implementation is not multi-processor aware,
-# thus limiting the performance for concurrent accesses.
+# because of limited performance for concurrent accesses when running eventlet.
 #
 # When using this class you should disable your ceilometer-api service.
 #