diff --git a/_layouts/default.html b/_layouts/default.html
index 2bb2f83..1dacd73 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -86,7 +86,7 @@ <h1><a href="https://tessel.io/"><nobr><img src=
           <a href="{{ site.baseurl }}/ap.html">access point</a>
         </li>
         <li>
-          <a href="{{ site.baseurl }}/webserver.html">webserver</a>
+          <a href="{{ site.baseurl }}/web-server.html">web server</a>
         </li>
         <li>
           <a href="{{ site.baseurl }}/gpio.html">gpio</a>
@@ -170,7 +170,7 @@ <h1><a href="https://tessel.io/"><nobr><img src=
           <a href="{{ site.baseurl }}/ap.html">6. access point</a>
         </li>
         <li>
-          <a href="{{ site.baseurl }}/webserver.html">7. webserver</a>
+          <a href="{{ site.baseurl }}/web-server.html">7. web server</a>
         </li>
         <li>
           <a href="{{ site.baseurl }}/gpio.html">8. gpio</a>
diff --git a/ap.md b/ap.md
index 190b3b1..c4f5197 100644
--- a/ap.md
+++ b/ap.md
@@ -63,6 +63,6 @@ Open the wifi setting of your computer, or a separate device like a smartphone o
 </div>
 
 <div class="large-6 columns right">
-  <a href="webserver.html" class= "bottomButton right button">Next: Build A Web Server</a>
+  <a href="web-server.html" class= "bottomButton right button">Next: Build A Web Server</a>
 </div>
 </div>
diff --git a/gpio.md b/gpio.md
index 089202f..8e0275f 100644
--- a/gpio.md
+++ b/gpio.md
@@ -68,7 +68,7 @@ Share what you've made, and if you need help, [just ask](https://forums.tessel.i
 
 <div class="row">
 <div class="large-6 columns left">
-  <a href="webserver.html" class="bottomButton button">Prev: Build Your Internet</a>
+  <a href="web-server.html" class="bottomButton button">Prev: Build Your Internet</a>
 </div>
 
 <div class="large-6 columns right">
diff --git a/webserver.html b/web-server.html
similarity index 74%
rename from webserver.html
rename to web-server.html
index c09cb52..e608d12 100644
--- a/webserver.html
+++ b/web-server.html
@@ -3,7 +3,7 @@
 ---
 
 {% capture include_install %}
-{% include_relative webserver.md %}
+{% include_relative web-server.md %}
 {% endcapture %}
 {{ include_install | markdownify }}
 
diff --git a/webserver.md b/web-server.md
similarity index 97%
rename from webserver.md
rename to web-server.md
index b694566..0a27039 100644
--- a/webserver.md
+++ b/web-server.md
@@ -24,7 +24,7 @@ In your command line, make a folder for your Tessel code, then initialize a Tess
 
 `t2 init`
 
-Rename the “index.js” file you’ve just created to “webserver.js”, then copy and paste the below script over the existing text:
+Rename the “index.js” file you’ve just created to “web-server.js”, then copy and paste the below script over the existing text:
 
 {% highlight javascript %}
 // Import the interface to Tessel hardware
@@ -52,7 +52,7 @@ Now that our server is in place, let's get our access point set up. In the termi
 
 If you haven't read about creating access points yet, check out the [access point tutorial](ap.html). After connecting to TesselRouter, run the following command in your terminal:
 
-`t2 run webserver.js`
+`t2 run web-server.js`
 
 </div>
 
@@ -152,7 +152,7 @@ Open that file in the browser to see the UI for this web app.
 
   Now let's check out the server again to finish up the project.
 
-  Replace the code in `webserver.js` with the following:
+  Replace the code in `web-server.js` with the following:
 
 {% highlight javascript %}
   // These two dependencies remain the same
@@ -242,7 +242,7 @@ index.html
 
 Finally, let's fire up our server again by running:
 
-`t2 run webserver.js`
+`t2 run web-server.js`
 
 </div>