diff --git a/IPython/nbconvert/templates/latex/base.tplx b/IPython/nbconvert/templates/latex/base.tplx
index 4b6cae0..843152c 100644
--- a/IPython/nbconvert/templates/latex/base.tplx
+++ b/IPython/nbconvert/templates/latex/base.tplx
@@ -41,21 +41,21 @@ it introduces a new line
 
 ((*- block data_png -*))
 \begin{center}
-\includegraphics[max size={0.7\textwidth}{0.9\textheight}]{(((output.key_png)))}
+\includegraphics[max size={0.7\textwidth}{0.9\textheight}]{(((output.png_filename)))}
 \par
 \end{center}
 ((*- endblock -*))
 
 ((*- block data_jpg -*))
 \begin{center}
-\includegraphics[max size={0.7\textwidth}{0.9\textheight}]{(((output.key_jpeg)))}
+\includegraphics[max size={0.7\textwidth}{0.9\textheight}]{(((output.jpeg_filename)))}
 \par
 \end{center}
 ((*- endblock -*))
 
 ((*- block data_svg -*))
 \begin{center}
-\includegraphics[width=0.7\textwidth]{(((output.key_svg)))}
+\includegraphics[width=0.7\textwidth]{(((output.svg_filename)))}
 \par
 \end{center}
 ((*- endblock -*))
diff --git a/IPython/nbconvert/templates/latex/sphinx_base.tplx b/IPython/nbconvert/templates/latex/sphinx_base.tplx
index 3e3cdcd..993f03e 100644
--- a/IPython/nbconvert/templates/latex/sphinx_base.tplx
+++ b/IPython/nbconvert/templates/latex/sphinx_base.tplx
@@ -347,11 +347,15 @@ Note: For best display, use latex syntax highlighting. =))
 % Supported image formats
 %==============================================================================
 ((*- block data_png -*))
-    ((( conditionally_center_output(insert_graphics(output.key_png)) )))
+    ((( conditionally_center_output(insert_graphics(output.png_filename)) )))
+((*- endblock -*))
+
+((*- block data_jpg -*))
+    ((( conditionally_center_output(insert_graphics(output.jpg_filename)) )))
 ((*- endblock -*))
 
 ((*- block data_svg -*))
-    ((( conditionally_center_output(insert_graphics(output.key_svg)) )))
+    ((( conditionally_center_output(insert_graphics(output.svg_filename)) )))
 ((*- endblock -*))
 
 ((*- block data_latex *))
diff --git a/IPython/nbconvert/templates/markdown.tpl b/IPython/nbconvert/templates/markdown.tpl
index 732192a..69e508b 100644
--- a/IPython/nbconvert/templates/markdown.tpl
+++ b/IPython/nbconvert/templates/markdown.tpl
@@ -30,15 +30,15 @@ In[{{cell.prompt_number if cell.prompt_number else ' '}}]:{% endblock in_prompt 
 
 
 {% block data_svg %}
-[!image]({{output.key_svg}})
+[!image]({{output.svg_filename}})
 {% endblock data_svg %}
 
 {% block data_png %}
-[!image]({{output.key_png}})
+[!image]({{output.png_filename}})
 {% endblock data_png %}
 
 {% block data_jpg %}
-[!image]({{output.key_jpg}})
+[!image]({{output.jpg_filename}})
 {% endblock data_jpg %}
 
 
diff --git a/IPython/nbconvert/templates/rst.tpl b/IPython/nbconvert/templates/rst.tpl
index 7bc1150..5d7ab71 100644
--- a/IPython/nbconvert/templates/rst.tpl
+++ b/IPython/nbconvert/templates/rst.tpl
@@ -33,15 +33,15 @@ Out[{{cell.prompt_number}}]:{% endif %}{% endblock output_prompt %}
 
 
 
-{% block data_svg %}.. image:: {{output.key_svg}}
+{% block data_svg %}.. image:: {{output.svg_filename}}
 
 {% endblock data_svg %}
 
-{% block data_png %}.. image:: {{output.key_png}}
+{% block data_png %}.. image:: {{output.png_filename}}
 
 {% endblock data_png %}
 
-{% block data_jpg %}..jpg image:: {{output.key_jpg}}
+{% block data_jpg %}..jpg image:: {{output.jpg_filename}}
 
 {% endblock data_jpg %}