diff --git a/templates/conf.py.tpl b/templates/conf.py.tpl
index f6f8125..033abb1 100644
--- a/templates/conf.py.tpl
+++ b/templates/conf.py.tpl
@@ -104,7 +104,7 @@ html_static_path = ['_static']
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'cachingdoc'
+htmlhelp_basename = 'moduledoc'
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -130,20 +130,20 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-    (master_doc, 'caching.tex', 'socket\\_protocol Documentation',
-     'Dirk Alders', 'manual'),
-]
+#latex_documents = [
+#    (master_doc, 'caching.tex', 'socket\\_protocol Documentation',
+#     'Dirk Alders', 'manual'),
+#]
 
 
 # -- Options for manual page output ------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'caching', 'caching Documentation',
-     [author], 1)
-]
+#man_pages = [
+#    (master_doc, 'caching', 'caching Documentation',
+#     [author], 1)
+#]
 
 
 # -- Options for Texinfo output ----------------------------------------------
@@ -152,8 +152,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'caching', 'caching Documentation',
-     author, 'caching', 'One line description of project.',
+    (master_doc, '<module_name>', '<module_name> Documentation',
+     author, '<module_name>', 'One line description of project.',
      'Miscellaneous'),
 ]
 
diff --git a/templates/index.rst.tpl b/templates/index.rst.tpl
index 3cccdfb..2e08b93 100644
--- a/templates/index.rst.tpl
+++ b/templates/index.rst.tpl
@@ -3,8 +3,8 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to cachings's documentation!
-====================================
+Welcome to <module_name> documentation!
+=======================================
 
 .. automodule:: <module_name>
    :members: