Change how crop names are handled for better integration with Jobs