Adjust usages, change table-name usages