Renamed a couple of data tables