Table naming updated
API response tweaked