diff --git a/dependencies/pip/dev_requirements.txt b/dependencies/pip/dev_requirements.txt
index 23cb02ca6a..7e39b9695d 100644
--- a/dependencies/pip/dev_requirements.txt
+++ b/dependencies/pip/dev_requirements.txt
@@ -5,7 +5,7 @@
 #    pip-compile --output-file dependencies/pip/dev_requirements.txt dependencies/pip/dev_requirements.in
 #
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
--e git+https://github.com/kobotoolbox/formpack.git@6f39abc642920964b6fbcfae16deb4b935956ad3#egg=formpack
+-e git+https://github.com/kobotoolbox/formpack.git@f0ddf7d68b792cdf7c59101ee79dc631bbcd3d0b#egg=formpack
 amqp==2.1.4
 anyjson==0.3.3
 argparse==1.4.0           # via unittest2
diff --git a/dependencies/pip/external_services.txt b/dependencies/pip/external_services.txt
index 24586d8ef3..a7bcf1fcc2 100644
--- a/dependencies/pip/external_services.txt
+++ b/dependencies/pip/external_services.txt
@@ -5,7 +5,7 @@
 #    pip-compile --output-file dependencies/pip/external_services.txt dependencies/pip/external_services.in
 #
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
--e git+https://github.com/kobotoolbox/formpack.git@6f39abc642920964b6fbcfae16deb4b935956ad3#egg=formpack
+-e git+https://github.com/kobotoolbox/formpack.git@f0ddf7d68b792cdf7c59101ee79dc631bbcd3d0b#egg=formpack
 amqp==2.3.2
 anyjson==0.3.3
 argparse==1.4.0           # via unittest2
diff --git a/dependencies/pip/requirements.in b/dependencies/pip/requirements.in
index c691da0f35..682528d1c7 100644
--- a/dependencies/pip/requirements.in
+++ b/dependencies/pip/requirements.in
@@ -2,7 +2,7 @@
 # https://github.com/bndr/pipreqs is a handy utility, too.
 
 # Formpack
--e git+https://github.com/kobotoolbox/formpack.git@6f39abc642920964b6fbcfae16deb4b935956ad3#egg=formpack
+-e git+https://github.com/kobotoolbox/formpack.git@f0ddf7d68b792cdf7c59101ee79dc631bbcd3d0b#egg=formpack
 
 # More up-to-date version of django-digest than PyPI seems to have.
 # Also, python-digest is an unlisted dependency thereof.
diff --git a/dependencies/pip/requirements.txt b/dependencies/pip/requirements.txt
index 0d0b74424b..a43e324da3 100644
--- a/dependencies/pip/requirements.txt
+++ b/dependencies/pip/requirements.txt
@@ -5,7 +5,7 @@
 #    pip-compile --output-file dependencies/pip/requirements.txt dependencies/pip/requirements.in
 #
 -e git+https://github.com/dimagi/django-digest@0eb1c921329dd187c343b61acfbec4e98450136e#egg=django_digest
--e git+https://github.com/kobotoolbox/formpack.git@6f39abc642920964b6fbcfae16deb4b935956ad3#egg=formpack
+-e git+https://github.com/kobotoolbox/formpack.git@f0ddf7d68b792cdf7c59101ee79dc631bbcd3d0b#egg=formpack
 amqp==2.3.2
 anyjson==0.3.3
 argparse==1.4.0           # via unittest2
diff --git a/kobo/apps/reports/report_data.py b/kobo/apps/reports/report_data.py
index 1d3323dfb1..174f8f2e16 100644
--- a/kobo/apps/reports/report_data.py
+++ b/kobo/apps/reports/report_data.py
@@ -128,7 +128,7 @@ def data_by_identifiers(asset, field_names=None, submission_stream=None,
     _all_versions = pack.versions.keys()
     report = pack.autoreport(versions=_all_versions)
     fields_by_name = OrderedDict([
-            (field.name, field) for field in
+            (field.contextual_name, field) for field in
                 pack.get_fields_for_versions(versions=_all_versions)
         ])
     if field_names is None:
@@ -157,15 +157,15 @@ def _stat_dict_to_array(stat, field_name):
                          'percentages': percentages})
 
     def _package_stat(field, _, stat, split_by):
-        identifier = kuids.get(field.name)
+        identifier = kuids.get(field.contextual_name)
         if not split_by:
-            _stat_dict_to_array(stat, field.name)
+            _stat_dict_to_array(stat, field.contextual_name)
         elif 'values' in stat:
             for _, sub_stat in stat['values']:
-                _stat_dict_to_array(sub_stat, field.name)
+                _stat_dict_to_array(sub_stat, field.contextual_name)
         return {
-            'name': field.name,
-            'row': {'type': fields_by_name.get(field.name).data_type},
+            'name': field.contextual_name,
+            'row': {'type': fields_by_name.get(field.contextual_name).data_type},
             'data': stat,
             'kuid': identifier,
             'style': specified_styles.get(identifier, {}),
diff --git a/kpi/utils/log.py b/kpi/utils/log.py
index 2f4df4a3f3..6f4bde878e 100644
--- a/kpi/utils/log.py
+++ b/kpi/utils/log.py
@@ -9,5 +9,3 @@ def get_default_logger():
 # logging does not print to stdout when RAVEN/sentry is activated.
 # To avoid to call logging.getLogger everywhere, we overload logging
 logging = get_default_logger()
-
-