diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index fb197ec..c027fe8 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -24,8 +24,8 @@ html_theme_options = {
     "sidebar_mode": "toctree"
 }
 otcdocs_auto_name = False
-project = 'Dummy Service'  # FIXME
-otcdocs_repo_name = 'opentelekomcloud-docs/template'  # FIXME
+project = 'Web Application Firewall'
+otcdocs_repo_name = 'opentelekomcloud-docs/web-application-firewall'
 
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -156,11 +156,11 @@ pygments_style = 'native'
 # html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'dummydoc'  # FIXME
+htmlhelp_basename = 'wafdoc'
 
 latex_documents = [
     ('index',
-     'api-ref-dummy.tex',  # FIXME
+     'api-ref-waf.tex',
      u'%s API Reference' % project,
      u'OpenTelekomCloud', 'manual'),
 ]
diff --git a/api-ref/source/docutils.conf b/api-ref/source/docutils.conf
new file mode 100644
index 0000000..808c9d2
--- /dev/null
+++ b/api-ref/source/docutils.conf
@@ -0,0 +1,2 @@
+[html writers]
+table-style: table, caption-top
diff --git a/setup.py b/setup.py
index 6345380..4ea0727 100644
--- a/setup.py
+++ b/setup.py
@@ -15,4 +15,5 @@ import setuptools
 
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],
-    pbr=True)
+    pbr=True,
+    py_modules=[])
diff --git a/tox.ini b/tox.ini
index 3207bd4..1d93e2e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -69,6 +69,4 @@ whitelist_externals =
 commands =
   rm -rf umn/build/pdf
   sphinx-build -a -E -W -b latex umn/source umn/build/pdf
-  sh -c "for f in umn/build/pdf/*.gif; do gif2png -dprsO $f; done || true"
-  sh -c "for f in umn/build/pdf/*.tex; do sed -iorig 's/\.gif//g' $f; done"
   make -C umn/build/pdf
diff --git a/umn/source/conf.py b/umn/source/conf.py
index 790a1d3..ff488c9 100644
--- a/umn/source/conf.py
+++ b/umn/source/conf.py
@@ -22,8 +22,8 @@ html_theme_options = {
 }
 otcdocs_auto_name = False
 otcdocs_auto_version = False
-project = 'Dummy Service'  # FIXME
-otcdocs_repo_name = 'opentelekomcloud-docs/template'  # FIXME
+project = 'Web Application Firewall Service'
+otcdocs_repo_name = 'opentelekomcloud-docs/web-application-firewall'
 
 
 # If extensions (or modules to document with autodoc) are in another directory,
@@ -147,11 +147,11 @@ html_title = "Dummy UMN"  # FIXME
 # html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'dummydoc'  # FIXME
+htmlhelp_basename = 'wafdoc'
 
 latex_documents = [
     ('index',
-     'umn-dummy.tex',  # FIXME
+     'umn-waf.tex',
      u'%s User Manual Documentation' % project,
      u'OpenTelekomCloud', 'manual'),
 ]
diff --git a/umn/source/docutils.conf b/umn/source/docutils.conf
new file mode 100644
index 0000000..808c9d2
--- /dev/null
+++ b/umn/source/docutils.conf
@@ -0,0 +1,2 @@
+[html writers]
+table-style: table, caption-top