Make sure we fall through the name cases properly