Renamed and updated some DB tables to consist with new model