Allow overriding name for textFields.
Merge branch 'develop' into jira/OE-4007