Fix name size issue