diff --git a/index.html.md.erb b/index.html.md.erb
index 71fd562..8791c46 100644
--- a/index.html.md.erb
+++ b/index.html.md.erb
@@ -28,9 +28,9 @@ The following topics discuss different usage scenarios for buildpacks in Cloud F
 
 * [Production server configuration](prod-server.html)
 
-## <a id='system-buildpacks'></a> Buildpacks (v2)
+## <a id='system-buildpacks'></a> Cloud Foundry Buildpacks
 
-For information about the existing buildpacks that Cloud Foundry supports, see [v2 Buildpack Languages and Sources](system-buildpacks.html).
+For information about the existing buildpacks that Cloud Foundry supports, see [CF Buildpack Languages and Sources](system-buildpacks.html).
 
 ## <a id='sidecar-buildpacks'></a> Sidecar buildpacks
 
diff --git a/system-buildpacks.html.md.erb b/system-buildpacks.html.md.erb
index f988bb8..3b701d7 100644
--- a/system-buildpacks.html.md.erb
+++ b/system-buildpacks.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title: v2 Buildpack Languages and Sources
+title: CF Buildpack Languages and Sources
 owner: Buildpacks
 ---