Improved matching of column names to suggested enum values