Fixing popular names bugs