diff --git a/doc/source/contributing/resources.rst b/doc/source/contributing/resources.rst
index 35670970f..022eacd93 100644
--- a/doc/source/contributing/resources.rst
+++ b/doc/source/contributing/resources.rst
@@ -20,8 +20,8 @@
 =========================
 
 :Bug tracker: http://launchpad.net/ceilometer
-:Mailing list: http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev (prefix subjects with ``[metering]`` for faster responses)
-:Wiki: http://wiki.openstack.org/EfficientMetering
+:Mailing list: http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev (prefix subjects with ``[Ceilometer]`` for faster responses)
+:Wiki: http://wiki.openstack.org/wiki/Ceilometer
 :Code Hosting: https://git.openstack.org/cgit/openstack/ceilometer/
 :Code Review: https://review.openstack.org/#/q/status:open+project:openstack/ceilometer,n,z
 
diff --git a/doc/source/measurements.rst b/doc/source/measurements.rst
index a89afa12f..df34d3cd2 100644
--- a/doc/source/measurements.rst
+++ b/doc/source/measurements.rst
@@ -189,13 +189,13 @@ Naming convention
 =================
 If you plan on adding meters, please follow the convention bellow:
 
-1. Always use '.' as separator and go from least to most discriminent word.
+1. Always use '.' as separator and go from least to most discriminant word.
    For example, do not use ephemeral_disk_size but disk.ephemeral.size
 
 2. When a part of the name is a variable, it should always be at the end and start with a ':'.
    For example do not use <type>.image but image:<type>, where type is your variable name.
 
-3. If you have any hesitation, come and ask in #openstack-metering
+3. If you have any hesitation, come and ask in #openstack-ceilometer
 
 
 User-defined sample metadata for Nova