diff --git a/autoapi/templates/python/class.rst b/autoapi/templates/python/class.rst
index 1bdd917..22387f6 100644
--- a/autoapi/templates/python/class.rst
+++ b/autoapi/templates/python/class.rst
@@ -1,4 +1,4 @@
-.. class:: {{ obj.name }}{% if obj.args %}({{ obj.args|join(',') }}){% endif %}
+.. py:class:: {{ obj.name }}{% if obj.args %}({{ obj.args|join(',') }}){% endif %}
 
    {% if obj.docstring %}
 
diff --git a/autoapi/templates/python/module.rst b/autoapi/templates/python/module.rst
index 22ef67e..2c2227d 100644
--- a/autoapi/templates/python/module.rst
+++ b/autoapi/templates/python/module.rst
@@ -25,7 +25,7 @@
 
 {% endif %}
 
-.. module:: {{ obj.name }}
+.. py:module:: {{ obj.name }}
 
 
 
@@ -39,7 +39,7 @@
 {%- for obj_item in obj.item_map.get(item_type, []) %}
 {% macro render() %}{{ obj_item.render() }}{% endmacro %}
 
-    {{ render()|indent(4) }}
+{{ render()|indent(0) }}
 
 {%- endfor %}
 {%- endmacro %}