diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py
index da7db332c13..77ccc51b9a4 100644
--- a/neutron/db/l3_db.py
+++ b/neutron/db/l3_db.py
@@ -1884,7 +1884,7 @@ def _notify_subnetpool_address_scope_update(resource, event,
 
 
 @removals.remove(
-    message="This will be removed in the P cycle. "
+    message="This will be removed in the Pike release. "
             "Subscriptions are now registered during object creation."
 )
 def subscribe():
diff --git a/releasenotes/notes/deprecate-router_id-34aca9ea5ee9e789.yaml b/releasenotes/notes/deprecate-router_id-34aca9ea5ee9e789.yaml
index fb83376b6f8..cf75c9608a0 100644
--- a/releasenotes/notes/deprecate-router_id-34aca9ea5ee9e789.yaml
+++ b/releasenotes/notes/deprecate-router_id-34aca9ea5ee9e789.yaml
@@ -1,3 +1,3 @@
 ---
 upgrade:
-  - The router_id option is deprecated and will be removed in the 'N' cycle.
+  - The router_id option is deprecated and will be removed in the Newton release.
diff --git a/releasenotes/notes/hyperv-neutron-agent-decomposition-ae6a052aeb48c6ac.yaml b/releasenotes/notes/hyperv-neutron-agent-decomposition-ae6a052aeb48c6ac.yaml
index af9884cf531..01682ef622b 100644
--- a/releasenotes/notes/hyperv-neutron-agent-decomposition-ae6a052aeb48c6ac.yaml
+++ b/releasenotes/notes/hyperv-neutron-agent-decomposition-ae6a052aeb48c6ac.yaml
@@ -2,7 +2,7 @@
 upgrade:
   - The Hyper-V Neutron Agent has been fully decomposed from Neutron.
     The `neutron.plugins.hyperv.agent.security_groups_driver.HyperVSecurityGroupsDriver`
-    firewall driver has been deprecated and will be removed in the 'O' cycle.
+    firewall driver has been deprecated and will be removed in the Ocata release.
     Update the `neutron_hyperv_agent.conf` files on the Hyper-V nodes to
     use `hyperv.neutron.security_groups_driver.HyperVSecurityGroupsDriver`,
     which is the networking_hyperv security groups driver.