Handle more name cases