Fixed #3124 Change field name processing to match new UI templates