Ensure proper shell names