Fixed table renaming