CDB-3775 Controlling table renaming also