Some more program name fixes.