diff --git a/gapic/templates/$namespace/$name_$version/types/$sub/__init__.py.j2 b/gapic/templates/$namespace/$name_$version/types/$sub/__init__.py.j2
index 0829a110c..b0372068d 100644
--- a/gapic/templates/$namespace/$name_$version/types/$sub/__init__.py.j2
+++ b/gapic/templates/$namespace/$name_$version/types/$sub/__init__.py.j2
@@ -13,7 +13,7 @@ from . import {{ subpackage }}
 -#}
 {% for proto in api.protos.values()|sort(attribute='module_name')
         if proto.meta.address.subpackage == api.subpackage_view -%}
-{% for message in proto.messages.values()|sort(attribute='name') -%}
+{% for message in proto.top.messages.values()|sort(attribute='name') -%}
 from .{{ proto.module_name }} import {{ message.name }}
 {% endfor %}{% endfor %}
 
@@ -24,7 +24,7 @@ __all__ = (
     {%- endfor %}
     {%- for proto in api.protos.values()|sort(attribute='module_name')
             if proto.meta.address.subpackage == api.subpackage_view %}
-    {%- for message in proto.messages.values()|sort(attribute='name') %}
+    {%- for message in proto.top.messages.values()|sort(attribute='name') %}
     '{{ message.name }}',
     {%- endfor %}{% endfor %}
 )
diff --git a/setup.py b/setup.py
index 5ec77247c..8eaa8a40f 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@
 
 setup(
     name='gapic-generator',
-    version='0.3.0',
+    version='0.3.1',
     license='Apache 2.0',
     author='Luke Sneeringer',
     author_email='lukesneeringer@google.com',