Fix: numbers in tables work now, renaming fixed as well for numbered tabled