Fixed more fallout from table renames