Improve field name handling for layer files.