Renaming Table classes