CLC-3921 Rename tables and consolidate migrations