Cleaned up names for patches