diff --git a/doc/source/conf.py b/doc/source/conf.py
index 2e6b875c..46653e18 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -24,7 +24,7 @@ import sys
 #extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['.templates']
+templates_path = ['_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -79,7 +79,7 @@ html_style = 'default.css'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['.static']
+html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
diff --git a/doc/source/manual/modeling.rst b/doc/source/manual/modeling.rst
index fb473c8f..799aa8cf 100644
--- a/doc/source/manual/modeling.rst
+++ b/doc/source/manual/modeling.rst
@@ -531,7 +531,7 @@ When we run the test bench, it generates a VCD file called
 :file:`testbench.vcd`. When we load this file into :program:`gtkwave`, we can
 view the waveforms:
 
-tbfsm.png
+.. image:: tbfsm.png
 
 Signals are dumped in a suitable format. This format is inferred at the
 :class:`Signal` construction time, from the type of the initial value. In