diff --git a/README.mediawiki b/README.mediawiki
index 9a6631f7..c07686f7 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -30,7 +30,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 |-
 | [[bip-0008.mediawiki|8]]
 |
-| Version bits extension with guaranteed lock-in
+| Version bits with optional guaranteed lock-in
 | Shaolin Fry
 | Informational
 | Draft
diff --git a/bip-0008.mediawiki b/bip-0008.mediawiki
index 68a83995..69731fe3 100644
--- a/bip-0008.mediawiki
+++ b/bip-0008.mediawiki
@@ -1,9 +1,9 @@
 <pre>
   BIP: 8
-  Title: Version bits extension with guaranteed lock-in
+  Title: Version bits with optional guaranteed lock-in
   Author: Shaolin Fry <shaolinfry@protonmail.ch>
   Comments-Summary: No comments yet.
-  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-????
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0008
   Status: Draft
   Type: Informational
   Created: 2017-02-01
diff --git a/bip-0008/states.png b/bip-0008/states.png
index 61207824..c671e048 100644
Binary files a/bip-0008/states.png and b/bip-0008/states.png differ