Clean up namespaces in data forms.
4.1.1