Renamed some more tables