Eliminating a few name cases