I'd be inclined to stick with tornado's name - I agree it's not perfect, but I think it's more confusing to have two slightly different names for the same thing.