Fix for name parts.