Fix service_grains.py name matching