Added condition for name parts.