Refined names of vendors, fixed crash map crash