#1561200 - Use machine names for better identification of similar field names