Rename tables to have plural names