diff --git a/i2p2www/legacy.py b/i2p2www/legacy.py
index d0dfdc0a..2888ab67 100644
--- a/i2p2www/legacy.py
+++ b/i2p2www/legacy.py
@@ -17,49 +17,49 @@ LEGACY_PAGES_MAP={
     'blockfile':              'docs/spec/blockfile',
     'bob':                    'docs/api/bob',
     'bounties':               'volunteer/bounties',
-    'bounty_arabic':          'volunteer/bounties/arabic',
-    'bounty_btcclient':       'volunteer/bounties/btcclient',
+    'bounty_arabic':          'volunteer/bounties/arabic-trans',
+    'bounty_btcclient':       'volunteer/bounties/btc-client',
     'bounty_datastore':       'volunteer/bounties/datastore',
-    'bounty_debpack':         'volunteer/bounties/debpack',
+    'bounty_debpack':         'volunteer/bounties/deb-pack',
     'bounty_i2phex':          'volunteer/bounties/i2phex',
     'bounty_ipv6':            'volunteer/bounties/ipv6',
-    'bounty_rutrans':         'volunteer/bounties/rutrans',
+    'bounty_rutrans':         'volunteer/bounties/russian-trans',
     'bounty_silc':            'volunteer/bounties/silc',
-    'bounty_syndie2012':      'volunteer/bounties/syndie2012',
-    'bounty_unittests':       'volunteer/bounties/unittests',
-    'bounty_vuzeplugin':      'volunteer/bounties/vuzeplugin',
+    'bounty_syndie2012':      'volunteer/bounties/syndie-2012',
+    'bounty_unittests':       'volunteer/bounties/unit-tests',
+    'bounty_vuzeplugin':      'volunteer/bounties/vuze-plugin',
     'clt':                    'misc/clt',
-    'common_structures_spec': 'docs/spec/common_structures',
+    'common_structures_spec': 'docs/spec/common-structures',
     'configuration':          'docs/spec/configuration',
     'contact':                'about/contact',
     'cvs':                    'misc/cvs',
     'datagrams':              'docs/spec/datagrams',
-    'dev-guidelines':         'volunteer/guides/devguidelines',
-    'developerskeys':         'volunteer/develop/developerskeys',
+    'dev-guidelines':         'volunteer/guides/dev-guidelines',
+    'developerskeys':         'volunteer/develop/developers-keys',
     'donate':                 'volunteer/donate',
     'faq':                    'support/faq',
     'getinvolved':            'volunteer',
     'glossary':               'support/glossary',
-    'halloffame':             'about/halloffame',
+    'halloffame':             'about/hall-of-fame',
     'how':                    'docs',
     'how_cryptography':       'docs/how/cryptography',
-    'how_elgamalaes':         'docs/how/elgamalaes',
-    'how_garlicrouting':      'docs/how/garlicrouting',
+    'how_elgamalaes':         'docs/how/elgamal-aes',
+    'how_garlicrouting':      'docs/how/garlic-routing',
     'how_intro':              'docs/how/intro',
     'how_networkcomparisons': 'about/comparison',
-    'how_networkdatabase':    'docs/how/networkdatabase',
-    'how_peerselection':      'docs/how/peerselection',
-    'how_threatmodel':        'docs/how/threatmodel',
-    'how_tunnelrouting':      'docs/how/tunnelrouting',
-    'htproxyports':           'support/htproxyports',
+    'how_networkdatabase':    'docs/how/network-database',
+    'how_peerselection':      'docs/how/peer-selection',
+    'how_threatmodel':        'docs/how/threat-model',
+    'how_tunnelrouting':      'docs/how/tunnel-routing',
+    'htproxyports':           'support/browser-config',
     'i2cp':                   'docs/protocol/i2cp',
     'i2cp_spec':              'docs/spec/i2cp',
     'i2np':                   'docs/protocol/i2np',
     'i2np_spec':              'docs/spec/i2np',
     'i2pcontrol':             'docs/api/i2pcontrol',
     'i2ptunnel':              'docs/api/i2ptunnel',
-    'i2ptunnel_migration':    'misc/i2ptunnel_migration',
-    'i2ptunnel_services':     'misc/i2ptunnel_services',
+    'i2ptunnel_migration':    'misc/i2ptunnel-migration',
+    'i2ptunnel_services':     'misc/i2ptunnel-services',
     'impressum':              'impressum',
     'intro':                  'about/intro',
     'invisiblenet':           'misc/invisiblenet',
@@ -68,7 +68,7 @@ LEGACY_PAGES_MAP={
     'license-agreements':     'volunteer/develop/license-agreements',
     'licenses':               'volunteer/develop/licenses',
     'links':                  'links',
-    'manualwrapper':          'misc/manualwrapper',
+    'manualwrapper':          'misc/manual-wrapper',
     'ministreaming':          'docs/api/ministreaming',
     'minwww':                 'misc/minwww',
     'monotone':               'volunteer/develop/monotone',
@@ -76,11 +76,11 @@ LEGACY_PAGES_MAP={
     'naming':                 'docs/naming',
     'naming_discussion':      'docs/discussions/naming',
     'netdb_discussion':       'docs/discussions/netdb',
-    'newdevelopers':          'volunteer/guides/newdevelopers',
-    'newtranslators':         'volunteer/guides/newtranslators',
+    'newdevelopers':          'volunteer/guides/new-developers',
+    'newtranslators':         'volunteer/guides/new-translators',
     'ntcp':                   'docs/transport/ntcp',
     'ntcp_discussion':        'docs/discussions/ntcp',
-    'othernetworks':          'about/comparison/othernetworks',
+    'othernetworks':          'about/comparison/other-networks',
     'papers':                 'research/papers',
     'performance-history':    'support/performance/history',
     'performance':            'support/performance/future',
@@ -94,21 +94,21 @@ LEGACY_PAGES_MAP={
     'sam':                    'docs/api/sam',
     'samv2':                  'docs/api/samv2',
     'samv3':                  'docs/api/samv3',
-    'signedkeys':             'volunteer/develop/signedkeys',
+    'signedkeys':             'volunteer/develop/signed-keys',
     'socks':                  'docs/api/socks',
     'streaming':              'docs/api/streaming',
     'supported_applications': 'docs/applications/supported',
     'team':                   'about/team',
-    'techintro':              'docs/how/techintro',
+    'techintro':              'docs/how/tech-intro',
     'todo':                   'volunteer/todo',
     'transition-guide':       'misc/transition-guide',
     'transition-guide.txt':   'misc/transition-guide.txt',
     'transport':              'docs/transport',
-    'tunnel-alt-creation':    'docs/spec/tunnel_creation',
+    'tunnel-alt-creation':    'docs/spec/tunnel-creation',
     'tunnel-alt':             'docs/tunnels/implementation',
-    'tunnel':                 'docs/tunnels/old',
+    'tunnel':                 'docs/tunnels/old-implementation',
     'tunnel_discussion':      'docs/discussions/tunnel',
-    'tunnel_message_spec':    'docs/spec/tunnel_message',
+    'tunnel_message_spec':    'docs/spec/tunnel-message',
     'udp':                    'docs/transport/ssu',
     'udp_spec':               'docs/spec/ssu',
     'unidirectional-tunnels': 'docs/tunnels/unidirectional',
diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 084e7529..bb525554 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -21,7 +21,7 @@
           <li><a href="{{ site_url('about/comparison/tor') }}"><div class="menuitem"><span>{{ _('Tor') }}</span></div></a></li>
           <li><a href="{{ site_url('about/comparison/freenet') }}"><div class="menuitem"><span>{{ _('Freenet') }}</span></div></a></li>
           <li><a href="{{ site_url('about/comparison/gnunet') }}"><div class="menuitem"><span>{{ _('GNUnet') }}</span></div></a></li>
-          <li><a href="{{ site_url('about/comparison/othernetworks') }}"><div class="menuitem"><span>{{ _('Other anonymous networks') }}</span></div></a></li>
+          <li><a href="{{ site_url('about/comparison/other-networks') }}"><div class="menuitem"><span>{{ _('Other anonymous networks') }}</span></div></a></li>
         </ul>
       </li>
   <li class="has-sub"><div class="menuitem"><span>{{ _('Documentation') }}</span></div>
@@ -30,14 +30,14 @@
       <li class="has-sub"><div class="menuitem"><span>{{ _('How does it work?') }}</span></div>
         <ul>
           <li><a href="{{ site_url('docs/how/intro') }}"><div class="menuitem"><span>{{ _('Gentle intro') }}</span></div></a></li>
-          <li><a href="{{ site_url('docs/how/techintro') }}"><div class="menuitem"><span>{{ _('Tech intro') }}</span></div></a></li>
-          <li><a href="{{ site_url('docs/how/threatmodel') }}"><div class="menuitem"><span>{{ _('Threat model') }}</span></div></a></li>
-          <li><a href="{{ site_url('docs/how/garlicrouting') }}"><div class="menuitem"><span>{{ _('Garlic routing') }}</span></div></a></li>
-          <li><a href="{{ site_url('docs/how/networkdatabase') }}"><div class="menuitem"><span>{{ _('Network database') }}</span></div></a></li>
-          <li><a href="{{ site_url('docs/how/tunnelrouting') }}"><div class="menuitem"><span>{{ _('Tunnel routing') }}</span></div></a></li>
-          <li><a href="{{ site_url('docs/how/peerselection') }}"><div class="menuitem"><span>{{ _('Peer selection') }}</span></div></a></li>
+          <li><a href="{{ site_url('docs/how/tech-intro') }}"><div class="menuitem"><span>{{ _('Tech intro') }}</span></div></a></li>
+          <li><a href="{{ site_url('docs/how/threat-model') }}"><div class="menuitem"><span>{{ _('Threat model') }}</span></div></a></li>
+          <li><a href="{{ site_url('docs/how/garlic-routing') }}"><div class="menuitem"><span>{{ _('Garlic routing') }}</span></div></a></li>
+          <li><a href="{{ site_url('docs/how/network-database') }}"><div class="menuitem"><span>{{ _('Network database') }}</span></div></a></li>
+          <li><a href="{{ site_url('docs/how/tunnel-routing') }}"><div class="menuitem"><span>{{ _('Tunnel routing') }}</span></div></a></li>
+          <li><a href="{{ site_url('docs/how/peer-selection') }}"><div class="menuitem"><span>{{ _('Peer selection') }}</span></div></a></li>
           <li><a href="{{ site_url('docs/how/cryptography') }}"><div class="menuitem"><span>{{ _('Cryptography') }}</span></div></a></li>
-          <li><a href="{{ site_url('docs/how/elgamalaes') }}"><div class="menuitem"><span>{{ _('ElGamal/AES+SessionTags') }}</span></div></a></li>
+          <li><a href="{{ site_url('docs/how/elgamal-aes') }}"><div class="menuitem"><span>{{ _('ElGamal/AES+SessionTags') }}</span></div></a></li>
         </ul>
       </li>
       <li class="has-sub"><div class="menuitem"><span>{{ _('Applications') }}</span></div>
@@ -76,15 +76,15 @@
       <li class="has-sub"><div class="menuitem"><span>{{ _('Specifications') }}</span></div>
         <ul>
           <li><a href="{{ site_url('docs/spec/blockfile') }}"><div class="menuitem"><span>{{ _('Blockfile') }}</span></div></a></li>
-          <li><a href="{{ site_url('docs/spec/common_structures') }}"><div class="menuitem"><span>{{ _('Common structures') }}</span></div></a></li>
+          <li><a href="{{ site_url('docs/spec/common-structures') }}"><div class="menuitem"><span>{{ _('Common structures') }}</span></div></a></li>
           <li><a href="{{ site_url('docs/spec/configuration') }}"><div class="menuitem"><span>{{ _('Configuration files') }}</span></div></a></li>
           <li><a href="{{ site_url('docs/spec/datagrams') }}"><div class="menuitem"><span>{{ _('Datagrams') }}</span></div></a></li>
           <li><a href="{{ site_url('docs/spec/i2cp') }}"><div class="menuitem"><span>I2CP</span></div></a></li>
           <li><a href="{{ site_url('docs/spec/i2np') }}"><div class="menuitem"><span>I2NP</span></div></a></li>
           <li><a href="{{ site_url('docs/spec/plugin') }}"><div class="menuitem"><span>{{ _('Plugins') }}</span></div></a></li>
           <li><a href="{{ site_url('docs/spec/ssu') }}"><div class="menuitem"><span>SSU</span></div></a></li>
-          <li><a href="{{ site_url('docs/spec/tunnel_creation') }}"><div class="menuitem"><span>{{ _('Tunnel creation') }}</span></div></a></li>
-          <li><a href="{{ site_url('docs/spec/tunnel_message') }}"><div class="menuitem"><span>{{ _('Tunnel messages') }}</span></div></a></li>
+          <li><a href="{{ site_url('docs/spec/tunnel-creation') }}"><div class="menuitem"><span>{{ _('Tunnel creation') }}</span></div></a></li>
+          <li><a href="{{ site_url('docs/spec/tunnel-message') }}"><div class="menuitem"><span>{{ _('Tunnel messages') }}</span></div></a></li>
           <li><a href="{{ site_url('docs/spec/updates') }}"><div class="menuitem"><span>{{ _('Software updates') }}</span></div></a></li>
         </ul>
       </li>
@@ -92,7 +92,7 @@
         <ul>
           <li><a href="{{ site_url('docs/tunnels/implementation') }}"><div class="menuitem"><span>{{ _('Tunnel implementation') }}</span></div></a></li>
           <li><a href="{{ site_url('docs/tunnels/unidirectional') }}"><div class="menuitem"><span>{{ _('Unidirectional tunnels') }}</span></div></a></li>
-          <li><a href="{{ site_url('docs/tunnels/old') }}"><div class="menuitem"><span>{{ _('Old implementation') }}</span></div></a></li>
+          <li><a href="{{ site_url('docs/tunnels/old-implementation') }}"><div class="menuitem"><span>{{ _('Old implementation') }}</span></div></a></li>
         </ul>
       </li>
       <li><a href="{{ site_url('docs/naming') }}"><div class="menuitem"><span>{{ _('Naming and addressbook') }}</span></div></a></li>
@@ -101,7 +101,7 @@
   </li>
       <li><a href="{{ site_url('about/team') }}"><div class="menuitem"><span>{{ _('Team') }}</span></div></a></li>
       <li><a href="{{ get_url('blog_index') }}"><div class="menuitem"><span>{{ _('Blog') }}</span></div></a></li>
-      <li><a href="{{ site_url('about/halloffame') }}"><div class="menuitem"><span>{{ _('Hall of Fame') }}</span></div></a></li>
+      <li><a href="{{ site_url('about/hall-of-fame') }}"><div class="menuitem"><span>{{ _('Hall of Fame') }}</span></div></a></li>
       <li><a href="{{ site_url('about/media') }}"><div class="menuitem"><span>{{ _('Presentations, tutorials and articles') }}</span></div></a></li>
       <li><a href="{{ site_url('about/contact') }}"><div class="menuitem"><span>{{ _('Contact us') }}</span></div></a></li>
     </ul>
@@ -109,7 +109,7 @@
   <li class="has-sub"><div class="menuitem"><span>{{ _('Help') }}</span></div>
     <ul>
       <li><a href="{{ site_url('support/faq') }}"><div class="menuitem"><span>{{ _('FAQ') }}</span></div></a></li>
-      <li><a href="{{ site_url('support/htproxyports') }}"><div class="menuitem"><span>{{ _('How to browse I2P') }}</span></div></a></li>
+      <li><a href="{{ site_url('support/browser-config') }}"><div class="menuitem"><span>{{ _('How to browse I2P') }}</span></div></a></li>
       <li><a href="{{ site_url('support/glossary') }}"><div class="menuitem"><span>{{ _('Glossary') }}</span></div></a></li>
       <li><a href="{{ site_url('support/performance') }}"><div class="menuitem"><span>{{ _('Performance') }}</span></div></a></li>
       <li><a href="http://{{ i2pconv('forum.i2p') }}/"><div class="menuitem"><span>{{ _('Forums') }}</span></div></a></li>
@@ -123,8 +123,8 @@
           <li><a href="{{ site_url('volunteer/develop/applications') }}"><div class="menuitem"><span>{{ _('Applications') }}</span></div></a></li>
           <li><a href="{{ site_url('volunteer/develop/licenses') }}"><div class="menuitem"><span>{{ _('Licenses') }}</span></div></a></li>
           <li><a href="{{ site_url('volunteer/develop/release-signing-key') }}"><div class="menuitem"><span>{{ _('Release signing keys') }}</span></div></a></li>
-          <li><a href="{{ site_url('volunteer/develop/signedkeys') }}"><div class="menuitem"><span>{{ _('Signed keys') }}</span></div></a></li>
-          <li><a href="{{ site_url('volunteer/develop/developerskeys') }}"><div class="menuitem"><span>{{ _('Developers keys') }}</span></div></a></li>
+          <li><a href="{{ site_url('volunteer/develop/signed-keys') }}"><div class="menuitem"><span>{{ _('Signed keys') }}</span></div></a></li>
+          <li><a href="{{ site_url('volunteer/develop/developers-keys') }}"><div class="menuitem"><span>{{ _('Developers keys') }}</span></div></a></li>
           <li><a href="http://{{ i2pconv('trac.i2p2.i2p') }}/"><div class="menuitem"><span>{{ _('Bug tracker') }}</span></div></a></li>
         </ul>
       </li>
@@ -136,9 +136,9 @@
       </li>
       <li class="has-sub"><div class="menuitem"><span>{{ _('Guides') }}</span></div>
         <ul>
-          <li><a href="{{ site_url('volunteer/guides/newdevelopers') }}"><div class="menuitem"><span>{{ _('New developers') }}</span></div></a></li>
-          <li><a href="{{ site_url('volunteer/guides/devguidelines') }}"><div class="menuitem"><span>{{ _('Developer guidelines and coding style') }}</span></div></a></li>
-          <li><a href="{{ site_url('volunteer/guides/newtranslators') }}"><div class="menuitem"><span>{{ _('New translators') }}</span></div></a></li>
+          <li><a href="{{ site_url('volunteer/guides/new-developers') }}"><div class="menuitem"><span>{{ _('New developers') }}</span></div></a></li>
+          <li><a href="{{ site_url('volunteer/guides/dev-guidelines') }}"><div class="menuitem"><span>{{ _('Developer guidelines and coding style') }}</span></div></a></li>
+          <li><a href="{{ site_url('volunteer/guides/new-translators') }}"><div class="menuitem"><span>{{ _('New translators') }}</span></div></a></li>
         </ul>
       </li>
       <li><a href="{{ site_url('volunteer/bounties') }}"><div class="menuitem"><span>{{ _('Bounties') }}</span></div></a></li>
diff --git a/i2p2www/pages/site/about/comparison/othernetworks.html b/i2p2www/pages/site/about/comparison/other-networks.html
similarity index 100%
rename from i2p2www/pages/site/about/comparison/othernetworks.html
rename to i2p2www/pages/site/about/comparison/other-networks.html
diff --git a/i2p2www/pages/site/about/halloffame.html b/i2p2www/pages/site/about/hall-of-fame.html
similarity index 100%
rename from i2p2www/pages/site/about/halloffame.html
rename to i2p2www/pages/site/about/hall-of-fame.html
diff --git a/i2p2www/pages/site/docs/how/elgamalaes.html b/i2p2www/pages/site/docs/how/elgamal-aes.html
similarity index 100%
rename from i2p2www/pages/site/docs/how/elgamalaes.html
rename to i2p2www/pages/site/docs/how/elgamal-aes.html
diff --git a/i2p2www/pages/site/docs/how/garlicrouting.html b/i2p2www/pages/site/docs/how/garlic-routing.html
similarity index 100%
rename from i2p2www/pages/site/docs/how/garlicrouting.html
rename to i2p2www/pages/site/docs/how/garlic-routing.html
diff --git a/i2p2www/pages/site/docs/how/networkdatabase.html b/i2p2www/pages/site/docs/how/network-database.html
similarity index 100%
rename from i2p2www/pages/site/docs/how/networkdatabase.html
rename to i2p2www/pages/site/docs/how/network-database.html
diff --git a/i2p2www/pages/site/docs/how/peerselection.html b/i2p2www/pages/site/docs/how/peer-selection.html
similarity index 100%
rename from i2p2www/pages/site/docs/how/peerselection.html
rename to i2p2www/pages/site/docs/how/peer-selection.html
diff --git a/i2p2www/pages/site/docs/how/techintro.html b/i2p2www/pages/site/docs/how/tech-intro.html
similarity index 100%
rename from i2p2www/pages/site/docs/how/techintro.html
rename to i2p2www/pages/site/docs/how/tech-intro.html
diff --git a/i2p2www/pages/site/docs/how/threatmodel.html b/i2p2www/pages/site/docs/how/threat-model.html
similarity index 100%
rename from i2p2www/pages/site/docs/how/threatmodel.html
rename to i2p2www/pages/site/docs/how/threat-model.html
diff --git a/i2p2www/pages/site/docs/how/tunnelrouting.html b/i2p2www/pages/site/docs/how/tunnel-routing.html
similarity index 100%
rename from i2p2www/pages/site/docs/how/tunnelrouting.html
rename to i2p2www/pages/site/docs/how/tunnel-routing.html
diff --git a/i2p2www/pages/site/docs/spec/common_structures.html b/i2p2www/pages/site/docs/spec/common-structures.html
similarity index 100%
rename from i2p2www/pages/site/docs/spec/common_structures.html
rename to i2p2www/pages/site/docs/spec/common-structures.html
diff --git a/i2p2www/pages/site/docs/spec/tunnel_creation.html b/i2p2www/pages/site/docs/spec/tunnel-creation.html
similarity index 100%
rename from i2p2www/pages/site/docs/spec/tunnel_creation.html
rename to i2p2www/pages/site/docs/spec/tunnel-creation.html
diff --git a/i2p2www/pages/site/docs/spec/tunnel_message.html b/i2p2www/pages/site/docs/spec/tunnel-message.html
similarity index 100%
rename from i2p2www/pages/site/docs/spec/tunnel_message.html
rename to i2p2www/pages/site/docs/spec/tunnel-message.html
diff --git a/i2p2www/pages/site/docs/tunnels/old.html b/i2p2www/pages/site/docs/tunnels/old-implementation.html
similarity index 100%
rename from i2p2www/pages/site/docs/tunnels/old.html
rename to i2p2www/pages/site/docs/tunnels/old-implementation.html
diff --git a/i2p2www/pages/site/misc/i2ptunnel_migration.html b/i2p2www/pages/site/misc/i2ptunnel-migration.html
similarity index 100%
rename from i2p2www/pages/site/misc/i2ptunnel_migration.html
rename to i2p2www/pages/site/misc/i2ptunnel-migration.html
diff --git a/i2p2www/pages/site/misc/i2ptunnel_services.html b/i2p2www/pages/site/misc/i2ptunnel-services.html
similarity index 100%
rename from i2p2www/pages/site/misc/i2ptunnel_services.html
rename to i2p2www/pages/site/misc/i2ptunnel-services.html
diff --git a/i2p2www/pages/site/misc/manualwrapper.html b/i2p2www/pages/site/misc/manual-wrapper.html
similarity index 100%
rename from i2p2www/pages/site/misc/manualwrapper.html
rename to i2p2www/pages/site/misc/manual-wrapper.html
diff --git a/i2p2www/pages/site/support/htproxyports.html b/i2p2www/pages/site/support/browser-config.html
similarity index 100%
rename from i2p2www/pages/site/support/htproxyports.html
rename to i2p2www/pages/site/support/browser-config.html
diff --git a/i2p2www/pages/site/volunteer/bounties/arabic.html b/i2p2www/pages/site/volunteer/bounties/arabic-trans.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/bounties/arabic.html
rename to i2p2www/pages/site/volunteer/bounties/arabic-trans.html
diff --git a/i2p2www/pages/site/volunteer/bounties/btcclient.html b/i2p2www/pages/site/volunteer/bounties/btc-client.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/bounties/btcclient.html
rename to i2p2www/pages/site/volunteer/bounties/btc-client.html
diff --git a/i2p2www/pages/site/volunteer/bounties/debpack.html b/i2p2www/pages/site/volunteer/bounties/deb-pack.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/bounties/debpack.html
rename to i2p2www/pages/site/volunteer/bounties/deb-pack.html
diff --git a/i2p2www/pages/site/volunteer/bounties/rutrans.html b/i2p2www/pages/site/volunteer/bounties/russian-trans.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/bounties/rutrans.html
rename to i2p2www/pages/site/volunteer/bounties/russian-trans.html
diff --git a/i2p2www/pages/site/volunteer/bounties/syndie2012.html b/i2p2www/pages/site/volunteer/bounties/syndie-2012.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/bounties/syndie2012.html
rename to i2p2www/pages/site/volunteer/bounties/syndie-2012.html
diff --git a/i2p2www/pages/site/volunteer/bounties/unittests.html b/i2p2www/pages/site/volunteer/bounties/unit-tests.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/bounties/unittests.html
rename to i2p2www/pages/site/volunteer/bounties/unit-tests.html
diff --git a/i2p2www/pages/site/volunteer/bounties/vuzeplugin.html b/i2p2www/pages/site/volunteer/bounties/vuze-plugin.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/bounties/vuzeplugin.html
rename to i2p2www/pages/site/volunteer/bounties/vuze-plugin.html
diff --git a/i2p2www/pages/site/volunteer/develop/developerskeys.html b/i2p2www/pages/site/volunteer/develop/developers-keys.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/develop/developerskeys.html
rename to i2p2www/pages/site/volunteer/develop/developers-keys.html
diff --git a/i2p2www/pages/site/volunteer/develop/signedkeys.html b/i2p2www/pages/site/volunteer/develop/signed-keys.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/develop/signedkeys.html
rename to i2p2www/pages/site/volunteer/develop/signed-keys.html
diff --git a/i2p2www/pages/site/volunteer/guides/devguidelines.html b/i2p2www/pages/site/volunteer/guides/dev-guidelines.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/guides/devguidelines.html
rename to i2p2www/pages/site/volunteer/guides/dev-guidelines.html
diff --git a/i2p2www/pages/site/volunteer/guides/newdevelopers.html b/i2p2www/pages/site/volunteer/guides/new-developers.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/guides/newdevelopers.html
rename to i2p2www/pages/site/volunteer/guides/new-developers.html
diff --git a/i2p2www/pages/site/volunteer/guides/newtranslators.html b/i2p2www/pages/site/volunteer/guides/new-translators.html
similarity index 100%
rename from i2p2www/pages/site/volunteer/guides/newtranslators.html
rename to i2p2www/pages/site/volunteer/guides/new-translators.html