Renamed some more plural tables to singular