Consistent with new table naming
Sync with current code