Simplify the way we rename table