I went too far. Revert "updated_named_fields"

This reverts commit 2bc39f8b67fbd0ed5a56fa31e94d88b26d07d789.
second revert Revert "updated_named_fields"

This reverts commit 799c5580c1090909d057a8eef91851cd9f385f63.