Add: masquerade, moopapi, password_hustle, spambot; reorder