Renamed two tables to the names they had in diagram