Issue #1561200 by szt, osopolar: Added Use machine names for better identification of similar field names.