Allow different (upper) cases, and remove accent more simply