diff --git a/pinaxcon/templates/static_pages/about/north-bay-python.html b/pinaxcon/templates/static_pages/about/north_bay_python.html
similarity index 100%
rename from pinaxcon/templates/static_pages/about/north-bay-python.html
rename to pinaxcon/templates/static_pages/about/north_bay_python.html
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.html b/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.html
similarity index 83%
rename from pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.html
rename to pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.html
index 216d712..b758616 100644
--- a/pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.html
+++ b/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.html
@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/code-of-conduct/code-of-conduct.md" %}
+{% include "static_pages/code_of_conduct/code_of_conduct.md" %}
 
   {% endmarkdown %}
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.md b/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md
similarity index 100%
rename from pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.md
rename to pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.html b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.html
similarity index 85%
rename from pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.html
rename to pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.html
index 8a9bf80..3384b7b 100644
--- a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.html
+++ b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.html
@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/code-of-conduct/harassment-procedure-attendee.md" %}
+{% include "static_pages/code_of_conduct/harassment_procedure_attendee.md" %}
 
   {% endmarkdown %}
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.md b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md
similarity index 100%
rename from pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.md
rename to pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.html b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.html
similarity index 85%
rename from pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.html
rename to pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.html
index 5a15107..caadaab 100644
--- a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.html
+++ b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.html
@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/code-of-conduct/harassment-procedure-staff.md" %}
+{% include "static_pages/code_of_conduct/harassment_procedure_staff.md" %}
 
   {% endmarkdown %}
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.md b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md
similarity index 100%
rename from pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.md
rename to pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md
diff --git a/pinaxcon/templates/static_pages/news.html b/pinaxcon/templates/static_pages/news.html
index bc0a04f..7eac9e4 100644
--- a/pinaxcon/templates/static_pages/news.html
+++ b/pinaxcon/templates/static_pages/news.html
@@ -10,4 +10,7 @@
 
 {% block content %}
 
+  * conservancy press release
+  * CFP opening
+
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/program/call-for-proposals.html b/pinaxcon/templates/static_pages/program/call_for_proposals.html
similarity index 84%
rename from pinaxcon/templates/static_pages/program/call-for-proposals.html
rename to pinaxcon/templates/static_pages/program/call_for_proposals.html
index 0314240..4cb62e3 100644
--- a/pinaxcon/templates/static_pages/program/call-for-proposals.html
+++ b/pinaxcon/templates/static_pages/program/call_for_proposals.html
@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/program/call-for-proposals.md" %}
+{% include "static_pages/program/call_for_proposals.md" %}
 
   {% endmarkdown %}
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/program/call-for-proposals.md b/pinaxcon/templates/static_pages/program/call_for_proposals.md
similarity index 100%
rename from pinaxcon/templates/static_pages/program/call-for-proposals.md
rename to pinaxcon/templates/static_pages/program/call_for_proposals.md
diff --git a/pinaxcon/templates/static_pages/program/selection-process.html b/pinaxcon/templates/static_pages/program/selection_process.html
similarity index 84%
rename from pinaxcon/templates/static_pages/program/selection-process.html
rename to pinaxcon/templates/static_pages/program/selection_process.html
index 7bec516..4e3236f 100644
--- a/pinaxcon/templates/static_pages/program/selection-process.html
+++ b/pinaxcon/templates/static_pages/program/selection_process.html
@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/program/selection-process.md" %}
+{% include "static_pages/program/selection_process.md" %}
 
   {% endmarkdown %}
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/program/selection-process.md b/pinaxcon/templates/static_pages/program/selection_process.md
similarity index 100%
rename from pinaxcon/templates/static_pages/program/selection-process.md
rename to pinaxcon/templates/static_pages/program/selection_process.md
diff --git a/pinaxcon/templates/static_pages/sponsors/become-a-sponsor.html b/pinaxcon/templates/static_pages/sponsors/become_a_sponsor.html
similarity index 100%
rename from pinaxcon/templates/static_pages/sponsors/become-a-sponsor.html
rename to pinaxcon/templates/static_pages/sponsors/become_a_sponsor.html
diff --git a/pinaxcon/templates/static_pages/terms-and-conditions.html b/pinaxcon/templates/static_pages/terms_and_conditions.html
similarity index 100%
rename from pinaxcon/templates/static_pages/terms-and-conditions.html
rename to pinaxcon/templates/static_pages/terms_and_conditions.html
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 9fff7c7..49b3b2b 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -13,7 +13,7 @@ urlpatterns = [
 
     # about
     # TODO add /about
-    url(r"^about/north-bay-python$", TemplateView.as_view(template_name="static_pages/about/north-bay-python.html"), name="about/north-bay-python"),
+    url(r"^about/north-bay-python$", TemplateView.as_view(template_name="static_pages/about/north_bay_python.html"), name="about/north-bay-python"),
     # TODO add /about/the-mystic
     # TODO add /about/petaluma
     url(r"^about/team$", TemplateView.as_view(template_name="static_pages/about/team.html"), name="about/team"),
@@ -23,8 +23,8 @@ urlpatterns = [
     # TODO add /program
     # TODO add /program/sessions
     # TODO add /program/events
-    url(r"^program/call-for-proposals$", TemplateView.as_view(template_name="static_pages/program/call-for-proposals.html"), name="program/call-for-proposals"),
-    url(r"^program/selection-process$", TemplateView.as_view(template_name="static_pages/program/selection-process.html"), name="program/selection-process"),
+    url(r"^program/call-for-proposals$", TemplateView.as_view(template_name="static_pages/program/call_for_proposals.html"), name="program/call-for-proposals"),
+    url(r"^program/selection-process$", TemplateView.as_view(template_name="static_pages/program/selection_process.html"), name="program/selection-process"),
 
     # attend
     # TODO add /attend
@@ -34,14 +34,14 @@ urlpatterns = [
     # TODO add /attend/how-to-pitch-your-manager
     # TODO add /attend/how-to-get-here
     # TODO add /attend/where-to-stay
-    url(r"^code-of-conduct$", TemplateView.as_view(template_name="static_pages/code-of-conduct/code-of-conduct.html"), name="code-of-conduct"),
-    url(r"^code-of-conduct/harassment-incidents$", TemplateView.as_view(template_name="static_pages/code-of-conduct/harassment-procedure-attendee.html"), name="code-of-conduct/harassment-incidents"),
-    url(r"^code-of-conduct/harassment-staff-procedures$", TemplateView.as_view(template_name="static_pages/code-of-conduct/harassment-procedure-staff.html"), name="code-of-conduct/harassment-staff-procedures"),
-    url(r"^terms-and-conditions$", TemplateView.as_view(template_name="static_pages/terms-and-conditions.html"), name="terms-and-conditions"),
+    url(r"^code-of-conduct$", TemplateView.as_view(template_name="static_pages/code_of_conduct/code_of_conduct.html"), name="code-of-conduct"),
+    url(r"^code-of-conduct/harassment-incidents$", TemplateView.as_view(template_name="static_pages/code_of_conduct/harassment_procedure_attendee.html"), name="code-of-conduct/harassment-incidents"),
+    url(r"^code-of-conduct/harassment-staff-procedures$", TemplateView.as_view(template_name="static_pages/code_of_conduct/harassment_procedure_staff.html"), name="code-of-conduct/harassment-staff-procedures"),
+    url(r"^terms-and-conditions$", TemplateView.as_view(template_name="static_pages/terms_and_conditions.html"), name="terms-and-conditions"),
 
     # sponsor
     # TODO add /sponsors
-    url(r"^sponsors/become-a-sponsor$", TemplateView.as_view(template_name="static_pages/sponsors/become-a-sponsor.html"), name="sponsors/become-a-sponsor"),
+    url(r"^sponsors/become-a-sponsor$", TemplateView.as_view(template_name="static_pages/sponsors/become_a_sponsor.html"), name="sponsors/become-a-sponsor"),
 
     # news
     url(r"^news$", TemplateView.as_view(template_name="static_pages/news.html"), name="news"),