Renamed tables as requested by KS