Name length fix