Properly handle hypothesis name freshening

[TOTBWF]

Right now the code for freshening hypothesis names doesn't take into account cases where someone freshens something that ends in a number. This could cause name overlap, but is of low priority, as it would be a pretty silly thing to do.