diff --git a/CHANGELOG.md b/CHANGELOG.md
index c59579fc..6d0c70c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,29 +7,30 @@ DEPRECATIONS:
 * container: `google_container_engine_versions` `zone` and `region` fields are deprecated in favour of `location`. [GH-3114]
 
 FEATURES:
-* **New Datasource**: `*_organization_policy` Adding datasources for folder and project org policy [GH-3137]
+* **New Datasource**: `google_*_organization_policy` Adding datasources for folder and project org policy [GH-3137]
 
 ENHANCEMENTS:
 * compute: `google_compute_disk`, `google_compute_region_disk` now support `physical_block_size_bytes` [GH-526]
+* compute: `google_compute_forwarding_rule` supports specifying `all_ports` for internal load balancing. [GH-3309]
+* compute: `google_compute_vpn_tunnel will properly apply labels. [GH-3277]
 * container: `google_container_cluster` adds a unified `location` field for regions and zones, `node_locations` to manage extra zones for multi-zonal clusters and specific zones for regional clusters. [GH-3114]
 * container: `google_container_node_pool` adds a unified `location` field for regions and zones. [GH-3114]
 * container: `data.google_container_cluster` adds a unified `location` field for regions and zones. [GH-3114]
 * container: `google_container_engine_versions` adds a unified `location` field for regions and zones. [GH-3114]
-* compute: `google_compute_forwarding_rule` supports specifying `all_ports` for internal load balancing. [GH-3309]
 * dataflow: `google_dataflow_job` has support for custom service accounts with `service_account_email`. [GH-3238]
-* compute: `storage_bucket` Change storage bucket import logic to avoid calls to compute api [GH-3244]
-* compute: `sql_ssl_cert` Allow project to be specified at resource level [GH-3235]
-* compute: `*_organization_policy` Add import support for folder and project organization_policies [GH-3218]
-* monitoring: `uptime_check_config` Add a computed field for uptime check id [GH-3138]
-
+* monitoring: `google_monitoring_uptime_check_config` Add a computed field for uptime check id [GH-3138]
+* resourcemanager: `google_*_organization_policy` Add import support for folder and project organization_policies [GH-3218]
+* sql: `google_sql_ssl_cert` Allow project to be specified at resource level [GH-3235]
+* storage: `google_storage_bucket` Change storage bucket import logic to avoid calls to compute api [GH-3244]
+* storage: `google_storage_bucket.storage_class` supports updating. [GH-3297]
+* various: Some import formats that previously failed will now work as documented. [GH-3283]
 
 BUG FIXES:
 * compute: `google_compute_disk` will properly detach instances again. [GH-3269]
 * container: `google_container_cluster`, `google_container_node_pool` properly suppress new GKE `1.12` `metadata` values. [GH-3233]
-* Retry only 409 concurrent operation errors and not naming conflicts [GH-3285]
-* All: Fix ordering of imports to be in terms of precision [GH-3283]
-* Monitoring: `uptime_check_config` Change all fields for monitored resource to force recreation [GH-3132]
-* compute: `containter_cluster` Wait for operations to finish [GH-2941]
+* container: `google_container_cluster` properly collects service-level errors from the API [GH-2941]
+* monitoring: `google_monitoring_uptime_check_config` Change all fields for monitored resource to force recreation [GH-3132]
+* various: Retry only 409 concurrent operation errors and not naming conflicts [GH-3285]
 
 ## 2.2.0 (March 12, 2019)