diff --git a/locale/en-US/tutorial.txt b/locale/en-US/tutorial.txt
index 302047e8..7f8edb3b 100644
--- a/locale/en-US/tutorial.txt
+++ b/locale/en-US/tutorial.txt
@@ -43,7 +43,7 @@ To return to normal mode command-line mode, type [m]<Esc>[m].  Pressing
 [m]<Esc>[m] will also return you to normal mode from most other modes in
 Vimperator.
 
-section:Getting{nbsp}help[getting_help]
+section:Getting{nbsp}help[getting-help]
 
 Vim is a great editor but it's not much of a web browser.  So even seasoned
 Vim users will probably have to look at Vimperator documentation sooner or
@@ -65,7 +65,7 @@ and you can find out about the [m]gt[m] and [m]gT[m] mapping with
 Finally, in addition to the help system itself, [c]:exusage[c] and
 [c]:viusage[c] are useful quick-reference commands.
 
-section:Mouseless[living_mouseless]
+section:Mouseless[living-mouseless]
 
 *-- or how I learned to stop worrying and love the 80+ buttons I already have.*
 
@@ -78,7 +78,7 @@ assumption that the web browser doesn't have to be one of those.
 Here are some areas where the mouse is typically considered indisposable, and
 how Vimperator challenges this preconception.
 
-section:Scrolling[keyboard_scrolling]
+section:Scrolling[keyboard-scrolling]
 
 Scrolling the browser window is done with simple keystrokes:
 
@@ -94,7 +94,7 @@ Scrolling the browser window is done with simple keystrokes:
 Your standard buttons ([m]<Up>[m]/[m]<Down>[m]/[m]<PgUp>[m]/[m]<PgDn>[m]) will
 also work as expected.
 
-section:History{nbsp}and{nbsp}tabs[history_navigation,tab_navigation]
+section:History{nbsp}and{nbsp}tabs[history-navigation,tab-navigation]
 
 History navigation (e.g., ``Back'', ``Forward'') are done similarly to
 scrolling.
@@ -156,7 +156,7 @@ uniquely identified soon, and Vimperator will open it.  Once you're done,
 remember to use [m]<C-o>[m] (``History Back'') or [m]d[m] (``Delete Buffer'')
 to return here, depending on which key you used to activate QuickHint mode.
 
-section:Common{nbsp}issues[common_issues]
+section:Common{nbsp}issues[common-issues]
 
 Say you get half-way done typing in a new URL, only to remember that you've
 already got that page open in the previous tab.  Your command-line might look
@@ -183,7 +183,7 @@ This will create the file *$HOME/.vimperatorrc* containing your settings.
 It is a simple text file, just like a vimrc file and can be easily
 edited to suit your preferences.
 
-section:Find{nbsp}the{nbsp}exit{nbsp}nearest{nbsp}you[quitting_without_menus]
+section:Find{nbsp}the{nbsp}exit{nbsp}nearest{nbsp}you[quitting-without-menus]
 
 Vimperator supports all of Vim's classic methods of exiting.
 
@@ -193,7 +193,7 @@ Vimperator supports all of Vim's classic methods of exiting.
   * [m]ZZ[m] -- normal mode mapping equivalent to [c]:xall[c]
   * [m]ZQ[m] -- normal mode mapping equivalent to [c]:qall[c]
 
-section:Where{nbsp}did{nbsp}Firefox{nbsp}go?[whither_firefox]
+section:Where{nbsp}did{nbsp}Firefox{nbsp}go?[whither-firefox]
 
 You might feel pretty disoriented now. Don't worry.  This is still Firefox
 underneath.  Here are some ways Vimperator allows Firefox to shine through.